July 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmsynth: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 4afd3e46fcbbccb8ee575f41fe4772b38d0270ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afd3e46fcbbccb8ee575f41f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:57:55 2011 +0200 dmsynth: Merge the IClassFactory implementations. --- dlls/dmsynth/dmsynth_main.c | 133 ++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 77 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 0915d50..87cc3c7 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -31,107 +31,86 @@ static HINSTANCE instance; LONG DMSYNTH_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** - * DirectMusicSynth ClassFactory + * IClassFactory implementation */ -static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; -} - -static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} - -static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); - - return 1; /* non-heap based object */ +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter); +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); - - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DMSYNTH_LockModule(); - return S_OK; + return 2; /* non-heap based object */ } -static const IClassFactoryVtbl SynthCF_Vtbl = { - SynthCF_QueryInterface, - SynthCF_AddRef, - SynthCF_Release, - SynthCF_CreateInstance, - SynthCF_LockServer -}; - -static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl}; - -/****************************************************************** - * DirectMusicSynthSink ClassFactory - */ -static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DMSYNTH_UnlockModule(); - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; + return 1; /* non-heap based object */ } -static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); -static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); + TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return 1; /* non-heap based object */ + return This->fnCreateInstance(riid, ppv, pUnkOuter); } -static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter); -} +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("(%d)\n", dolock); -static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); + if (dolock) + DMSYNTH_LockModule(); + else + DMSYNTH_UnlockModule(); - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); - - return S_OK; + return S_OK; } -static const IClassFactoryVtbl SynthSinkCF_Vtbl = { - SynthSinkCF_QueryInterface, - SynthSinkCF_AddRef, - SynthSinkCF_Release, - SynthSinkCF_CreateInstance, - SynthSinkCF_LockServer +static const IClassFactoryVtbl classfactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer }; -static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl}; - +static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthImpl}; +static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl}, + DMUSIC_CreateDirectMusicSynthSinkImpl}; + /****************************************************************** * DllMain *

1 0

Michael Stefaniuc : dmscript: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 6c1e349b6ea4d4171bec182842fb0f07e1336ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1e349b6ea4d4171bec18284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:59:11 2011 +0200 dmscript: Merge the IClassFactory implementations. --- dlls/dmscript/dmscript_main.c | 557 +++++------------------------------------ 1 files changed, 69 insertions(+), 488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c1e349b6ea4d4171bec1…

1 0

Jacek Caban : iexplore: Moved iexplore registration extension to iexplore. exe.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 3faa938712cbce470701b49b935687cffeb058c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faa938712cbce470701b49b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:19 2011 +0200 iexplore: Moved iexplore registration extension to iexplore.exe. --- dlls/shdocvw/factory.c | 125 +------------------- dlls/shdocvw/shdocvw.rc | 3 - programs/iexplore/Makefile.in | 1 + .../shdocvw.inf => programs/iexplore/iexplore.inf | 17 +-- programs/iexplore/iexplore.rc | 3 + programs/iexplore/main.c | 56 +++++++++- 6 files changed, 70 insertions(+), 135 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 5c0f106..ce6ddb9 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -23,7 +23,6 @@ #include "shdocvw.h" #include "winreg.h" -#include "advpub.h" #include "rpcproxy.h" #include "isguids.h" @@ -74,77 +73,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } -static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) -{ - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - HMODULE hadvpack; - HRESULT hres; - - static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - hadvpack = LoadLibraryW(advpackW); - pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); - - hres = pRegInstall(shdocvw_hinstance, section, strtable); - - FreeLibrary(hadvpack); - return hres; -} - -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - STRTABLEA strtable; - STRENTRYA pse[3]; - static CLSID const *clsids[3]; - unsigned int i = 0; - HRESULT hres; - - INF_SET_CLSID(Internet); - INF_SET_CLSID(InternetExplorer); - INF_SET_CLSID(InternetShortcut); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (shdocvw.@) */ HRESULT WINAPI DllRegisterServer(void) { - HRESULT hres; - - hres = __wine_register_resources( shdocvw_hinstance, NULL ); - if(FAILED(hres)) - return hres; - - return register_server(TRUE); + TRACE("\n"); + return __wine_register_resources( shdocvw_hinstance, NULL ); } /*********************************************************************** @@ -152,57 +87,12 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - HRESULT hres; - - hres = register_server(FALSE); - if(FAILED(hres)) - return hres; - + TRACE("\n"); return __wine_unregister_resources( shdocvw_hinstance, NULL ); } -static BOOL check_native_ie(void) -{ - static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - DWORD handle,size; - BOOL ret = TRUE; - - size = GetFileVersionInfoSizeW(cszPath,&handle); - if (size) - { - LPVOID buf; - LPWSTR lpFileDescription; - UINT dwBytes; - static const WCHAR cszFD[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','0','4','0','9','0','4','e','4','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR cszWine[] = {'W','i','n','e',0}; - - buf = HeapAlloc(GetProcessHeap(),0,size); - GetFileVersionInfoW(cszPath,0,size,buf); - - if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) && - strstrW(lpFileDescription,cszWine)) - ret = FALSE; - - HeapFree(GetProcessHeap(), 0, buf); - } - - return ret; -} - -static DWORD register_iexplore(BOOL doregister) -{ - HRESULT hres; - if (check_native_ie()) - { - TRACE("Native IE detected, not doing registration\n"); - return S_OK; - } - hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); - return FAILED(hres); -} - /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (SHDOCVW.101) * * Only returns on error. */ @@ -212,13 +102,6 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - if(*szCommandLine == '-' || *szCommandLine == '/') { - if(!strcasecmp(szCommandLine+1, "regserver")) - return register_iexplore(TRUE); - if(!strcasecmp(szCommandLine+1, "unregserver")) - return register_iexplore(FALSE); - } - pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); if(!pIEWinMain) ExitProcess(1); diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index bd47bbd..555eabd 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -33,8 +33,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw_v1.tlb */ 1 TYPELIB shdocvw_v1.tlb -/* @makedep: shdocvw.inf */ -REGINST REGINST shdocvw.inf - /* @makedep: shdocvw.rgs */ 2 WINE_REGISTRY shdocvw.rgs diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 547f8f0..6762af6 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows IMPORTS = shdocvw user32 gdi32 +DELAYIMPORTS = advpack version C_SRCS = \ main.c diff --git a/dlls/shdocvw/shdocvw.inf b/programs/iexplore/iexplore.inf similarity index 88% rename from dlls/shdocvw/shdocvw.inf rename to programs/iexplore/iexplore.inf index 2cf9d6e..a45df9f 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/programs/iexplore/iexplore.inf @@ -2,20 +2,12 @@ Signature="$CHICAGO$" -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - [RegisterIE] -AddReg=IE.Reg, Settings.Reg +AddReg=Classes.Reg, IE.Reg, Settings.Reg [UnregisterIE] -DelReg=IE.Reg, Settings.Reg +DelReg=Classes.Reg, IE.Reg, Settings.Reg [Classes.Reg] @@ -44,3 +36,8 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" + + +[Strings] +CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" +CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index 64a976c..cd75781 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -28,3 +28,6 @@ /* @makedep: iexplore.ico */ 1 ICON iexplore.ico + +/* @makedep: iexplore.inf */ +REGINST REGINST iexplore.inf diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 0ecf0d9..6065ba9 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -19,10 +19,64 @@ */ #include <windows.h> +#include <advpub.h> +#include <rpcproxy.h> + +#include "wine/unicode.h" +#include "wine/debug.h" extern DWORD WINAPI IEWinMain(LPSTR, int); -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +static BOOL check_native_ie(void) +{ + DWORD handle, size; + LPWSTR file_desc; + UINT bytes; + void* buf; + BOOL ret; + + static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; + static const WCHAR wineW[] = {'W','i','n','e',0}; + static const WCHAR file_desc_strW[] = + {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','0','4','0','9','0','4','e','4', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + + size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + if(!size) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + GetFileVersionInfoW(browseui_dllW, 0, size,buf); + + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} + +static DWORD register_iexplore(BOOL doregister) +{ + HRESULT hres; + + if (check_native_ie()) { + WINE_MESSAGE("Native IE detected, not doing registration\n"); + return 0; + } + + hres = RegInstallA(NULL, doregister ? "RegisterIE" : "UnregisterIE", NULL); + return FAILED(hres); +} + +int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { + + if(*cmdline == '-' || *cmdline == '/') { + if(!strcasecmp(cmdline+1, "regserver")) + return register_iexplore(TRUE); + if(!strcasecmp(cmdline+1, "unregserver")) + return register_iexplore(FALSE); + } + return IEWinMain(cmdline, show); }

1 0

Jacek Caban : iexplore: Removed unneeded imports.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a9700cbc84187822851f4e62052e7628a07729ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9700cbc84187822851f4e620… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:40 2011 +0200 iexplore: Removed unneeded imports. --- programs/iexplore/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 6762af6..1c1e191 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows -IMPORTS = shdocvw user32 gdi32 +IMPORTS = shdocvw DELAYIMPORTS = advpack version C_SRCS = \

1 0

Jacek Caban : ieframe: Removed remaining bits of shdocvw.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 7a428c3fd2aa66a9c7921f4e069b42b9042d342b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a428c3fd2aa66a9c7921f4e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:18:33 2011 +0200 ieframe: Removed remaining bits of shdocvw. --- dlls/ieframe/Es.rc | 2 +- dlls/ieframe/Fr.rc | 2 +- dlls/ieframe/classinfo.c | 2 +- dlls/ieframe/client.c | 2 +- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/events.c | 2 +- dlls/ieframe/frame.c | 2 +- dlls/ieframe/ie.c | 2 +- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/iexplore.c | 4 ++-- dlls/ieframe/navigate.c | 2 +- dlls/ieframe/oleobject.c | 2 +- dlls/ieframe/persist.c | 2 +- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/taskbarlist.c | 2 +- dlls/ieframe/urlhist.c | 2 +- dlls/ieframe/view.c | 2 +- dlls/ieframe/webbrowser.c | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/Es.rc b/dlls/ieframe/Es.rc index e0537f1..808de7b 100644 --- a/dlls/ieframe/Es.rc +++ b/dlls/ieframe/Es.rc @@ -1,5 +1,5 @@ /* - * Spanish resources for shdocvw + * Spanish resources for ieframe * * Copyright 2010 José Rostagno * diff --git a/dlls/ieframe/Fr.rc b/dlls/ieframe/Fr.rc index 7b25fee..485420a 100644 --- a/dlls/ieframe/Fr.rc +++ b/dlls/ieframe/Fr.rc @@ -1,5 +1,5 @@ /* - * shdocvw French resources + * ieframe French resources * * Copyright 2010 Frédéric Delanoy * diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 8e68754..30b8871 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IProvideClassInfo2 interface diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index e9d6ad9..970e28d 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleClientSite(IOleClientSite *iface) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ffe65a1..5f60056 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -24,7 +24,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); diff --git a/dlls/ieframe/events.c b/dlls/ieframe/events.c index d2c6f1f..5a426ab 100644 --- a/dlls/ieframe/events.c +++ b/dlls/ieframe/events.c @@ -28,7 +28,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct ConnectionPoint { IConnectionPoint IConnectionPoint_iface; diff --git a/dlls/ieframe/frame.c b/dlls/ieframe/frame.c index ef06064..d394d74 100644 --- a/dlls/ieframe/frame.c +++ b/dlls/ieframe/frame.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index c1f9cfd..5fe0a26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface) { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f657ce4..89f69fa 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -1,5 +1,5 @@ /* - * Header includes for shdocvw.dll + * Header includes for ieframe.dll * * Copyright 2011 Jacek Caban for CodeWeavers * diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 76bef14..99e3003 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -42,7 +42,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); #define IDI_APPICON 1 @@ -1016,7 +1016,7 @@ static void release_dde(void) } /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (ieframe.101) * * Only returns on error. */ diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 35c550d..2fea374 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -30,7 +30,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static const WCHAR emptyW[] = {0}; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index e4ee717..d227bcc 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -33,7 +33,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /* shlwapi.dll */ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index 93716bb..3529023 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -23,7 +23,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IPersistStorage interface diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 48f0e20..c3ff6c8 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); typedef struct { IShellBrowser IShellBrowser_iface; diff --git a/dlls/ieframe/taskbarlist.c b/dlls/ieframe/taskbarlist.c index 747a033..5055d80 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/ieframe/taskbarlist.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct taskbar_list { diff --git a/dlls/ieframe/urlhist.c b/dlls/ieframe/urlhist.c index 89480df..157138c 100644 --- a/dlls/ieframe/urlhist.c +++ b/dlls/ieframe/urlhist.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) { diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 5d0c87d..2bf14b5 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IViewObject interface diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index c398786..d1004df 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline WebBrowser *impl_from_IWebBrowser2(IWebBrowser2 *iface) {

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for clearing output parameters on error.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a37ec01bd1aa2196ec224203fb10a4b0a41667b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ec01bd1aa2196ec224203f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:43:12 2011 +0200 rpcrt4: Add a phase in proxies for clearing output parameters on error. --- dlls/rpcrt4/ndr_stubless.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index fa175d1..017be5d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -346,6 +346,7 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s for (i = 0; i < number_of_params; i++) { unsigned char *pArg = pStubMsg->StackTop + params[i].stack_offset; + PFORMAT_STRING pTypeFormat = (PFORMAT_STRING)&pStubMsg->StubDesc->pFormatTypes[params[i].u.type_offset]; #ifdef __x86_64__ /* floats are passed as doubles through varargs functions */ float f; @@ -361,18 +362,14 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s #endif TRACE("param[%d]: %p type %02x %s\n", i, pArg, - params[i].attr.IsBasetype ? params[i].u.type_format_char : - pStubMsg->StubDesc->pFormatTypes[params[i].u.type_offset], + params[i].attr.IsBasetype ? params[i].u.type_format_char : *pTypeFormat, debugstr_PROC_PF( params[i].attr )); - /* if a simple ref pointer then we have to do the - * check for the pointer being non-NULL. */ - if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) - RpcRaiseException(RPC_X_NULL_REF_POINTER); - switch (phase) { case STUBLESS_CALCSIZE: + if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) + RpcRaiseException(RPC_X_NULL_REF_POINTER); if (params[i].attr.IsIn) call_buffer_sizer(pStubMsg, pArg, &params[i]); break; case STUBLESS_MARSHAL: @@ -385,6 +382,10 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s call_unmarshaller(pStubMsg, &pArg, &params[i], 0); } break; + case STUBLESS_FREE: + if (!params[i].attr.IsBasetype && params[i].attr.IsOut && !params[i].attr.IsByValue) + NdrClearOutParameters( pStubMsg, pTypeFormat, *(unsigned char **)pArg ); + break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR); } @@ -652,6 +653,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma * 3. MARSHAL - marshal [in] params into the buffer * 4. SENDRECEIVE - send/receive buffer * 5. UNMARSHAL - unmarshal [out] params from buffer + * 6. FREE - clear [out] parameters (for proxies, and only on error) */ if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) @@ -735,7 +737,13 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma __EXCEPT_ALL { if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + /* 6. FREE */ + TRACE( "FREE\n" ); + client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, + number_of_params, (unsigned char *)&RetVal); RetVal = NdrProxyErrorHandler(GetExceptionCode()); + } else { const COMM_FAULT_OFFSETS *comm_fault_offsets = &pStubDesc->CommFaultOffsets[procedure_number];

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for zeroing output parameters on startup.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 2bdff697338cc559580a863e3c2e85d5a292f761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdff697338cc559580a863e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:43:12 2011 +0200 rpcrt4: Add a phase in proxies for zeroing output parameters on startup. --- dlls/rpcrt4/ndr_stubless.c | 162 ++++++++++++++++++++++++-------------------- 1 files changed, 89 insertions(+), 73 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 017be5d..243a0af 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -144,6 +144,62 @@ static inline void call_freer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemor if (m) m(pStubMsg, pMemory, pFormat); } +static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +{ + DWORD size; + switch(*pFormat) + { + case RPC_FC_STRUCT: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_STRUCT: + size = *(const WORD*)(pFormat + 2); + if(*(const WORD*)(pFormat + 4)) + FIXME("Unhandled conformant description\n"); + break; + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: + size = *(const WORD*)(pFormat + 2); + ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_SMFARRAY: + case RPC_FC_SMVARRAY: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_LGFARRAY: + case RPC_FC_LGVARRAY: + size = *(const DWORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_ARRAY: + pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); + size = ComplexStructSize(pStubMsg, pFormat); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + if (*pFormat == RPC_FC_C_CSTRING) + size = sizeof(CHAR); + else + size = sizeof(WCHAR); + if (pFormat[1] == RPC_FC_STRING_SIZED) + ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); + else + pStubMsg->MaxCount = 0; + size *= pStubMsg->MaxCount; + break; + default: + FIXME("Unhandled type %02x\n", *pFormat); + /* fallthrough */ + case RPC_FC_RP: + size = sizeof(void *); + break; + } + return size; +} + void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { #if 0 /* these functions are not defined yet */ @@ -367,6 +423,13 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s switch (phase) { + case STUBLESS_INITOUT: + if (!params[i].attr.IsBasetype && params[i].attr.IsOut && + !params[i].attr.IsIn && !params[i].attr.IsByValue) + { + memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); + } + break; case STUBLESS_CALCSIZE: if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) RpcRaiseException(RPC_X_NULL_REF_POINTER); @@ -648,24 +711,33 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } /* order of phases: - * 1. CALCSIZE - calculate the buffer size - * 2. GETBUFFER - allocate the buffer - * 3. MARSHAL - marshal [in] params into the buffer - * 4. SENDRECEIVE - send/receive buffer - * 5. UNMARSHAL - unmarshal [out] params from buffer - * 6. FREE - clear [out] parameters (for proxies, and only on error) + * 1. INITOUT - zero [out] parameters (proxies only) + * 2. CALCSIZE - calculate the buffer size + * 3. GETBUFFER - allocate the buffer + * 4. MARSHAL - marshal [in] params into the buffer + * 5. SENDRECEIVE - send/receive buffer + * 6. UNMARSHAL - unmarshal [out] params from buffer + * 7. FREE - clear [out] parameters (for proxies, and only on error) */ if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) { + /* 1. INITOUT */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + TRACE( "INITOUT\n" ); + client_do_args(&stubMsg, pFormat, STUBLESS_INITOUT, fpu_stack, + number_of_params, (unsigned char *)&RetVal); + } + __TRY { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -691,12 +763,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -729,7 +801,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -738,7 +810,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma { if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { - /* 6. FREE */ + /* 7. FREE */ TRACE( "FREE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -774,12 +846,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } else { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (Oif_flags.HasPipes) /* NdrGetPipeBuffer(...) */ @@ -796,12 +868,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (Oif_flags.HasPipes) /* NdrPipesSendReceive(...) */ @@ -823,7 +895,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -1000,62 +1072,6 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif -static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) -{ - DWORD size; - switch(*pFormat) - { - case RPC_FC_STRUCT: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_STRUCT: - size = *(const WORD*)(pFormat + 2); - if(*(const WORD*)(pFormat + 4)) - FIXME("Unhandled conformant description\n"); - break; - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - size = *(const WORD*)(pFormat + 2); - ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_SMFARRAY: - case RPC_FC_SMVARRAY: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_LGFARRAY: - case RPC_FC_LGVARRAY: - size = *(const DWORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_ARRAY: - pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); - size = ComplexStructSize(pStubMsg, pFormat); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - if (*pFormat == RPC_FC_C_CSTRING) - size = sizeof(CHAR); - else - size = sizeof(WCHAR); - if (pFormat[1] == RPC_FC_STRING_SIZED) - ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); - else - pStubMsg->MaxCount = 0; - size *= pStubMsg->MaxCount; - break; - default: - FIXME("Unhandled type %02x\n", *pFormat); - /* fallthrough */ - case RPC_FC_RP: - size = sizeof(void *); - break; - } - return size; -} - static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params)

1 0

Alexandre Julliard : rpcrt4: Support sizing of a few more argument types.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 976cd5c9fee029ab0eb8190f738a80ab6703fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=976cd5c9fee029ab0eb8190f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 12:08:47 2011 +0200 rpcrt4: Support sizing of a few more argument types. --- dlls/rpcrt4/ndr_stubless.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 243a0af..4e00269 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -150,6 +150,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) switch(*pFormat) { case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: size = *(const WORD*)(pFormat + 2); break; case RPC_FC_BOGUS_STRUCT: @@ -178,6 +179,15 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; break; + case RPC_FC_USER_MARSHAL: + size = *(const WORD*)(pFormat + 4); + break; + case RPC_FC_CSTRING: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_WSTRING: + size = *(const WORD*)(pFormat + 2) * sizeof(WCHAR); + break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: if (*pFormat == RPC_FC_C_CSTRING)

1 0

Austin English : makefiles: sysconfdir is unused.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 5d5f267e090df465ff018a13888f89c42c4a62cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5f267e090df465ff018a138… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 28 11:48:02 2011 -0700 makefiles: sysconfdir is unused. --- Make.vars.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index bc0ca36..10d74e8 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -8,7 +8,6 @@ datarootdir = @datarootdir@ datadir = @datadir@ infodir = @infodir@ mandir = @mandir@ -sysconfdir = @sysconfdir@ fontdir = $(datadir)/wine/fonts includedir = @includedir@/wine dlldir = @libdir@/wine

1 0

Frédéric Delanoy : tools: Assorted spelling fixes .
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 701aabb14148d703bd7345c5f8027e04626d0402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701aabb14148d703bd7345c5f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 21:51:20 2011 +0200 tools: Assorted spelling fixes. --- tools/sfnt2fnt.c | 2 +- tools/winegcc/winegcc.c | 2 +- tools/wmc/utils.c | 2 +- tools/wmc/write.c | 2 +- tools/wrc/translation.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index f58c40b..d83d2be 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -579,7 +579,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, else left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; - /* On the last non-trival output byte (x == x_end) have we got one or two input bytes */ + /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) right_byte = 0; else diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9e75509..284223e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1252,7 +1252,7 @@ int main(int argc, char **argv) { if (argv[i][0] == '-') /* option */ { - /* determine if tihs switch is followed by a separate argument */ + /* determine if this switch is followed by a separate argument */ next_is_arg = 0; option_arg = 0; switch(argv[i][1]) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6f26da3..276eeb4 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -219,7 +219,7 @@ int unistricmp(const WCHAR *s1, const WCHAR *s2) { int i; int once = 0; - static const char warn[] = "Don't know the uppercase equivalent of non acsii characters;" + static const char warn[] = "Don't know the uppercase equivalent of non ascii characters;" "comparison might yield wrong results"; while(*s1 && *s2) { diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 0fc38ad..cf170d4 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -231,7 +231,7 @@ void write_h_file(const char *fname) if(!once) { /* - * Search for an english text. + * Search for an English text. * If not found, then use the first in the list */ once++; diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 20e8346..6cfe07a 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -983,7 +983,7 @@ static resource_t *find_main(int type, name_id_t *id, resource_lang_node_t *lang if (neutral != NULL && (en != NULL || en_US != NULL)) { - fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translarion\n", + fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translation\n", type, get_nameid_str(id)); }

1 0