November 2005 - Wine-Commits

wine/dlls/d3d9 query.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21160 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:46:21 Modified files: dlls/d3d9 : query.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Allow NULL ppQuery to be passed to CreateQuery. Patch: http://cvs.winehq.org/patch.py?id=21160 Old revision New revision Changes Path 1.11 1.12 +29 -26 wine/dlls/d3d9/query.c Index: wine/dlls/d3d9/query.c diff -u -p wine/dlls/d3d9/query.c:1.11 wine/dlls/d3d9/query.c:1.12 --- wine/dlls/d3d9/query.c:1.11 8 Nov 2005 12:46:21 -0000 +++ wine/dlls/d3d9/query.c 8 Nov 2005 12:46:21 -0000 @@ -119,32 +119,35 @@ const IDirect3DQuery9Vtbl Direct3DQuery9 /* IDirect3DDevice9 IDirect3DQuery9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DQuery9Impl *object = NULL; - HRESULT hr = D3D_OK; - - TRACE("(%p) Relay\n", This); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); - *ppQuery = NULL; - return D3DERR_OUTOFVIDEOMEMORY; - } - - object->lpVtbl = &Direct3DQuery9_Vtbl; - object->ref = 1; - hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, &(object->wineD3DQuery), (IUnknown*)object); - - if (FAILED(hr)) { - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateQuery failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - *ppQuery = NULL; - } else { - *ppQuery = (LPDIRECT3DQUERY9) object; - } - TRACE("(%p) : returning %p \n", This, *ppQuery); - return hr; + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DQuery9Impl *object = NULL; + HRESULT hr = D3D_OK; + + TRACE("(%p) Relay\n", This); + + if (!ppQuery) + return IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, NULL, NULL); + + /* Allocate the storage for the device */ + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); + if (NULL == object) { + FIXME("Allocation of memory failed\n"); + *ppQuery = NULL; + return D3DERR_OUTOFVIDEOMEMORY; + } + + object->lpVtbl = &Direct3DQuery9_Vtbl; + object->ref = 1; + hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, &object->wineD3DQuery, (IUnknown *)object); + + if (FAILED(hr)) { + /* free up object */ + FIXME("(%p) call to IWineD3DDevice_CreateQuery failed\n", This); + HeapFree(GetProcessHeap(), 0, object); + *ppQuery = NULL; + } else { + *ppQuery = (LPDIRECT3DQUERY9) object; + } + TRACE("(%p) : returning %lx\n", This, hr); + return hr; }

1 0

wine/dlls/advpack tests/advpack.c advpack.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21159 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:43:35 Modified files: dlls/advpack/tests: advpack.c dlls/advpack : advpack.c Log message: James Hawkins <truiken(a)gmail.com> Implement TranslateInfString with tests. Patch: http://cvs.winehq.org/patch.py?id=21159 Old revision New revision Changes Path 1.5 1.6 +98 -1 wine/dlls/advpack/tests/advpack.c 1.13 1.14 +41 -7 wine/dlls/advpack/advpack.c Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.5 wine/dlls/advpack/tests/advpack.c:1.6 --- wine/dlls/advpack/tests/advpack.c:1.5 8 Nov 2005 12:43:35 -0000 +++ wine/dlls/advpack/tests/advpack.c 8 Nov 2005 12:43:35 -0000 @@ -19,13 +19,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <stdio.h> #include <windows.h> #include <advpub.h> #include <assert.h> #include "wine/test.h" +#define TEST_STRING1 "C:\\Program Files\\Application Name" +#define TEST_STRING2 "%49001%\\Application Name" + static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); +static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); static void version_test(void) { @@ -114,6 +119,96 @@ static void delnode_test(void) currDir[currDirLen] = '\0'; } +static void append_str(char **str, const char *data) +{ + sprintf(*str, data); + *str += strlen(*str); +} + +static void create_inf_file() +{ + char data[1024]; + char *ptr = data; + HANDLE hf = CreateFile("c:\\test.inf", GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[Version]\n"); + append_str(&ptr, "Signature=\"$Chicago$\"\n"); + append_str(&ptr, "[CustInstDestSection]\n"); + append_str(&ptr, "49001=ProgramFilesDir\n"); + append_str(&ptr, "[ProgramFilesDir]\n"); + append_str(&ptr, "HKLM,\"Software\\Microsoft\\Windows\\CurrentVersion\","); + append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%LProgramF%%\"\n"); + append_str(&ptr, "[section]\n"); + append_str(&ptr, "NotACustomDestination=Version\n"); + append_str(&ptr, "CustomDestination=CustInstDestSection\n"); + append_str(&ptr, "[Options.NTx86]\n"); + append_str(&ptr, "49001=ProgramFilesDir\n"); + append_str(&ptr, "InstallDir=%%49001%%\\%%DefaultAppPath%%\n"); + append_str(&ptr, "CustomHDestination=CustInstDestSection\n"); + append_str(&ptr, "[Strings]\n"); + append_str(&ptr, "DefaultAppPath=\"Application Name\"\n"); + append_str(&ptr, "LProgramF=\"Program Files\"\n"); + + WriteFile(hf, data, ptr - data, NULL, NULL); + CloseHandle(hf); +} + +static void translateinfstring_test() +{ + HRESULT hr; + char buffer[MAX_PATH]; + DWORD dwSize; + + create_inf_file(); + + /* pass in a couple invalid parameters */ + hr = pTranslateInfString(NULL, NULL, NULL, NULL, buffer, MAX_PATH, &dwSize, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got 0x%08x\n", (UINT)hr); + + /* try to open an inf file that doesn't exist */ + hr = pTranslateInfString("c:\\a.inf", "Options.NTx86", "Options.NTx86", + "InstallDir", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == 0x80070002, "Expected 0x80070002, got 0x%08x\n", (UINT)hr); + + /* try a nonexistent section */ + hr = pTranslateInfString("c:\\test.inf", "idontexist", "Options.NTx86", + "InstallDir", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr); + ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); + ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize); + + /* try other nonexistent section */ + hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "idontexist", + "InstallDir", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got 0x%08x\n", (UINT)hr); + + /* try nonexistent key */ + hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "Options.NTx86", + "notvalid", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got 0x%08x\n", (UINT)hr); + + /* test the behavior of pszInstallSection */ + hr = pTranslateInfString("c:\\test.inf", "section", "Options.NTx86", + "InstallDir", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", (UINT)hr); + + todo_wine + { + ok(!strcmp(buffer, TEST_STRING1), "Expected %s, got %s\n", TEST_STRING1, buffer); + ok(dwSize == 34, "Expected size 34, got %ld\n", dwSize); + } + + /* try without a pszInstallSection */ + hr = pTranslateInfString("c:\\test.inf", NULL, "Options.NTx86", + "InstallDir", buffer, MAX_PATH, &dwSize, NULL); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr); + ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); + ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize); + + DeleteFile("c:\\test.inf"); +} + START_TEST(advpack) { HMODULE hdll; @@ -124,11 +219,13 @@ START_TEST(advpack) pGetVersionFromFile = (void*)GetProcAddress(hdll, "GetVersionFromFile"); pDelNode = (void*)GetProcAddress(hdll, "DelNode"); - if (!pGetVersionFromFile || !pDelNode) + pTranslateInfString = (void*)GetProcAddress(hdll, "TranslateInfString"); + if (!pGetVersionFromFile || !pDelNode || !pTranslateInfString) return; version_test(); delnode_test(); + translateinfstring_test(); FreeLibrary(hdll); } Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.13 wine/dlls/advpack/advpack.c:1.14 --- wine/dlls/advpack/advpack.c:1.13 8 Nov 2005 12:43:35 -0000 +++ wine/dlls/advpack/advpack.c 8 Nov 2005 12:43:35 -0000 @@ -410,16 +410,50 @@ HRESULT WINAPI ExtractFiles ( LPCSTR Cab /*********************************************************************** * TranslateInfString (ADVPACK.@) * - * BUGS - * Unimplemented + * Translates the value of a specified key in an inf file into the + * current locale by expanding string macros. + * + * PARAMS + * pszInfFilename [I] Filename of the inf file. + * pszInstallSection [I] + * pszTranslateSection [I] Inf section where the key exists. + * pszTranslateKey [I] Key to translate. + * pszBuffer [O] Contains the translated string on exit. + * dwBufferSize [I] Size on input of pszBuffer. + * pdwRequiredSize [O] Length of the translated key. + * pvReserved [I] Reserved, must be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: An hresult error code. */ HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection, PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - FIXME("(%s %s %s %s %p %ld %p %p): stub\n", - debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), - debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), - pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); - return E_FAIL; + HINF hInf; + + TRACE("(%s %s %s %s %p %ld %p %p)\n", + debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), + debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), + pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); + + if (!pszInfFilename || !pszTranslateSection || + !pszTranslateKey || !pdwRequiredSize) + return E_INVALIDARG; + + hInf = SetupOpenInfFileA(pszInfFilename, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + if (!SetupGetLineTextA(NULL, hInf, pszTranslateSection, pszTranslateKey, + pszBuffer, dwBufferSize, pdwRequiredSize)) + { + if (dwBufferSize < *pdwRequiredSize) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + return SPAPI_E_LINE_NOT_FOUND; + } + + return S_OK; }

1 0

wine/dlls/ole32 compobj.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21158 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:43:24 Modified files: dlls/ole32 : compobj.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added tracing to CoCreateInstance. Patch: http://cvs.winehq.org/patch.py?id=21158 Old revision New revision Changes Path 1.165 1.166 +3 -0 wine/dlls/ole32/compobj.c Index: wine/dlls/ole32/compobj.c diff -u -p wine/dlls/ole32/compobj.c:1.165 wine/dlls/ole32/compobj.c:1.166 --- wine/dlls/ole32/compobj.c:1.165 8 Nov 2005 12:43:24 -0000 +++ wine/dlls/ole32/compobj.c 8 Nov 2005 12:43:24 -0000 @@ -1751,6 +1751,9 @@ HRESULT WINAPI CoCreateInstance( HRESULT hres; LPCLASSFACTORY lpclf = 0; + TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08lx, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), + pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); + if (!COM_CurrentApt()) return CO_E_NOTINITIALIZED; /*

1 0

wine/dlls/kernel volume.c virtual.c time.c thu ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21157 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 05:01:04 Modified files: dlls/kernel : volume.c virtual.c time.c thunk.c thread.c sync.c string.c path.c module.c locale.c heap.c global16.c file16.c file.c environ.c console.c computername.c comm.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - add missing returns section - complete missing A/W pairs - reformate comments, to match c2man requirements Patch: http://cvs.winehq.org/patch.py?id=21157 Old revision New revision Changes Path 1.33 1.34 +4 -0 wine/dlls/kernel/volume.c 1.10 1.11 +21 -3 wine/dlls/kernel/virtual.c 1.56 1.57 +1 -2 wine/dlls/kernel/time.c 1.62 1.63 +11 -0 wine/dlls/kernel/thunk.c 1.31 1.32 +15 -3 wine/dlls/kernel/thread.c 1.90 1.91 +2 -0 wine/dlls/kernel/sync.c 1.12 1.13 +4 -4 wine/dlls/kernel/string.c 1.25 1.26 +2 -0 wine/dlls/kernel/path.c 1.20 1.21 +2 -0 wine/dlls/kernel/module.c 1.68 1.69 +1 -1 wine/dlls/kernel/locale.c 1.19 1.20 +94 -11 wine/dlls/kernel/heap.c 1.14 1.15 +20 -0 wine/dlls/kernel/global16.c 1.14 1.15 +10 -5 wine/dlls/kernel/file16.c 1.44 1.45 +6 -0 wine/dlls/kernel/file.c 1.6 1.7 +1 -1 wine/dlls/kernel/environ.c 1.44 1.45 +11 -21 wine/dlls/kernel/console.c 1.17 1.18 +7 -1 wine/dlls/kernel/computername.c 1.98 1.99 +2 -2 wine/dlls/kernel/comm.c

1 0

wine/dlls/ntdll time.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21156 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:57:50 Modified files: dlls/ntdll : time.c Log message: Mike McCormack <mike(a)codeweavers.com> Add some missing timezones. Patch: http://cvs.winehq.org/patch.py?id=21156 Old revision New revision Changes Path 1.81 1.82 +42 -0 wine/dlls/ntdll/time.c Index: wine/dlls/ntdll/time.c diff -u -p wine/dlls/ntdll/time.c:1.81 wine/dlls/ntdll/time.c:1.82 --- wine/dlls/ntdll/time.c:1.81 8 Nov 2005 10:57:50 -0000 +++ wine/dlls/ntdll/time.c 8 Nov 2005 10:57:50 -0000 @@ -100,6 +100,9 @@ static const struct tagTZ_INFO TZ_INFO[] {"HST", {'H','a','w','a','i','i','a','n',' ','S','t','a','n','d','a','r','d',' ', 'T','i','m','e','\0'}, 600, 0}, + {"AKST", + {'A','l','a','s','k','a','n',' ','S','t','a','n','d','a','r','d',' ', + 'T','i','m','e',0}, 540, 0 }, {"AKDT", {'A','l','a','s','k','a','n',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, 480, 1}, @@ -124,6 +127,9 @@ static const struct tagTZ_INFO TZ_INFO[] {"COT", {'S','A',' ','P','a','c','i','f','i','c',' ','S','t','a','n','d','a','r', 'd',' ','T','i','m','e','\0'}, 300, 0}, + {"PET", + {'S','A',' ','P','a','c','i','f','i','c',' ','S','t','a','n','d','a','r', + 'd',' ','T','i','m','e',0}, 300, 0 }, {"EDT", {'E','a','s','t','e','r','n',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, 240, 1}, @@ -142,9 +148,18 @@ static const struct tagTZ_INFO TZ_INFO[] {"CLT", {'P','a','c','i','f','i','c',' ','S','A',' ','S','t','a','n','d','a','r', 'd',' ','T','i','m','e','\0'}, 240, 0}, + {"CLST", + {'P','a','c','i','f','i','c',' ','S','A',' ','S','t','a','n','d','a','r', + 'd',' ','T','i','m','e',0}, 180, 1}, + {"AST", + {'A','t','l','a','n','t','i','c',' ','S','t','a','n','d','a','r','d',' ', + 'T','i','m','e',0}, 240, 0 }, {"NDT", {'N','e','w','f','o','u','n','d','l','a','n','d',' ','S','t','a','n','d', 'a','r','d',' ','T','i','m','e','\0'}, 150, 1}, + {"NST", + {'N','e','w','f','o','u','n','d','l','a','n','d',' ','S','t','a','n','d', + 'a','r','d',' ','T','i','m','e',0}, 210, 0 }, {"BRT", {'B','r','a','z','i','l','i','a','n',' ','S','t','a','n','d','a','r','d', ' ','T','i','m','e','\0'}, 180, 0}, @@ -160,6 +175,9 @@ static const struct tagTZ_INFO TZ_INFO[] {"GST", {'M','i','d','-','A','t','l','a','n','t','i','c',' ','S','t','a','n','d', 'a','r','d',' ','T','i','m','e','\0'}, 120, 0}, + {"AZOT", + {'A','z','o','r','e','s',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e',0}, 60, 0}, {"AZOST", {'A','z','o','r','e','s',' ','S','t','a','n','d','a','r','d',' ','T','i', 'm','e','\0'}, 0, 1}, @@ -230,10 +248,16 @@ static const struct tagTZ_INFO TZ_INFO[] ' ','T','i','m','e','\0'}, -180, 0}, {"IRST", {'I','r','a','n',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e', + 0},-210, 0 }, + {"IRST", + {'I','r','a','n',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e', '\0'}, -270, 1}, {"GST", {'A','r','a','b','i','a','n',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, -240, 0}, + {"AZT", + {'C','a','u','c','a','s','u','s',' ','S','t','a','n','d','a','r','d',' ', + 'T','i','m','e',0}, -240, 0 }, {"AZST", {'C','a','u','c','a','s','u','s',' ','S','t','a','n','d','a','r','d',' ', 'T','i','m','e','\0'}, -300, 1}, @@ -270,9 +294,15 @@ static const struct tagTZ_INFO TZ_INFO[] {"ICT", {'S','E',' ','A','s','i','a',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, -420, 0}, + {"KRAT", + {'N','o','r','t','h',' ','A','s','i','a',' ','S','t','a','n','d','a','r', + 'd',' ','T','i','m','e',0}, -420, 0}, {"KRAST", {'N','o','r','t','h',' ','A','s','i','a',' ','S','t','a','n','d','a','r', 'd',' ','T','i','m','e','\0'}, -480, 1}, + {"IRKT", + {'N','o','r','t','h',' ','A','s','i','a',' ','E','a','s','t',' ','S','t', + 'a','n','d','a','r','d',' ','T','i','m','e',0}, -480, 0}, {"CST", {'C','h','i','n','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m', 'e','\0'}, -480, 0}, @@ -309,9 +339,18 @@ static const struct tagTZ_INFO TZ_INFO[] {"GST", {'W','e','s','t',' ','P','a','c','i','f','i','c',' ','S','t','a','n','d', 'a','r','d',' ','T','i','m','e','\0'}, -600, 0}, + {"VLAT", + {'V','l','a','d','i','v','o','s','t','o','k',' ','S','t','a','n','d','a', + 'r','d',' ','T','i','m','e',0}, -600, 0 }, + {"ChST", + {'W','e','s','t',' ','P','a','c','i','f','i','c',' ','S','t','a','n','d', + 'a','r','d',' ','T','i','m','e',0}, -600, 0}, {"VLAST", {'V','l','a','d','i','v','o','s','t','o','k',' ','S','t','a','n','d','a', 'r','d',' ','T','i','m','e','\0'}, -660, 1}, + {"MAGT", + {'C','e','n','t','r','a','l',' ','P','a','c','i','f','i','c',' ','S','t', + 'a','n','d','a','r','d',' ','T','i','m','e',0}, -660, 0}, {"MAGST", {'C','e','n','t','r','a','l',' ','P','a','c','i','f','i','c',' ','S','t', 'a','n','d','a','r','d',' ','T','i','m','e','\0'}, -720, 1}, @@ -328,6 +367,9 @@ static const struct tagTZ_INFO TZ_INFO[] {'T','o','n','g','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m', 'e','\0'}, -780, 0}, {"NOVT", + {'N','.',' ','C','e','n','t','r','a','l',' ','A','s','i','a',' ','S','t', + 'a','n','d','a','r','d',' ','T','i','m','e',0 }, -360, 0}, + {"NOVT", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','t','a','n','d','a', 'r','d',' ','T','i','m','e','\0'}, -360, 1}, {"ANAT",

1 0

wine/dlls/dxdiagn provider.c Makefile.in
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21155 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:57:39 Modified files: dlls/dxdiagn : provider.c Makefile.in Log message: Raphael Junqueira <fenix(a)club-internet.fr> - fill DirectShowFilters Container - fix some MLKs (clear variants) Patch: http://cvs.winehq.org/patch.py?id=21155 Old revision New revision Changes Path 1.11 1.12 +213 -7 wine/dlls/dxdiagn/provider.c 1.6 1.7 +1 -1 wine/dlls/dxdiagn/Makefile.in

1 0

wine/dlls/crypt32/tests cert.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21154 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:57:28 Modified files: dlls/crypt32/tests: cert.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Make Crypt32 tests loadable on Win98. Patch: http://cvs.winehq.org/patch.py?id=21154 Old revision New revision Changes Path 1.11 1.12 +33 -10 wine/dlls/crypt32/tests/cert.c Index: wine/dlls/crypt32/tests/cert.c diff -u -p wine/dlls/crypt32/tests/cert.c:1.11 wine/dlls/crypt32/tests/cert.c:1.12 --- wine/dlls/crypt32/tests/cert.c:1.11 8 Nov 2005 10:57:28 -0000 +++ wine/dlls/crypt32/tests/cert.c 8 Nov 2005 10:57:28 -0000 @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <assert.h> #include <stdio.h> #include <stdarg.h> #include <windef.h> @@ -40,6 +41,26 @@ struct CertPropIDHeader DWORD cb; }; +static BOOL (WINAPI * pCryptVerifyCertificateSignatureEx) + (HCRYPTPROV, DWORD, DWORD, void *, DWORD, void *, DWORD, void *); + +#define CRYPT_GET_PROC(func) \ + p ## func = (void *)GetProcAddress(hCrypt32, #func); \ + if(!p ## func) \ + trace("GetProcAddress(hCrypt32, \"%s\") failed\n", #func); \ + +static void init_function_pointers(void) +{ + HMODULE hCrypt32; + + pCryptVerifyCertificateSignatureEx = NULL; + + hCrypt32 = GetModuleHandleA("crypt32.dll"); + assert(hCrypt32); + + CRYPT_GET_PROC(CryptVerifyCertificateSignatureEx); +} + static void testCryptHashCert(void) { static const BYTE emptyHash[] = { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, @@ -1448,21 +1469,21 @@ static void testVerifyCertSig(HCRYPTPROV DWORD size = 0; BOOL ret; - ret = CryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); + ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", GetLastError()); - ret = CryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); + ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", GetLastError()); - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", GetLastError()); /* This crashes - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); */ info.ToBeSigned.cbData = toBeSigned->cbData; @@ -1480,25 +1501,25 @@ static void testVerifyCertSig(HCRYPTPROV CRYPT_DATA_BLOB certBlob = { 0, NULL }; PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); certBlob.cbData = 1; certBlob.pbData = (void *)0xdeadbeef; - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); certBlob.cbData = size; certBlob.pbData = cert; - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", GetLastError()); - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); ok(!ret && GetLastError() == @@ -1506,7 +1527,7 @@ static void testVerifyCertSig(HCRYPTPROV "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", GetLastError()); /* This crashes - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); */ @@ -1520,7 +1541,7 @@ static void testVerifyCertSig(HCRYPTPROV ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); if (ret) { - ret = CryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pubKeyInfo, 0, NULL); ok(ret, "CryptVerifyCertificateSignatureEx failed: %08lx\n", @@ -1559,6 +1580,8 @@ static void testCertSigs(void) START_TEST(cert) { + init_function_pointers(); + testCryptHashCert(); /* various combinations of CertOpenStore */

1 0

wine/dlls/winsock/tests sock.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21153 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:56:27 Modified files: dlls/winsock/tests: sock.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Added last error code for XP SP1. Patch: http://cvs.winehq.org/patch.py?id=21153 Old revision New revision Changes Path 1.27 1.28 +3 -3 wine/dlls/winsock/tests/sock.c Index: wine/dlls/winsock/tests/sock.c diff -u -p wine/dlls/winsock/tests/sock.c:1.27 wine/dlls/winsock/tests/sock.c:1.28 --- wine/dlls/winsock/tests/sock.c:1.27 8 Nov 2005 10:56:27 -0000 +++ wine/dlls/winsock/tests/sock.c 8 Nov 2005 10:56:27 -0000 @@ -1223,7 +1223,7 @@ static void test_WSAStringToAddressA(voi ret = WSAStringToAddressA( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || - (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); len = sizeof(sockaddr); @@ -1241,7 +1241,7 @@ static void test_WSAStringToAddressA(voi ret = WSAStringToAddressA( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); } @@ -1289,7 +1289,7 @@ static void test_WSAStringToAddressW(voi ret = WSAStringToAddressW( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || - (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER), + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); len = sizeof(sockaddr);

1 0

wine/dlls/dmloader loader.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21152 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:56:13 Modified files: dlls/dmloader : loader.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> Add some checks and fix some stream leaks. Patch: http://cvs.winehq.org/patch.py?id=21152 Old revision New revision Changes Path 1.20 1.21 +40 -10 wine/dlls/dmloader/loader.c Index: wine/dlls/dmloader/loader.c diff -u -p wine/dlls/dmloader/loader.c:1.20 wine/dlls/dmloader/loader.c:1.21 --- wine/dlls/dmloader/loader.c:1.20 8 Nov 2005 10:56:13 -0000 +++ wine/dlls/dmloader/loader.c 8 Nov 2005 10:56:13 -0000 @@ -194,15 +194,15 @@ HRESULT WINAPI IDirectMusicLoaderImpl_ID /* create stream and associate it with file */ result = DMUSIC_CreateDirectMusicLoaderFileStream ((LPVOID*)&pStream); if (FAILED(result)) { - ERR(": could not create loader stream\n"); + ERR(": could not create file stream\n"); return result; } result = IDirectMusicLoaderFileStream_Attach (pStream, wszFileName, iface); if (FAILED(result)) { - ERR(": could not attach stream to file\n"); + ERR(": could not attach stream to file\n"); + IStream_Release (pStream); return result; } - } else if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { /* load object from resource */ @@ -215,7 +215,8 @@ HRESULT WINAPI IDirectMusicLoaderImpl_ID } result = IDirectMusicLoaderResourceStream_Attach (pStream, pDesc->pbMemData, pDesc->llMemLength, 0, iface); if (FAILED(result)) { - ERR(": could not attach stream to resource\n"); + ERR(": could not attach stream to resource\n"); + IStream_Release (pStream); return result; } } @@ -231,6 +232,7 @@ HRESULT WINAPI IDirectMusicLoaderImpl_ID result = IDirectMusicLoaderGenericStream_Attach (pStream, pDesc->pStream, iface); if (FAILED(result)) { ERR(": failed to attach stream\n"); + IStream_Release (pStream); return result; } } else { @@ -323,6 +325,7 @@ HRESULT WINAPI IDirectMusicLoaderImpl_ID DMUS_OBJECTDESC Desc; struct list *pEntry; LPWINE_LOADER_ENTRY pObjectEntry, pNewEntry; + HRESULT hr; TRACE("(%p, %p): pDesc:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC(pDesc)); @@ -344,21 +347,48 @@ HRESULT WINAPI IDirectMusicLoaderImpl_ID strcpyW(p, pDesc->wszFileName); } /* create stream */ - DMUSIC_CreateDirectMusicLoaderFileStream ((LPVOID*)&pStream); + hr = DMUSIC_CreateDirectMusicLoaderFileStream ((LPVOID*)&pStream); + if (FAILED(hr)) { + ERR(": could not create file stream\n"); + return DMUS_E_LOADER_FAILEDOPEN; + } /* attach stream */ - IDirectMusicLoaderFileStream_Attach (pStream, wszFileName, iface); + hr = IDirectMusicLoaderFileStream_Attach (pStream, wszFileName, iface); + if (FAILED(hr)) { + ERR(": could not attach stream to file\n"); + IStream_Release (pStream); + return DMUS_E_LOADER_FAILEDOPEN; + } } else if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* create stream */ - DMUSIC_CreateDirectMusicLoaderGenericStream ((LPVOID*)&pStream); + hr = DMUSIC_CreateDirectMusicLoaderGenericStream ((LPVOID*)&pStream); + if (FAILED(hr)) { + ERR(": could not create generic stream\n"); + return DMUS_E_LOADER_FAILEDOPEN; + } /* attach stream */ - IDirectMusicLoaderGenericStream_Attach (pStream, pDesc->pStream, iface); + hr = IDirectMusicLoaderGenericStream_Attach (pStream, pDesc->pStream, iface); + if (FAILED(hr)) { + ERR(": could not attach stream\n"); + IStream_Release (pStream); + return DMUS_E_LOADER_FAILEDOPEN; + } } else if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { /* create stream */ - DMUSIC_CreateDirectMusicLoaderResourceStream ((LPVOID*)&pStream); + hr = DMUSIC_CreateDirectMusicLoaderResourceStream ((LPVOID*)&pStream); + if (FAILED(hr)) { + ERR(": could not create resource stream\n"); + return DMUS_E_LOADER_FAILEDOPEN; + } /* attach stream */ - IDirectMusicLoaderResourceStream_Attach (pStream, pDesc->pbMemData, pDesc->llMemLength, 0, iface); + hr = IDirectMusicLoaderResourceStream_Attach (pStream, pDesc->pbMemData, pDesc->llMemLength, 0, iface); + if (FAILED(hr)) { + ERR(": could not attach stream to resource\n"); + IStream_Release (pStream); + return DMUS_E_LOADER_FAILEDOPEN; + } } else { ERR(": no way to get additional info\n");

1 0

wine/dlls/ole32 rpc.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21151 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 04:56:02 Modified files: dlls/ole32 : rpc.c Log message: Robert Shearman <rob(a)codeweavers.com> We shouldn't pass the application name into CreateProcess because the value stored in the registry could include arguments. Patch: http://cvs.winehq.org/patch.py?id=21151 Old revision New revision Changes Path 1.66 1.67 +9 -11 wine/dlls/ole32/rpc.c Index: wine/dlls/ole32/rpc.c diff -u -p wine/dlls/ole32/rpc.c:1.66 wine/dlls/ole32/rpc.c:1.67 --- wine/dlls/ole32/rpc.c:1.66 8 Nov 2005 10:56: 2 -0000 +++ wine/dlls/ole32/rpc.c 8 Nov 2005 10:56: 2 -0000 @@ -623,10 +623,9 @@ static HRESULT create_server(REFCLSID rc static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; HKEY hkeyclsid; HKEY key; - HRESULT hres = E_UNEXPECTED; - WCHAR exe[MAX_PATH+1]; - DWORD exelen = sizeof(exe); + HRESULT hres; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; + DWORD size = MAX_PATH+1 * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; @@ -637,14 +636,14 @@ static HRESULT create_server(REFCLSID rc } hres = RegOpenKeyExW(hkeyclsid, wszLocalServer32, 0, KEY_READ, &key); + RegCloseKey(hkeyclsid); if (hres != ERROR_SUCCESS) { WARN("class %s not registered as LocalServer32\n", debugstr_guid(rclsid)); return REGDB_E_READREGDB; /* Probably */ } - memset(exe,0,sizeof(exe)); - hres= RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)exe, &exelen); + hres = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size); RegCloseKey(key); if (hres) { WARN("No default value for LocalServer32 key\n"); @@ -654,17 +653,16 @@ static HRESULT create_server(REFCLSID rc memset(&sinfo,0,sizeof(sinfo)); sinfo.cb = sizeof(sinfo); - /* EXE servers are started with the -Embedding switch. MSDN also claims /Embedding is used, - * 9x does -Embedding, perhaps an 9x/NT difference? - */ + /* EXE servers are started with the -Embedding switch. */ - strcpyW(command, exe); strcatW(command, embedding); TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid)); - if (!CreateProcessW(exe, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { - WARN("failed to run local server %s\n", debugstr_w(exe)); + /* FIXME: Win2003 supports a ServerExecutable value that is passed into + * CreateProcess */ + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { + WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError()); } CloseHandle(pinfo.hProcess);

1 0