diff -X exclude.lst -cr winex/configure nwwinex/configure *** winex/configure 2004-01-29 14:09:47.000000000 -0500 --- nwwinex/configure 2004-04-07 14:26:22.000000000 -0400 *************** *** 265,274 **** : ${ac_max_here_lines=38} # Identity of this package. ! PACKAGE_NAME='WineX' ! PACKAGE_TARNAME='winex' PACKAGE_VERSION='20020228' ! PACKAGE_STRING='WineX 20020228' PACKAGE_BUGREPORT='' ac_unique_file="server/atom.c" --- 265,274 ---- : ${ac_max_here_lines=38} # Identity of this package. ! PACKAGE_NAME='NWWineX' ! PACKAGE_TARNAME='nwwinex' PACKAGE_VERSION='20020228' ! PACKAGE_STRING='NWWineX Based on WineX 20020228' PACKAGE_BUGREPORT='' ac_unique_file="server/atom.c" *************** *** 19789,19794 **** --- 19789,19847 ---- echo "*** enable Wine to use TrueType fonts." fi + echo -n "checking if Makefile can be patched safely... " + if + cat patch-Makefile | patch -p0 --dry-run Makefile >/dev/null 2>/dev/null + then + echo "yes" + cat patch-Makefile | patch -p0 Makefile + cat append-Makefile >> Makefile + else + echo "no" + echo + echo "Patch to Makefile to make it install script to run NWwine with" + echo "toolset hacks for some reason could not be applied. Looks like" + echo "you'll have to do it yourself. The following two commands should" + echo "take care of it:" + echo "cp ./nwwine.sh /usr/local/bin/nwwine" + echo "chmod a+x /usr/local/bin/nwwine" + fi + echo + echo + echo "This is NWWine - version of Wine designed to run BioWare's" + echo "Neverwinter Nights Toolset." + echo + echo "IMPORTANT NOTE: since nwwine-based-on-20030318 NWWine is" + echo "Wine-compatible. For end user this means two things:" + echo "1. To enable toolset hacks you *must* use " + echo "\"nwwine nwtoolset.exe\" instead of the usual \"wine nwtoolset.exe\"" + echo "2. You no longer have to keep regular Wine for other applications" + echo "and NWWine for the toolset - NWWine when run with the standard" + echo "\"wine app.exe\" behaves just like regular Wine on which it is based." + echo "ONLY running \"nwwine app.exe\" enables the hacks used to get the " + echo "toolset to work." + echo + echo "NWWine based on Wine 20030618 introduces another version of fix" + echo "which makes the OpenGL window draw correctly, submitted by a community" + echo "member Yann. This fix has been submitted to Winehq.org team as well," + echo "for inclusion in official Wine tree. However the folks at Winehq.org" + echo "apparently weren't sure if it doesn't break other things, as it" + echo "didn't yet make it to the official Wine tree. It still needs testing," + echo "in which YOU shall participate ;). In order to test the fix, please" + echo "run ALL your normal Wine applications using:" + echo "\"nwwine-gltest application.exe\" " + echo "instead of the normal:" + echo "\"wine application.exe\"" + echo "and look for any breakage." + echo "The toolset should still be run with" + echo "\"nwwine nwtoolset.exe\"" + echo "as it needs also other hacks to work" + echo "\"wine application.exe\" should work like the one from official Wine" + echo "tree." + echo "Please submit reports of success or failure to BioWare NWN Linux" + echo "forum, to NWWine thread" + echo "For further details, see nwwine and nwwine-gltest wrapper scripts." + echo echo "Configure finished. Do 'make depend && make' to compile Wine." echo diff -X exclude.lst -cr winex/controls/menu.c nwwinex/controls/menu.c *** winex/controls/menu.c 2003-12-17 15:51:15.000000000 -0500 --- nwwinex/controls/menu.c 2004-04-07 14:28:26.000000000 -0400 *************** *** 3927,3932 **** --- 3927,3940 ---- HMENU WINAPI GetMenu( HWND hWnd ) { HMENU retvalue = (HMENU)GetWindowLongA( hWnd, GWL_ID ); + + if (getenv("WINE_NWTOOLSET_HACK_ENABLE") != NULL || getenv("WINE_NWTOOLSET_HACK_ENABLE_M") != NULL) + { + POPUPMENU* pmenu = MENU_GetMenu( retvalue ); + if(pmenu && !pmenu->hWnd) + pmenu->hWnd = hWnd; + }; + TRACE("for %04x returning %04x\n", hWnd, retvalue); return retvalue; } diff -X exclude.lst -cr winex/dlls/ntdll/signal_i386.c nwwinex/dlls/ntdll/signal_i386.c *** winex/dlls/ntdll/signal_i386.c 2003-10-14 21:52:02.000000000 -0400 --- nwwinex/dlls/ntdll/signal_i386.c 2004-04-07 14:30:48.000000000 -0400 *************** *** 986,991 **** --- 986,995 ---- { CONTEXT context; + if (getenv("WINE_NWTOOLSET_HACK_ENABLE") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE_EH") == NULL) + { + + raise_signal_if_unexpected_thread( SIGFPE, SIGQUIT ); save_fpu( &context, HANDLER_CONTEXT ); *************** *** 993,998 **** --- 997,1004 ---- do_fpe( &context, get_trap_code(HANDLER_CONTEXT) ); restore_context( &context, HANDLER_CONTEXT ); restore_fpu( &context, HANDLER_CONTEXT ); + + } } diff -X exclude.lst -cr winex/dlls/opengl32/wgl.c nwwinex/dlls/opengl32/wgl.c *** winex/dlls/opengl32/wgl.c 2003-12-17 15:51:17.000000000 -0500 --- nwwinex/dlls/opengl32/wgl.c 2004-04-07 14:36:28.000000000 -0400 *************** *** 57,62 **** --- 57,73 ---- return drawable; } + /* retrieve the X drawable to use on a given DC (nwwine version) */ + inline static Drawable get_gldrawable( HDC hdc ) + { + Drawable drawable; + enum x11drv_escape_codes escape = X11DRV_GET_GLDRAWABLE; + + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, + sizeof(drawable), (LPSTR)&drawable )) drawable = 0; + return drawable; + } + static inline Font get_xfont(HDC dc) { Font font = None; *************** *** 343,350 **** ERR("Null DC !!!\n"); ret = FALSE; } else { - Drawable drawable = get_drawable(hdc); Wine_GLContext *ctx = (Wine_GLContext *) hglrc; if (ctx->ctx == NULL) { ENTER_GL(); --- 354,370 ---- ERR("Null DC !!!\n"); ret = FALSE; } else { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; + Drawable drawable; + + if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") != NULL || getenv("WINE_NWTOOLSET_HACK_ENABLE") != NULL) + { + drawable = get_gldrawable( hdc ); + } + else + { + drawable = get_drawable( hdc ); + } if (ctx->ctx == NULL) { ENTER_GL(); diff -X exclude.lst -cr winex/dlls/x11drv/winpos.c nwwinex/dlls/x11drv/winpos.c *** winex/dlls/x11drv/winpos.c 2004-02-05 19:14:02.000000000 -0500 --- nwwinex/dlls/x11drv/winpos.c 2004-04-07 15:09:07.000000000 -0400 *************** *** 418,424 **** WND *win = WIN_GetPtr( hwnd ); HWND top = 0; X11DRV_WND_DATA *data = win->pDriverData; ! Drawable drawable; BOOL visible; POINT org; int mode = IncludeInferiors; --- 418,424 ---- WND *win = WIN_GetPtr( hwnd ); HWND top = 0; X11DRV_WND_DATA *data = win->pDriverData; ! Drawable drawable, gldrawable; BOOL visible; POINT org; int mode = IncludeInferiors; *************** *** 453,459 **** if (top) { ! HWND parent = GetAncestor( top, GA_PARENT ); org.x = org.y = 0; if (flags & DCX_WINDOW) { --- 453,474 ---- if (top) { ! HWND parent; ! ! if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE_WIN") != NULL) ! { ! parent = top; ! } ! if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") != NULL || getenv("WINE_NWTOOLSET_HACK_ENABLE") != NULL) ! { ! gldrawable=X11DRV_get_client_window(top); ! parent = GetAncestor( top, GA_PARENT ); ! } ! if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WIN") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE") == NULL) ! { ! parent = GetAncestor( top, GA_PARENT ); ! } ! org.x = org.y = 0; if (flags & DCX_WINDOW) { *************** *** 486,491 **** --- 501,510 ---- org.y = 0; if (flags & DCX_CLIPCHILDREN) mode = ClipByChildren; /* can use X11 clipping */ } + if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") != NULL || getenv("WINE_NWTOOLSET_HACK_ENABLE") != NULL) + { + gldrawable=drawable; + } } #if 1 if (X11DRV_DD_PrimaryDIB && hwnd != X11DRV_DD_PrimaryWnd) *************** *** 507,513 **** * to work - this partially helps it by (hopefully) redirecting the * drawing to the ddraw window */ #endif ! X11DRV_SetDrawable( hdc, drawable, mode, org.x, org.y ); if (flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) || SetHookFlags16( hdc, DCHF_VALIDATEVISRGN )) /* DC was dirty */ --- 526,539 ---- * to work - this partially helps it by (hopefully) redirecting the * drawing to the ddraw window */ #endif ! if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") != NULL || getenv("WINE_NWTOOLSET_HACK_ENABLE") != NULL) ! { ! X11DRV_SetDrawable_NWN( hdc, drawable, mode, org.x, org.y, gldrawable ); ! } ! else ! { ! X11DRV_SetDrawable( hdc, drawable, mode, org.x, org.y ); ! } if (flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN) || SetHookFlags16( hdc, DCHF_VALIDATEVISRGN )) /* DC was dirty */ diff -X exclude.lst -cr winex/graphics/x11drv/clipping.c nwwinex/graphics/x11drv/clipping.c *** winex/graphics/x11drv/clipping.c 2003-07-25 17:45:33.000000000 -0400 --- nwwinex/graphics/x11drv/clipping.c 2004-04-07 15:13:17.000000000 -0400 *************** *** 178,180 **** --- 178,204 ---- } } + + /* NWWine version of X11DRV_SetDrawable */ + void X11DRV_SetDrawable_NWN(HDC hdc, Drawable drawable, int mode, int org_x, int org_y, Drawable gldrawable ) + { + DC *dc = DC_GetDCPtr( hdc ); + if (dc) + { + X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev; + + if(physDev->xrender) + X11DRV_XRender_UpdateDrawable( dc ); + /* physDev->org = *org; */ + + if (dc->hClipRgn) OffsetRgn( dc->hClipRgn, org_x - dc->DCOrgX, org_y - dc->DCOrgY ); + dc->DCOrgX = org_x; + dc->DCOrgY = org_y; + + physDev->drawable = drawable; + physDev->gldrawable = gldrawable; + /* physDev->drawable_org = *drawable_org; */ + TSXSetSubwindowMode( gdi_display, physDev->gc, mode ); + GDI_ReleaseObj( hdc ); + } + } diff -X exclude.lst -cr winex/graphics/x11drv/init.c nwwinex/graphics/x11drv/init.c *** winex/graphics/x11drv/init.c 2004-01-08 09:32:28.000000000 -0500 --- nwwinex/graphics/x11drv/init.c 2004-04-07 14:49:01.000000000 -0400 *************** *** 331,336 **** --- 331,342 ---- case X11DRV_GET_DRAWABLE: *(Drawable *)out_data = physDev->drawable; return TRUE; + case X11DRV_GET_GLDRAWABLE: + if (out_count >= sizeof(Drawable)) + { + *(Drawable *)out_data = physDev->gldrawable; + return TRUE; + } case X11DRV_GET_FONT: { fontObject *pfo = XFONT_GetFontObject(physDev->font); diff -X exclude.lst -cr winex/graphics/x11drv/opengl.c nwwinex/graphics/x11drv/opengl.c *** winex/graphics/x11drv/opengl.c 2003-10-21 21:15:57.000000000 -0400 --- nwwinex/graphics/x11drv/opengl.c 2004-04-07 15:14:11.000000000 -0400 *************** *** 312,318 **** TRACE("(%p)\n", dc); ENTER_GL(); ! glXSwapBuffers(gdi_display, physDev->drawable); LEAVE_GL(); return TRUE; --- 312,325 ---- TRACE("(%p)\n", dc); ENTER_GL(); ! if (getenv("WINE_NWTOOLSET_HACK_ENABLE_WINv2") == NULL && getenv("WINE_NWTOOLSET_HACK_ENABLE") == NULL) ! { ! glXSwapBuffers(gdi_display, physDev->drawable); ! } ! else ! { ! glXSwapBuffers(gdi_display, physDev->gldrawable); ! } LEAVE_GL(); return TRUE; diff -X exclude.lst -cr winex/include/x11drv.h nwwinex/include/x11drv.h *** winex/include/x11drv.h 2004-02-05 19:14:02.000000000 -0500 --- nwwinex/include/x11drv.h 2004-04-07 15:12:46.000000000 -0400 *************** *** 65,70 **** --- 65,71 ---- { GC gc; /* X Window GC */ Drawable drawable; + Drawable gldrawable; X_PHYSFONT font; X_PHYSPEN pen; X_PHYSBRUSH brush; *************** *** 178,183 **** --- 179,185 ---- extern Pixmap X11DRV_BITMAP_CreatePixmapFromBitmap( HBITMAP hBmp, HDC hdc ); extern void X11DRV_SetDrawable( HDC hdc, Drawable drawable, int mode, int org_x, int org_y ); + extern void X11DRV_SetDrawable_NWN( HDC hdc, Drawable drawable, int mode, int org_x, int org_y, Drawable gldrawable ); extern void X11DRV_StartGraphicsExposures( HDC hdc ); extern void X11DRV_EndGraphicsExposures( HDC hdc, HRGN hrgn ); *************** *** 323,328 **** --- 325,331 ---- X11DRV_GET_DISPLAY, X11DRV_GET_DRAWABLE, X11DRV_GET_FONT, + X11DRV_GET_GLDRAWABLE, X11DRV_LOCK_BITMAP, X11DRV_UNLOCK_BITMAP }; diff -X exclude.lst -cr winex/scheduler/client.c nwwinex/scheduler/client.c *** winex/scheduler/client.c 2003-07-25 17:45:36.000000000 -0400 --- nwwinex/scheduler/client.c 2004-04-07 14:53:43.000000000 -0400 *************** *** 44,51 **** #define SCM_RIGHTS 1 #endif ! #define CONFDIR "/.wine" /* directory for Wine config relative to $HOME */ ! #define SERVERDIR "/wineserver-" /* server socket directory (hostname appended) */ #define SOCKETNAME "socket" /* name of the socket file */ #ifndef HAVE_MSGHDR_ACCRIGHTS --- 44,51 ---- #define SCM_RIGHTS 1 #endif ! #define CONFDIR "/.nwwinex" /* directory for Wine config relative to $HOME */ ! #define SERVERDIR "/nwwinexserver-" /* server socket directory (hostname appended) */ #define SOCKETNAME "socket" /* name of the socket file */ #ifndef HAVE_MSGHDR_ACCRIGHTS diff -X exclude.lst -cr winex/server/request.c nwwinex/server/request.c *** winex/server/request.c 2001-12-31 05:52:44.000000000 -0500 --- nwwinex/server/request.c 2004-04-07 14:54:12.000000000 -0400 *************** *** 40,47 **** #endif /* path names for server master Unix socket */ ! #define CONFDIR "/.wine" /* directory for Wine config relative to $HOME */ ! #define SERVERDIR "wineserver-" /* server socket directory (hostname appended) */ #define SOCKETNAME "socket" /* name of the socket file */ struct master_socket --- 40,47 ---- #endif /* path names for server master Unix socket */ ! #define CONFDIR "/.nwwinex" /* directory for Wine config relative to $HOME */ ! #define SERVERDIR "nwwinexserver-" /* server socket directory (hostname appended) */ #define SOCKETNAME "socket" /* name of the socket file */ struct master_socket *** /dev/null 2003-09-23 13:59:22.000000000 -0400 --- nwwinex/append-Makefile 2004-04-07 14:55:03.000000000 -0400 *************** *** 0 **** --- 1,8 ---- + + + + install-nwwinescript: + cp nwwine.sh $(bindir)/nwwine + chmod a+rx $(bindir)/nwwine + cp nwwine-gltest.sh $(bindir)/nwwine-gltest + chmod a+rx $(bindir)/nwwine-gltest *** /dev/null 2003-09-23 13:59:22.000000000 -0400 --- nwwinex/nwwine-gltest.sh 2004-04-07 14:55:06.000000000 -0400 *************** *** 0 **** --- 1,9 ---- + #!/bin/bash + export WINE_NWTOOLSET_HACK_ENABLE_WINv2="yes" + # This enables the hack that we hope is actually no longer a hack, but a fix ;) + # All other things are left untouched. + # For testing purposes only. + # NWN Toolset will NOT run properly with this - the menus will be unresponsive. + # You can still run "wine application.exe" if you need exactly the behavior of Wine. + wine $@ + *** /dev/null 2003-09-23 13:59:22.000000000 -0400 --- nwwinex/nwwine.sh 2004-04-07 14:55:10.000000000 -0400 *************** *** 0 **** --- 1,25 ---- + #!/bin/sh + export WINE_NWTOOLSET_HACK_ENABLE_M="yes" + + #export WINE_NWTOOLSET_HACK_ENABLE_WIN="yes" + # The above version is oboslete, though still should work; newer hack (v2) should be used instead: + # If both this and v2 environment variables are set, then v2 hack will be used. + + export WINE_NWTOOLSET_HACK_ENABLE_WINv2="yes" + # Note: The above modification is done in a way that (as I understand it) + # should NOT break compatibility with other applications. However this still + # needs testing before inclusion in official Wine tree, so please consider + # running ALL of your applications with this environment variable set, and + # not just the toolset, and report successes or failures. + + export WINE_NWTOOLSET_HACK_ENABLE_EH="yes" + + + + + # The above environment variables control which NWWine hacks are to be used. + # Note: the program checks just if the variables are set, not if they are set to "yes" + # This means that setting them to "yes", "blahblahblah", "yEs", or "no" will have the same effect + # If WINE_NWTOOLSET_HACK_ENABLE variable is set, then it will make NWWine enable all its hacks + # regardless of other variables. + wine $@ *** /dev/null 2003-09-23 13:59:22.000000000 -0400 --- nwwinex/patch-Makefile 2004-04-07 21:24:26.000000000 -0400 *************** *** 0 **** --- 1,5 ---- + 402c402 + < install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__) + --- + > install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__) install-nwwinescript + *** winex/graphics/x11drv/dib.c 2004-05-06 22:01:39.000000000 +0200 --- nwwinex/graphics/x11drv/dib.c 2004-06-13 02:11:02.000000000 +0200 *************** *** 4580,4586 **** wine_tsx11_lock(); ! if ( !(bmpImage || descr->sharedPixmap) ) /* shared pixmap is same depth stuff */ { imageCreated = TRUE; if (descr->image) --- 4580,4590 ---- wine_tsx11_lock(); ! if ( !(bmpImage ! #ifdef HAVE_LIBXXSHM ! || descr->sharedPixmap ! #endif /* HAVE_LIBXXSHM */ ! ) ) /* shared pixmap is same depth stuff */ { imageCreated = TRUE; if (descr->image) *************** *** 4753,4759 **** wine_tsx11_lock(); ! if (! (bmpImage || descr->sharedPixmap) ) { imageCreated = TRUE; if (descr->image) --- 4757,4767 ---- wine_tsx11_lock(); ! if (! (bmpImage ! #ifdef HAVE_LIBXXSHM ! || descr->sharedPixmap ! #endif /* HAVE_LIBXXSHM */ ! ) ) { imageCreated = TRUE; if (descr->image) *************** *** 6098,6104 **** shminfo->shmid = shmget(IPC_PRIVATE, imgsize, IPC_CREAT|0777); XDestroyImage(tmpXImage); ! if (pitch != bm->bmWidthBytes && depth == DEPTH_FROM_BPP(bm->bmBitsPixel)) ERR("pitch mismatch in ShmPixmap creation\n"); if (size) *size = imgsize; --- 6106,6112 ---- shminfo->shmid = shmget(IPC_PRIVATE, imgsize, IPC_CREAT|0777); XDestroyImage(tmpXImage); ! if (pitch != bm->bmWidthBytes && depth == DEPTH_FROM_BPP(bm->bmBitsPixel)) ERR("pitch mismatch in ShmPixmap creation. Consider Compiling without XShm\n"); if (size) *size = imgsize; *************** *** 6495,6501 **** if (VIRTUAL_SetFaultHandler(bm.bmBits, X11DRV_DIB_FaultHandler, (LPVOID)res)) { X11DRV_DIB_DoProtectDIBSection( bmp, PAGE_READWRITE ); ! if (dib) dib->status = dib->sharedPixmap ? DIB_Status_InSync : DIB_Status_AppMod; } } --- 6503,6513 ---- if (VIRTUAL_SetFaultHandler(bm.bmBits, X11DRV_DIB_FaultHandler, (LPVOID)res)) { X11DRV_DIB_DoProtectDIBSection( bmp, PAGE_READWRITE ); ! if (dib) dib->status = ! #ifdef HAVE_LIBXXSHM ! dib->sharedPixmap ? DIB_Status_InSync : ! #endif ! DIB_Status_AppMod; } } *** winex/dlls/oleaut32/oaidl_p.c 2004-04-12 20:48:20.000000000 +0200 --- nwwinex/dlls/oleaut32/oaidl_p.c 2004-06-06 23:56:51.000000000 +0200 *************** *** 65,71 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") HRESULT STDMETHODCALLTYPE IDispatch_GetTypeInfoCount_Proxy( IDispatch __RPC_FAR * This, --- 65,70 ---- *************** *** 432,449 **** MIDL_STUB_MESSAGE _StubMsg; UINT cNames; LCID lcid; ! DISPID __RPC_FAR *rgDispId; ! LPOLESTR __RPC_FAR *rgszNames; ! REFIID riid; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFIID )riid = 0; ! ( LPOLESTR __RPC_FAR * )rgszNames = 0; ! ( DISPID __RPC_FAR * )rgDispId = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 431,446 ---- MIDL_STUB_MESSAGE _StubMsg; UINT cNames; LCID lcid; ! DISPID __RPC_FAR *rgDispId = 0; ! LPOLESTR __RPC_FAR *rgszNames = 0; ! IID *riid = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 719,744 **** DISPID dispIdMember; DWORD dwFlags; LCID lcid; ! UINT __RPC_FAR *pArgErr; ! DISPPARAMS __RPC_FAR *pDispParams; ! EXCEPINFO __RPC_FAR *pExcepInfo; ! VARIANT __RPC_FAR *pVarResult; ! VARIANTARG __RPC_FAR *rgVarRef; ! UINT __RPC_FAR *rgVarRefIdx; ! REFIID riid; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFIID )riid = 0; ! ( DISPPARAMS __RPC_FAR * )pDispParams = 0; ! ( VARIANT __RPC_FAR * )pVarResult = 0; ! ( EXCEPINFO __RPC_FAR * )pExcepInfo = 0; ! ( UINT __RPC_FAR * )pArgErr = 0; ! ( UINT __RPC_FAR * )rgVarRefIdx = 0; ! ( VARIANTARG __RPC_FAR * )rgVarRef = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 716,735 ---- DISPID dispIdMember; DWORD dwFlags; LCID lcid; ! UINT __RPC_FAR *pArgErr = 0; ! DISPPARAMS __RPC_FAR *pDispParams = 0; ! EXCEPINFO __RPC_FAR *pExcepInfo = 0; ! VARIANT __RPC_FAR *pVarResult = 0; ! VARIANTARG __RPC_FAR *rgVarRef = 0; ! UINT __RPC_FAR *rgVarRefIdx = 0; ! IID *riid = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 868,881 **** const CINTERFACE_PROXY_VTABLE(7) _IDispatchProxyVtbl = { ! &IID_IDispatch, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IDispatch_GetTypeInfoCount_Proxy , ! IDispatch_GetTypeInfo_Proxy , ! IDispatch_GetIDsOfNames_Proxy , ! IDispatch_Invoke_Proxy }; --- 859,874 ---- const CINTERFACE_PROXY_VTABLE(7) _IDispatchProxyVtbl = { ! { &IID_IDispatch }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IDispatch_GetTypeInfoCount_Proxy , ! IDispatch_GetTypeInfo_Proxy , ! IDispatch_GetIDsOfNames_Proxy , ! IDispatch_Invoke_Proxy ! } }; *************** *** 889,899 **** const CInterfaceStubVtbl _IDispatchStubVtbl = { ! &IID_IDispatch, ! 0, ! 7, ! &IDispatch_table[-3], ! CStdStubBuffer_METHODS }; --- 882,894 ---- const CInterfaceStubVtbl _IDispatchStubVtbl = { ! { ! &IID_IDispatch, ! 0, ! 7, ! &IDispatch_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 904,911 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - /* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumVARIANT_RemoteNext_Proxy( IEnumVARIANT __RPC_FAR * This, /* [in] */ ULONG celt, --- 899,904 ---- *************** *** 1394,1407 **** const CINTERFACE_PROXY_VTABLE(7) _IEnumVARIANTProxyVtbl = { ! &IID_IEnumVARIANT, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IEnumVARIANT_Next_Proxy , ! IEnumVARIANT_Skip_Proxy , ! IEnumVARIANT_Reset_Proxy , ! IEnumVARIANT_Clone_Proxy }; --- 1387,1402 ---- const CINTERFACE_PROXY_VTABLE(7) _IEnumVARIANTProxyVtbl = { ! { &IID_IEnumVARIANT }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IEnumVARIANT_Next_Proxy , ! IEnumVARIANT_Skip_Proxy , ! IEnumVARIANT_Reset_Proxy , ! IEnumVARIANT_Clone_Proxy ! } }; *************** *** 1415,1425 **** const CInterfaceStubVtbl _IEnumVARIANTStubVtbl = { ! &IID_IEnumVARIANT, ! 0, ! 7, ! &IEnumVARIANT_table[-3], ! CStdStubBuffer_METHODS }; --- 1410,1422 ---- const CInterfaceStubVtbl _IEnumVARIANTStubVtbl = { ! { ! &IID_IEnumVARIANT, ! 0, ! 7, ! &IEnumVARIANT_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 1430,1437 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - /* [call_as] */ HRESULT STDMETHODCALLTYPE ITypeComp_RemoteBind_Proxy( ITypeComp __RPC_FAR * This, /* [in] */ LPOLESTR szName, --- 1427,1432 ---- *************** *** 1944,1955 **** const CINTERFACE_PROXY_VTABLE(5) _ITypeCompProxyVtbl = { ! &IID_ITypeComp, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeComp_Bind_Proxy , ! ITypeComp_BindType_Proxy }; --- 1939,1952 ---- const CINTERFACE_PROXY_VTABLE(5) _ITypeCompProxyVtbl = { ! { &IID_ITypeComp }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeComp_Bind_Proxy , ! ITypeComp_BindType_Proxy ! } }; *************** *** 1961,1971 **** const CInterfaceStubVtbl _ITypeCompStubVtbl = { ! &IID_ITypeComp, ! 0, ! 5, ! &ITypeComp_table[-3], ! CStdStubBuffer_METHODS }; --- 1958,1970 ---- const CInterfaceStubVtbl _ITypeCompStubVtbl = { ! { ! &IID_ITypeComp, ! 0, ! 5, ! &ITypeComp_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 1976,1983 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - /* [call_as] */ HRESULT STDMETHODCALLTYPE ITypeInfo_RemoteGetTypeAttr_Proxy( ITypeInfo __RPC_FAR * This, /* [out] */ LPTYPEATTR __RPC_FAR *ppTypeAttr, --- 1975,1980 ---- *************** *** 4032,4047 **** IUnknown __RPC_FAR *__RPC_FAR *_M45; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! IUnknown __RPC_FAR *__RPC_FAR *ppvObj; ! REFIID riid; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFIID )riid = 0; ! ( IUnknown __RPC_FAR *__RPC_FAR * )ppvObj = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 4029,4043 ---- IUnknown __RPC_FAR *__RPC_FAR *_M45; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! IUnknown __RPC_FAR *__RPC_FAR *ppvObj = 0; ! IID *riid = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 4052,4058 **** (PFORMAT_STRING) &__MIDL_TypeFormatString.Format[38], (unsigned char)0 ); ! ppvObj = &_M45; _M45 = 0; *_pdwStubPhase = STUB_CALL_SERVER; --- 4048,4054 ---- (PFORMAT_STRING) &__MIDL_TypeFormatString.Format[38], (unsigned char)0 ); ! ppvObj = (void*)&_M45; _M45 = 0; *_pdwStubPhase = STUB_CALL_SERVER; *************** *** 4664,4692 **** const CINTERFACE_PROXY_VTABLE(22) _ITypeInfoProxyVtbl = { ! &IID_ITypeInfo, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeInfo_GetTypeAttr_Proxy , ! ITypeInfo_GetTypeComp_Proxy , ! ITypeInfo_GetFuncDesc_Proxy , ! ITypeInfo_GetVarDesc_Proxy , ! ITypeInfo_GetNames_Proxy , ! ITypeInfo_GetRefTypeOfImplType_Proxy , ! ITypeInfo_GetImplTypeFlags_Proxy , ! ITypeInfo_GetIDsOfNames_Proxy , ! ITypeInfo_Invoke_Proxy , ! ITypeInfo_GetDocumentation_Proxy , ! ITypeInfo_GetDllEntry_Proxy , ! ITypeInfo_GetRefTypeInfo_Proxy , ! ITypeInfo_AddressOfMember_Proxy , ! ITypeInfo_CreateInstance_Proxy , ! ITypeInfo_GetMops_Proxy , ! ITypeInfo_GetContainingTypeLib_Proxy , ! ITypeInfo_ReleaseTypeAttr_Proxy , ! ITypeInfo_ReleaseFuncDesc_Proxy , ! ITypeInfo_ReleaseVarDesc_Proxy }; --- 4660,4690 ---- const CINTERFACE_PROXY_VTABLE(22) _ITypeInfoProxyVtbl = { ! { &IID_ITypeInfo }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeInfo_GetTypeAttr_Proxy , ! ITypeInfo_GetTypeComp_Proxy , ! ITypeInfo_GetFuncDesc_Proxy , ! ITypeInfo_GetVarDesc_Proxy , ! ITypeInfo_GetNames_Proxy , ! ITypeInfo_GetRefTypeOfImplType_Proxy , ! ITypeInfo_GetImplTypeFlags_Proxy , ! ITypeInfo_GetIDsOfNames_Proxy , ! ITypeInfo_Invoke_Proxy , ! ITypeInfo_GetDocumentation_Proxy , ! ITypeInfo_GetDllEntry_Proxy , ! ITypeInfo_GetRefTypeInfo_Proxy , ! ITypeInfo_AddressOfMember_Proxy , ! ITypeInfo_CreateInstance_Proxy , ! ITypeInfo_GetMops_Proxy , ! ITypeInfo_GetContainingTypeLib_Proxy , ! ITypeInfo_ReleaseTypeAttr_Proxy , ! ITypeInfo_ReleaseFuncDesc_Proxy , ! ITypeInfo_ReleaseVarDesc_Proxy ! } }; *************** *** 4715,4725 **** const CInterfaceStubVtbl _ITypeInfoStubVtbl = { ! &IID_ITypeInfo, ! 0, ! 22, ! &ITypeInfo_table[-3], ! CStdStubBuffer_METHODS }; --- 4713,4725 ---- const CInterfaceStubVtbl _ITypeInfoStubVtbl = { ! { ! &IID_ITypeInfo, ! 0, ! 22, ! &ITypeInfo_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 4730,4737 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE ITypeInfo2_GetTypeKind_Proxy( ITypeInfo2 __RPC_FAR * This, /* [out] */ TYPEKIND __RPC_FAR *pTypeKind) --- 4730,4735 ---- *************** *** 5282,5297 **** VARIANT _M53; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 5280,5294 ---- VARIANT _M53; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 5443,5459 **** VARIANT _M54; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; UINT index; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 5440,5455 ---- VARIANT _M54; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; UINT index; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 5611,5628 **** VARIANT _M55; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; UINT indexFunc; UINT indexParam; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 5607,5623 ---- VARIANT _M55; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; UINT indexFunc; UINT indexParam; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 5780,5796 **** VARIANT _M56; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; UINT index; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 5775,5790 ---- VARIANT _M56; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; UINT index; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 5945,5961 **** VARIANT _M57; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; UINT index; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 5939,5954 ---- VARIANT _M57; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; UINT index; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 6936,6979 **** const CINTERFACE_PROXY_VTABLE(37) _ITypeInfo2ProxyVtbl = { ! &IID_ITypeInfo2, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeInfo_GetTypeAttr_Proxy , ! ITypeInfo_GetTypeComp_Proxy , ! ITypeInfo_GetFuncDesc_Proxy , ! ITypeInfo_GetVarDesc_Proxy , ! ITypeInfo_GetNames_Proxy , ! ITypeInfo_GetRefTypeOfImplType_Proxy , ! ITypeInfo_GetImplTypeFlags_Proxy , ! ITypeInfo_GetIDsOfNames_Proxy , ! ITypeInfo_Invoke_Proxy , ! ITypeInfo_GetDocumentation_Proxy , ! ITypeInfo_GetDllEntry_Proxy , ! ITypeInfo_GetRefTypeInfo_Proxy , ! ITypeInfo_AddressOfMember_Proxy , ! ITypeInfo_CreateInstance_Proxy , ! ITypeInfo_GetMops_Proxy , ! ITypeInfo_GetContainingTypeLib_Proxy , ! ITypeInfo_ReleaseTypeAttr_Proxy , ! ITypeInfo_ReleaseFuncDesc_Proxy , ! ITypeInfo_ReleaseVarDesc_Proxy , ! ITypeInfo2_GetTypeKind_Proxy , ! ITypeInfo2_GetTypeFlags_Proxy , ! ITypeInfo2_GetFuncIndexOfMemId_Proxy , ! ITypeInfo2_GetVarIndexOfMemId_Proxy , ! ITypeInfo2_GetCustData_Proxy , ! ITypeInfo2_GetFuncCustData_Proxy , ! ITypeInfo2_GetParamCustData_Proxy , ! ITypeInfo2_GetVarCustData_Proxy , ! ITypeInfo2_GetImplTypeCustData_Proxy , ! ITypeInfo2_GetDocumentation2_Proxy , ! ITypeInfo2_GetAllCustData_Proxy , ! ITypeInfo2_GetAllFuncCustData_Proxy , ! ITypeInfo2_GetAllParamCustData_Proxy , ! ITypeInfo2_GetAllVarCustData_Proxy , ! ITypeInfo2_GetAllImplTypeCustData_Proxy }; --- 6929,6974 ---- const CINTERFACE_PROXY_VTABLE(37) _ITypeInfo2ProxyVtbl = { ! { &IID_ITypeInfo2 }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeInfo_GetTypeAttr_Proxy , ! ITypeInfo_GetTypeComp_Proxy , ! ITypeInfo_GetFuncDesc_Proxy , ! ITypeInfo_GetVarDesc_Proxy , ! ITypeInfo_GetNames_Proxy , ! ITypeInfo_GetRefTypeOfImplType_Proxy , ! ITypeInfo_GetImplTypeFlags_Proxy , ! ITypeInfo_GetIDsOfNames_Proxy , ! ITypeInfo_Invoke_Proxy , ! ITypeInfo_GetDocumentation_Proxy , ! ITypeInfo_GetDllEntry_Proxy , ! ITypeInfo_GetRefTypeInfo_Proxy , ! ITypeInfo_AddressOfMember_Proxy , ! ITypeInfo_CreateInstance_Proxy , ! ITypeInfo_GetMops_Proxy , ! ITypeInfo_GetContainingTypeLib_Proxy , ! ITypeInfo_ReleaseTypeAttr_Proxy , ! ITypeInfo_ReleaseFuncDesc_Proxy , ! ITypeInfo_ReleaseVarDesc_Proxy , ! ITypeInfo2_GetTypeKind_Proxy , ! ITypeInfo2_GetTypeFlags_Proxy , ! ITypeInfo2_GetFuncIndexOfMemId_Proxy , ! ITypeInfo2_GetVarIndexOfMemId_Proxy , ! ITypeInfo2_GetCustData_Proxy , ! ITypeInfo2_GetFuncCustData_Proxy , ! ITypeInfo2_GetParamCustData_Proxy , ! ITypeInfo2_GetVarCustData_Proxy , ! ITypeInfo2_GetImplTypeCustData_Proxy , ! ITypeInfo2_GetDocumentation2_Proxy , ! ITypeInfo2_GetAllCustData_Proxy , ! ITypeInfo2_GetAllFuncCustData_Proxy , ! ITypeInfo2_GetAllParamCustData_Proxy , ! ITypeInfo2_GetAllVarCustData_Proxy , ! ITypeInfo2_GetAllImplTypeCustData_Proxy ! } }; *************** *** 7017,7027 **** const CInterfaceStubVtbl _ITypeInfo2StubVtbl = { &IID_ITypeInfo2, 0, 37, ! &ITypeInfo2_table[-3], ! CStdStubBuffer_METHODS }; --- 7012,7024 ---- const CInterfaceStubVtbl _ITypeInfo2StubVtbl = { + { &IID_ITypeInfo2, 0, 37, ! &ITypeInfo2_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 7032,7039 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - /* [call_as] */ HRESULT STDMETHODCALLTYPE ITypeLib_RemoteGetTypeInfoCount_Proxy( ITypeLib __RPC_FAR * This, /* [out] */ UINT __RPC_FAR *pcTInfo) --- 7029,7034 ---- *************** *** 7496,7511 **** ITypeInfo __RPC_FAR *_M64; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; ! ITypeInfo __RPC_FAR *__RPC_FAR *ppTinfo; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( ITypeInfo __RPC_FAR *__RPC_FAR * )ppTinfo = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 7491,7505 ---- ITypeInfo __RPC_FAR *_M64; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; ! ITypeInfo __RPC_FAR *__RPC_FAR *ppTinfo = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 8677,8696 **** const CINTERFACE_PROXY_VTABLE(13) _ITypeLibProxyVtbl = { ! &IID_ITypeLib, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeLib_GetTypeInfoCount_Proxy , ! ITypeLib_GetTypeInfo_Proxy , ! ITypeLib_GetTypeInfoType_Proxy , ! ITypeLib_GetTypeInfoOfGuid_Proxy , ! ITypeLib_GetLibAttr_Proxy , ! ITypeLib_GetTypeComp_Proxy , ! ITypeLib_GetDocumentation_Proxy , ! ITypeLib_IsName_Proxy , ! ITypeLib_FindName_Proxy , ! ITypeLib_ReleaseTLibAttr_Proxy }; --- 8671,8692 ---- const CINTERFACE_PROXY_VTABLE(13) _ITypeLibProxyVtbl = { ! { &IID_ITypeLib }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeLib_GetTypeInfoCount_Proxy , ! ITypeLib_GetTypeInfo_Proxy , ! ITypeLib_GetTypeInfoType_Proxy , ! ITypeLib_GetTypeInfoOfGuid_Proxy , ! ITypeLib_GetLibAttr_Proxy , ! ITypeLib_GetTypeComp_Proxy , ! ITypeLib_GetDocumentation_Proxy , ! ITypeLib_IsName_Proxy , ! ITypeLib_FindName_Proxy , ! ITypeLib_ReleaseTLibAttr_Proxy ! } }; *************** *** 8710,8720 **** const CInterfaceStubVtbl _ITypeLibStubVtbl = { ! &IID_ITypeLib, ! 0, ! 13, ! &ITypeLib_table[-3], ! CStdStubBuffer_METHODS }; --- 8706,8718 ---- const CInterfaceStubVtbl _ITypeLibStubVtbl = { ! { ! &IID_ITypeLib, ! 0, ! 13, ! &ITypeLib_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 8725,8732 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE ITypeLib2_GetCustData_Proxy( ITypeLib2 __RPC_FAR * This, /* [in] */ REFGUID guid, --- 8723,8728 ---- *************** *** 8821,8836 **** VARIANT _M85; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID guid; ! VARIANT __RPC_FAR *pVarVal; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )guid = 0; ! ( VARIANT __RPC_FAR * )pVarVal = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 8817,8831 ---- VARIANT _M85; HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *guid = 0; ! VARIANT __RPC_FAR *pVarVal = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 9363,9386 **** const CINTERFACE_PROXY_VTABLE(17) _ITypeLib2ProxyVtbl = { ! &IID_ITypeLib2, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeLib_GetTypeInfoCount_Proxy , ! ITypeLib_GetTypeInfo_Proxy , ! ITypeLib_GetTypeInfoType_Proxy , ! ITypeLib_GetTypeInfoOfGuid_Proxy , ! ITypeLib_GetLibAttr_Proxy , ! ITypeLib_GetTypeComp_Proxy , ! ITypeLib_GetDocumentation_Proxy , ! ITypeLib_IsName_Proxy , ! ITypeLib_FindName_Proxy , ! ITypeLib_ReleaseTLibAttr_Proxy , ! ITypeLib2_GetCustData_Proxy , ! ITypeLib2_GetLibStatistics_Proxy , ! ITypeLib2_GetDocumentation2_Proxy , ! ITypeLib2_GetAllCustData_Proxy }; --- 9358,9383 ---- const CINTERFACE_PROXY_VTABLE(17) _ITypeLib2ProxyVtbl = { ! { &IID_ITypeLib2 }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeLib_GetTypeInfoCount_Proxy , ! ITypeLib_GetTypeInfo_Proxy , ! ITypeLib_GetTypeInfoType_Proxy , ! ITypeLib_GetTypeInfoOfGuid_Proxy , ! ITypeLib_GetLibAttr_Proxy , ! ITypeLib_GetTypeComp_Proxy , ! ITypeLib_GetDocumentation_Proxy , ! ITypeLib_IsName_Proxy , ! ITypeLib_FindName_Proxy , ! ITypeLib_ReleaseTLibAttr_Proxy , ! ITypeLib2_GetCustData_Proxy , ! ITypeLib2_GetLibStatistics_Proxy , ! ITypeLib2_GetDocumentation2_Proxy , ! ITypeLib2_GetAllCustData_Proxy ! } }; *************** *** 9404,9414 **** const CInterfaceStubVtbl _ITypeLib2StubVtbl = { ! &IID_ITypeLib2, ! 0, ! 17, ! &ITypeLib2_table[-3], ! CStdStubBuffer_METHODS }; --- 9401,9413 ---- const CInterfaceStubVtbl _ITypeLib2StubVtbl = { ! { ! &IID_ITypeLib2, ! 0, ! 17, ! &ITypeLib2_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 9423,9430 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE IErrorInfo_GetGUID_Proxy( IErrorInfo __RPC_FAR * This, /* [out] */ GUID __RPC_FAR *pGUID) --- 9422,9427 ---- *************** *** 10048,10062 **** const CINTERFACE_PROXY_VTABLE(8) _IErrorInfoProxyVtbl = { ! &IID_IErrorInfo, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IErrorInfo_GetGUID_Proxy , ! IErrorInfo_GetSource_Proxy , ! IErrorInfo_GetDescription_Proxy , ! IErrorInfo_GetHelpFile_Proxy , ! IErrorInfo_GetHelpContext_Proxy }; --- 10045,10061 ---- const CINTERFACE_PROXY_VTABLE(8) _IErrorInfoProxyVtbl = { ! { &IID_IErrorInfo }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! IErrorInfo_GetGUID_Proxy , ! IErrorInfo_GetSource_Proxy , ! IErrorInfo_GetDescription_Proxy , ! IErrorInfo_GetHelpFile_Proxy , ! IErrorInfo_GetHelpContext_Proxy ! } }; *************** *** 10071,10081 **** const CInterfaceStubVtbl _IErrorInfoStubVtbl = { ! &IID_IErrorInfo, ! 0, ! 8, ! &IErrorInfo_table[-3], ! CStdStubBuffer_METHODS }; --- 10070,10082 ---- const CInterfaceStubVtbl _IErrorInfoStubVtbl = { ! { ! &IID_IErrorInfo, ! 0, ! 8, ! &IErrorInfo_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 10086,10093 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetGUID_Proxy( ICreateErrorInfo __RPC_FAR * This, /* [in] */ REFGUID rguid) --- 10087,10092 ---- *************** *** 10159,10172 **** { HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFGUID rguid; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFGUID )rguid = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 10158,10171 ---- { HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! GUID *rguid = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 10631,10645 **** const CINTERFACE_PROXY_VTABLE(8) _ICreateErrorInfoProxyVtbl = { ! &IID_ICreateErrorInfo, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ICreateErrorInfo_SetGUID_Proxy , ! ICreateErrorInfo_SetSource_Proxy , ! ICreateErrorInfo_SetDescription_Proxy , ! ICreateErrorInfo_SetHelpFile_Proxy , ! ICreateErrorInfo_SetHelpContext_Proxy }; --- 10630,10646 ---- const CINTERFACE_PROXY_VTABLE(8) _ICreateErrorInfoProxyVtbl = { ! { &IID_ICreateErrorInfo }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ICreateErrorInfo_SetGUID_Proxy , ! ICreateErrorInfo_SetSource_Proxy , ! ICreateErrorInfo_SetDescription_Proxy , ! ICreateErrorInfo_SetHelpFile_Proxy , ! ICreateErrorInfo_SetHelpContext_Proxy ! } }; *************** *** 10654,10664 **** const CInterfaceStubVtbl _ICreateErrorInfoStubVtbl = { ! &IID_ICreateErrorInfo, ! 0, ! 8, ! &ICreateErrorInfo_table[-3], ! CStdStubBuffer_METHODS }; --- 10655,10667 ---- const CInterfaceStubVtbl _ICreateErrorInfoStubVtbl = { ! { ! &IID_ICreateErrorInfo, ! 0, ! 8, ! &ICreateErrorInfo_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 10669,10676 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE ISupportErrorInfo_InterfaceSupportsErrorInfo_Proxy( ISupportErrorInfo __RPC_FAR * This, /* [in] */ REFIID riid) --- 10672,10677 ---- *************** *** 10742,10755 **** { HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! REFIID riid; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! ( REFIID )riid = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 10743,10756 ---- { HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ! IID *riid = 0; NdrStubInitialize( _pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer); ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 10782,10792 **** const CINTERFACE_PROXY_VTABLE(4) _ISupportErrorInfoProxyVtbl = { ! &IID_ISupportErrorInfo, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ISupportErrorInfo_InterfaceSupportsErrorInfo_Proxy }; --- 10783,10795 ---- const CINTERFACE_PROXY_VTABLE(4) _ISupportErrorInfoProxyVtbl = { ! { &IID_ISupportErrorInfo }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ISupportErrorInfo_InterfaceSupportsErrorInfo_Proxy ! } }; *************** *** 10797,10807 **** const CInterfaceStubVtbl _ISupportErrorInfoStubVtbl = { ! &IID_ISupportErrorInfo, ! 0, ! 4, ! &ISupportErrorInfo_table[-3], ! CStdStubBuffer_METHODS }; --- 10800,10812 ---- const CInterfaceStubVtbl _ISupportErrorInfoStubVtbl = { ! { ! &IID_ISupportErrorInfo, ! 0, ! 4, ! &ISupportErrorInfo_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 10812,10819 **** extern const MIDL_STUB_DESC Object_StubDesc; - #pragma code_seg(".orpc") - HRESULT STDMETHODCALLTYPE ITypeFactory_CreateFromTypeInfo_Proxy( ITypeFactory __RPC_FAR * This, /* [in] */ ITypeInfo __RPC_FAR *pTypeInfo, --- 10817,10822 ---- *************** *** 10920,10927 **** HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ITypeInfo __RPC_FAR *pTypeInfo; ! IUnknown __RPC_FAR *__RPC_FAR *ppv; ! REFIID riid; NdrStubInitialize( _pRpcMessage, --- 10923,10930 ---- HRESULT _RetVal; MIDL_STUB_MESSAGE _StubMsg; ITypeInfo __RPC_FAR *pTypeInfo; ! IUnknown __RPC_FAR *__RPC_FAR *ppv = 0; ! IID *riid = 0; NdrStubInitialize( _pRpcMessage, *************** *** 10929,10936 **** &Object_StubDesc, _pRpcChannelBuffer); pTypeInfo = 0; ! ( REFIID )riid = 0; ! ( IUnknown __RPC_FAR *__RPC_FAR * )ppv = 0; RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) --- 10932,10938 ---- &Object_StubDesc, _pRpcChannelBuffer); pTypeInfo = 0; ! RpcTryFinally { if ( (_pRpcMessage->DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) *************** *** 10946,10952 **** (PFORMAT_STRING) &__MIDL_TypeFormatString.Format[38], (unsigned char)0 ); ! ppv = &_M101; _M101 = 0; *_pdwStubPhase = STUB_CALL_SERVER; --- 10948,10954 ---- (PFORMAT_STRING) &__MIDL_TypeFormatString.Format[38], (unsigned char)0 ); ! ppv = (void*) &_M101; _M101 = 0; *_pdwStubPhase = STUB_CALL_SERVER; *************** *** 11004,11010 **** 0, NdrOleAllocate, NdrOleFree, ! 0, 0, 0, 0, --- 11006,11012 ---- 0, NdrOleAllocate, NdrOleFree, ! { 0 }, 0, 0, 0, *************** *** 11025,11035 **** const CINTERFACE_PROXY_VTABLE(4) _ITypeFactoryProxyVtbl = { ! &IID_ITypeFactory, ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeFactory_CreateFromTypeInfo_Proxy }; --- 11027,11039 ---- const CINTERFACE_PROXY_VTABLE(4) _ITypeFactoryProxyVtbl = { ! { &IID_ITypeFactory }, ! { ! IUnknown_QueryInterface_Proxy, ! IUnknown_AddRef_Proxy, ! IUnknown_Release_Proxy , ! ITypeFactory_CreateFromTypeInfo_Proxy ! } }; *************** *** 11040,11050 **** const CInterfaceStubVtbl _ITypeFactoryStubVtbl = { ! &IID_ITypeFactory, ! 0, ! 4, ! &ITypeFactory_table[-3], ! CStdStubBuffer_METHODS }; --- 11044,11056 ---- const CInterfaceStubVtbl _ITypeFactoryStubVtbl = { ! { ! &IID_ITypeFactory, ! 0, ! 4, ! &ITypeFactory_table[-3] ! }, ! { CStdStubBuffer_METHODS } }; *************** *** 11071,11098 **** /* Object interface: ICreateTypeLib2, ver. 0.0, GUID={0x0002040F,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */ - #pragma data_seg(".rdata") - static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[3] = { { ! VARIANT_UserSize ! ,VARIANT_UserMarshal ! ,VARIANT_UserUnmarshal ! ,VARIANT_UserFree }, { ! BSTR_UserSize ! ,BSTR_UserMarshal ! ,BSTR_UserUnmarshal ! ,BSTR_UserFree }, { ! CLEANLOCALSTORAGE_UserSize ! ,CLEANLOCALSTORAGE_UserMarshal ! ,CLEANLOCALSTORAGE_UserUnmarshal ! ,CLEANLOCALSTORAGE_UserFree } }; --- 11077,11102 ---- /* Object interface: ICreateTypeLib2, ver. 0.0, GUID={0x0002040F,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */ static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[3] = { { ! (USER_MARSHAL_SIZING_ROUTINE) VARIANT_UserSize, ! (USER_MARSHAL_MARSHALLING_ROUTINE) VARIANT_UserMarshal, ! (USER_MARSHAL_UNMARSHALLING_ROUTINE) VARIANT_UserUnmarshal, ! (USER_MARSHAL_FREEING_ROUTINE) VARIANT_UserFree }, { ! (USER_MARSHAL_SIZING_ROUTINE) BSTR_UserSize, ! (USER_MARSHAL_MARSHALLING_ROUTINE) BSTR_UserMarshal, ! (USER_MARSHAL_UNMARSHALLING_ROUTINE) BSTR_UserUnmarshal, ! (USER_MARSHAL_FREEING_ROUTINE) BSTR_UserFree }, { ! (USER_MARSHAL_SIZING_ROUTINE) CLEANLOCALSTORAGE_UserSize, ! (USER_MARSHAL_MARSHALLING_ROUTINE) CLEANLOCALSTORAGE_UserMarshal, ! (USER_MARSHAL_UNMARSHALLING_ROUTINE) CLEANLOCALSTORAGE_UserUnmarshal, ! (USER_MARSHAL_FREEING_ROUTINE) CLEANLOCALSTORAGE_UserFree } };