December 2008 - Wine-Commits

Francois Gouget : dmloader: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: b362db03276b7a105b629ece9ef7f8be7b0cf843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b362db03276b7a105b629ece9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 28 15:19:26 2008 +0100 dmloader: Remove WINAPI on static functions where not needed. --- dlls/dmloader/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 1a6d095..4bb3c43 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -21,7 +21,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); -static HRESULT WINAPI DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); +static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); /***************************************************************************** * IDirectMusicLoaderImpl implementation @@ -893,7 +893,7 @@ HRESULT WINAPI DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl } /* help function for setting search path and caching option for certain class */ -static HRESULT WINAPI DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { +static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); struct list *pEntry; HRESULT result = S_FALSE; /* in case pClassID != GUID_DirectMusicAllTypes and not a valid CLSID */

1 0

Alexandre Julliard : widl: Do not make the stub vtbl const for delegating interfaces since it needs to be patched up at run-time .
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 584d2c91182c5bcb4606adbbc7f3e0164f667e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=584d2c91182c5bcb4606adbbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 11:30:05 2008 +0100 widl: Do not make the stub vtbl const for delegating interfaces since it needs to be patched up at run-time. --- tools/widl/proxy.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 74bec7b..51a35a6 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -607,7 +607,8 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent--; fprintf(proxy, "};\n"); print_proxy( "\n"); - print_proxy( "static const CInterfaceStubVtbl _%sStubVtbl =\n", iface->name); + print_proxy( "static %sCInterfaceStubVtbl _%sStubVtbl =\n", + need_delegation(iface) ? "" : "const ", iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n"); @@ -784,7 +785,7 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, "static const CInterfaceStubVtbl* const _%s_StubVtblList[] =\n", file_id); fprintf(proxy, "{\n"); - write_proxy_iface_name_format(stmts, " (const CInterfaceStubVtbl*)&_%sStubVtbl,\n"); + write_proxy_iface_name_format(stmts, " &_%sStubVtbl,\n"); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n");

1 0

Alexandre Julliard : rpcrt4: Create the NumMethods key too when registering an interface.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 797ee403c1f35fd00ee50256abd483c2f8f7d5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797ee403c1f35fd00ee50256a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 29 13:05:11 2008 +0100 rpcrt4: Create the NumMethods key too when registering an interface. --- dlls/rpcrt4/cpsf.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index e261422..bece899 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -223,6 +223,8 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, static const WCHAR clsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; static const WCHAR interfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR psfactoryW[] = {'P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; + static const WCHAR numformatW[] = {'%','u',0}; + static const WCHAR nummethodsW[] = {'N','u','m','M','e','t','h','o','d','s',0}; static const WCHAR inprocserverW[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR threadingmodelW[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; WCHAR clsid[39], keyname[50], module[MAX_PATH]; @@ -245,9 +247,12 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, strcpyW( keyname, interfaceW ); format_clsid( keyname + strlenW(keyname), proxy->header.piid ); if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { + WCHAR num[10]; if (name) RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE *)name, strlen(name)+1); RegSetValueW( key, clsid32W, REG_SZ, clsid, 0 ); + sprintfW(num, numformatW, proxy->header.DispatchTableCount); + RegSetValueW( key, nummethodsW, REG_SZ, num, 0 ); RegCloseKey(key); } }

1 0

Alexandre Julliard : rpcrt4: Use RegDeleteTree to properly unregister interfaces.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: ad54700b9419db445f5fda5c97fe751038151bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad54700b9419db445f5fda5c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 29 13:02:08 2008 +0100 rpcrt4: Use RegDeleteTree to properly unregister interfaces. --- dlls/rpcrt4/cpsf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index d19d229..e261422 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -298,7 +298,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, strcpyW( keyname, interfaceW ); format_clsid( keyname + strlenW(keyname), proxy->header.piid ); - RegDeleteKeyW(HKEY_CLASSES_ROOT, keyname); + RegDeleteTreeW(HKEY_CLASSES_ROOT, keyname); } pProxyFileList++; } @@ -306,7 +306,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, /* unregister clsid */ strcpyW( keyname, clsidW ); format_clsid( keyname + strlenW(keyname), pclsid ); - RegDeleteKeyW(HKEY_CLASSES_ROOT, keyname); + RegDeleteTreeW(HKEY_CLASSES_ROOT, keyname); return S_OK; }

1 0

Alexandre Julliard : rpcrt4: Convert the dll registration routines to Unicode.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 77b3864fed23ccd90fded4783346c9cd01373288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b3864fed23ccd90fded4783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 29 13:01:29 2008 +0100 rpcrt4: Convert the dll registration routines to Unicode. --- dlls/rpcrt4/cpsf.c | 102 ++++++++++++++++++++++++++------------------------- 1 files changed, 52 insertions(+), 50 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 22537fd..d19d229 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -36,12 +36,25 @@ #include "rpcproxy.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "cpsf.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +static void format_clsid( WCHAR *buffer, const CLSID *clsid ) +{ + static const WCHAR clsid_formatW[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0}; + + sprintfW( buffer, clsid_formatW, clsid->Data1, clsid->Data2, clsid->Data3, + clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], + clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + +} + static BOOL FindProxyInfo(const ProxyFileInfo **pProxyFileList, REFIID riid, const ProxyFileInfo **pProxyInfo, int *pIndex) { while (*pProxyFileList) { @@ -197,6 +210,7 @@ HRESULT WINAPI NdrDllCanUnloadNow(CStdPSFactoryBuffer *pPSFactoryBuffer) return !(pPSFactoryBuffer->RefCount); } + /*********************************************************************** * NdrDllRegisterProxy [RPCRT4.@] */ @@ -204,13 +218,19 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid) { - LPSTR clsid; - char keyname[120], module[MAX_PATH]; + static const WCHAR bothW[] = {'B','o','t','h',0}; + static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; + static const WCHAR clsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; + static const WCHAR interfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; + static const WCHAR psfactoryW[] = {'P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; + static const WCHAR inprocserverW[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; + static const WCHAR threadingmodelW[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; + WCHAR clsid[39], keyname[50], module[MAX_PATH]; HKEY key, subkey; DWORD len; TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); - UuidToStringA((UUID*)pclsid, (unsigned char**)&clsid); + format_clsid( clsid, pclsid ); /* register interfaces to point to clsid */ while (*pProxyFileList) { @@ -218,23 +238,16 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, for (u=0; u<(*pProxyFileList)->TableSize; u++) { CInterfaceStubVtbl *proxy = (*pProxyFileList)->pStubVtblList[u]; PCInterfaceName name = (*pProxyFileList)->pNamesArray[u]; - LPSTR iid; - TRACE("registering %s %s => %s\n", name, debugstr_guid(proxy->header.piid), clsid); + TRACE("registering %s %s => %s\n", + debugstr_a(name), debugstr_guid(proxy->header.piid), debugstr_w(clsid)); - UuidToStringA((UUID*)proxy->header.piid, (unsigned char**)&iid); - snprintf(keyname, sizeof(keyname), "Interface\\{%s}", iid); - RpcStringFreeA((unsigned char**)&iid); - if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { + strcpyW( keyname, interfaceW ); + format_clsid( keyname + strlenW(keyname), proxy->header.piid ); + if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { if (name) - RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE *)name, strlen(name)); - if (RegCreateKeyExA(key, "ProxyStubClsid32", 0, NULL, 0, - KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { - snprintf(module, sizeof(module), "{%s}", clsid); - RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); - RegCloseKey(subkey); - } + RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE *)name, strlen(name)+1); + RegSetValueW( key, clsid32W, REG_SZ, clsid, 0 ); RegCloseKey(key); } } @@ -242,25 +255,22 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, } /* register clsid to point to module */ - snprintf(keyname, sizeof(keyname), "CLSID\\{%s}", clsid); - len = GetModuleFileNameA(hDll, module, sizeof(module)); + strcpyW( keyname, clsidW ); + strcatW( keyname, clsid ); + len = GetModuleFileNameW(hDll, module, sizeof(module)/sizeof(WCHAR)); if (len && len < sizeof(module)) { - TRACE("registering CLSID %s => %s\n", clsid, module); - if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { - RegSetValueExA(subkey, NULL, 0, REG_SZ, (const BYTE *)"PSFactoryBuffer", strlen("PSFactoryBuffer")); - if (RegCreateKeyExA(key, "InProcServer32", 0, NULL, 0, - KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { - RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); - RegSetValueExA(subkey, "ThreadingModel", 0, REG_SZ, (const BYTE *)"Both", strlen("Both")); - RegCloseKey(subkey); + TRACE("registering CLSID %s => %s\n", debugstr_w(clsid), debugstr_w(module)); + if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { + RegSetValueExW(subkey, NULL, 0, REG_SZ, (const BYTE *)psfactoryW, sizeof(psfactoryW)); + if (RegCreateKeyW(key, inprocserverW, &subkey) == ERROR_SUCCESS) { + RegSetValueExW(subkey, NULL, 0, REG_SZ, (LPBYTE)module, (strlenW(module)+1)*sizeof(WCHAR)); + RegSetValueExW(subkey, threadingmodelW, 0, REG_SZ, (const BYTE *)bothW, sizeof(bothW)); + RegCloseKey(subkey); + } + RegCloseKey(key); } - RegCloseKey(key); - } } - /* done */ - RpcStringFreeA((unsigned char**)&clsid); return S_OK; } @@ -271,12 +281,11 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid) { - LPSTR clsid; - char keyname[120], module[MAX_PATH]; - DWORD len; + static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; + static const WCHAR interfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; + WCHAR keyname[50]; TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); - UuidToStringA((UUID*)pclsid, (unsigned char**)&clsid); /* unregister interfaces */ while (*pProxyFileList) { @@ -284,27 +293,20 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, for (u=0; u<(*pProxyFileList)->TableSize; u++) { CInterfaceStubVtbl *proxy = (*pProxyFileList)->pStubVtblList[u]; PCInterfaceName name = (*pProxyFileList)->pNamesArray[u]; - LPSTR iid; - TRACE("unregistering %s %s <= %s\n", name, debugstr_guid(proxy->header.piid), clsid); + TRACE("unregistering %s %s\n", debugstr_a(name), debugstr_guid(proxy->header.piid)); - UuidToStringA((UUID*)proxy->header.piid, (unsigned char**)&iid); - snprintf(keyname, sizeof(keyname), "Interface\\{%s}", iid); - RpcStringFreeA((unsigned char**)&iid); - RegDeleteKeyA(HKEY_CLASSES_ROOT, keyname); + strcpyW( keyname, interfaceW ); + format_clsid( keyname + strlenW(keyname), proxy->header.piid ); + RegDeleteKeyW(HKEY_CLASSES_ROOT, keyname); } pProxyFileList++; } /* unregister clsid */ - snprintf(keyname, sizeof(keyname), "CLSID\\{%s}", clsid); - len = GetModuleFileNameA(hDll, module, sizeof(module)); - if (len && len < sizeof(module)) { - TRACE("unregistering CLSID %s <= %s\n", clsid, module); - RegDeleteKeyA(HKEY_CLASSES_ROOT, keyname); - } + strcpyW( keyname, clsidW ); + format_clsid( keyname + strlenW(keyname), pclsid ); + RegDeleteKeyW(HKEY_CLASSES_ROOT, keyname); - /* done */ - RpcStringFreeA((unsigned char**)&clsid); return S_OK; }

1 0