September 2008 - Wine-Commits

Alexander Nicolaysen Sørnes : regedit: Fix some references to TCHARs.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: ba093c6dc0b181c7be6f5bcd468c4cb8ae53d423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba093c6dc0b181c7be6f5bcd4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 2 18:41:42 2008 +0200 regedit: Fix some references to TCHARs. --- programs/regedit/childwnd.c | 4 ++-- programs/regedit/edit.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 9879c95..11a8d2a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -123,7 +123,7 @@ static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { if (!*combined) lstrcpyW(combined, pPaths[i]); else { - combined[pos++] = (TCHAR)'\\'; + combined[pos++] = '\\'; lstrcpyW(combined+pos, pPaths[i]); } pos += llen; @@ -144,7 +144,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { if (hRootKey) parts[1] = GetRootKeyNameW(hRootKey); if (bFull) { - DWORD dwSize = sizeof(text)/sizeof(TCHAR); + DWORD dwSize = sizeof(text)/sizeof(WCHAR); GetComputerNameW(text, &dwSize); parts[0] = text; } diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 15dc57a..992caee 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -379,7 +379,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) HeapFree( GetProcessHeap(), 0, stringValueData); stringValueData = tmpValueData; - lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(TCHAR)); + lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(WCHAR)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, lRet); }

1 0

Paul Vriens : dplayx/tests: Add a few missing HeapFree's.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 501b1e0a493b067251049f1ca2684284a0fcf703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501b1e0a493b067251049f1ca… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Sep 2 21:46:35 2008 +0200 dplayx/tests: Add a few missing HeapFree's. --- dlls/dplayx/tests/dplayx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 470f4f8..0f6d979 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -695,6 +695,8 @@ static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); todo_wine checkHR( DP_OK, hr ); + HeapFree( GetProcessHeap(), 0, pAddress ); + } static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, @@ -1779,6 +1781,7 @@ static void test_SessionDesc(void) checkStr( "S1,S1,S1,S1,S1,S1,", callbackData.szTrace1 ); checkStr( "90,90,90,90,90,90,", callbackData.szTrace2 ); + HeapFree( GetProcessHeap(), 0, lpDataMsg ); for (i=0; i<2; i++) { HeapFree( GetProcessHeap(), 0, lpData[i] ); @@ -6206,6 +6209,7 @@ static void test_remote_data_replication(void) checkStr( "", callbackData.szTrace1 ); + HeapFree( GetProcessHeap(), 0, lpDataGet ); HeapFree( GetProcessHeap(), 0, lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );

1 0

Paul Vriens : ddraw/tests: Let tests run again on win9x.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 55faa6e9115ebeccef0c38b312e93f7587e15df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55faa6e9115ebeccef0c38b31… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Sep 2 18:07:49 2008 +0200 ddraw/tests: Let tests run again on win9x. --- dlls/ddraw/tests/overlay.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 8d38f98..10f66b4 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -24,6 +24,8 @@ #include "ddraw.h" #include "unknwn.h" +static HRESULT (WINAPI *pDirectDrawCreateEx)(LPGUID,LPVOID*,REFIID,LPUNKNOWN); + static IDirectDraw7 *ddraw = NULL; static IDirectDrawSurface7 *primary = NULL; @@ -51,8 +53,15 @@ static BOOL CreateDirectDraw(void) HRESULT hr; DDSURFACEDESC2 ddsd; IDirectDrawSurface7 *overlay = NULL; + HMODULE hmod = GetModuleHandleA("ddraw.dll"); + + pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); + if (!pDirectDrawCreateEx) { + win_skip("DirectDrawCreateEx is not available\n"); + return FALSE; + } - hr = DirectDrawCreateEx(NULL, (void**)&ddraw, &IID_IDirectDraw7, NULL); + hr = pDirectDrawCreateEx(NULL, (void**)&ddraw, &IID_IDirectDraw7, NULL); ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", hr); if (!ddraw) { trace("DirectDrawCreateEx() failed with an error %x\n", hr);

1 0

Christian Costa : d3dxof: Handle comments in templates text format.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: e79b7473525326c902c022e685c80495761cd493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79b7473525326c902c022e68… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Sep 1 23:21:52 2008 +0200 d3dxof: Handle comments in templates text format. --- dlls/d3dxof/d3dxof.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 494907c..c2a5624 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -226,7 +226,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } - if (header[2] == XOFFILE_FORMAT_TEXT) + if (header[2] == XOFFILE_FORMAT_BINARY) { FIXME("Binary format not supported yet\n"); hr = DXFILEERR_NOTDONEYET; @@ -560,6 +560,24 @@ static WORD parse_TOKEN_dbg_opt(parse_buffer * buf, BOOL show_token) if (!read_bytes(buf, &c, 1)) return 0; /*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/ + if ((c == '#') || (c == '/')) + { + /* Handle comment (# or //) */ + if (c == '/') + { + if (!read_bytes(buf, &c, 1)) + return 0; + if (c != '/') + return 0; + } + c = 0; + while (c != 0x0A) + { + if (!read_bytes(buf, &c, 1)) + return 0; + } + continue; + } if (is_space(c)) continue; if (is_operator(c) && (c != '<'))

1 0

Christian Costa : d3dxof: Start implementing IDirectXFile_CreateEnumObject.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 675327c031b6acc1f4cfa3aa20b13816ad52c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=675327c031b6acc1f4cfa3aa2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Sep 1 22:55:44 2008 +0200 d3dxof: Start implementing IDirectXFile_CreateEnumObject. --- dlls/d3dxof/d3dxof.c | 85 ++++++++++++++++++++++++++++++++++++++++-- dlls/d3dxof/d3dxof_private.h | 2 + 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index ade39e4..494907c 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -161,33 +161,110 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV IDirectXFileImpl *This = (IDirectXFileImpl *)iface; IDirectXFileEnumObjectImpl* object; HRESULT hr; + DWORD header[4]; + DWORD size; + HANDLE hFile = INVALID_HANDLE_VALUE; - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); + FIXME("(%p/%p)->(%p,%x,%p) partial stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); + + if (!ppEnumObj) + return DXFILEERR_BADVALUE; if (dwLoadOptions == DXFILELOAD_FROMFILE) { - HANDLE hFile; TRACE("Open source file '%s'\n", (char*)pvSource); + hFile = CreateFileA((char*)pvSource, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { TRACE("File '%s' not found\n", (char*)pvSource); return DXFILEERR_FILENOTFOUND; } - CloseHandle(hFile); + + if (!ReadFile(hFile, header, 16, &size, NULL)) + { + hr = DXFILEERR_BADVALUE; + goto error; + } + + if (size < 16) + { + hr = DXFILEERR_BADFILETYPE; + goto error; + } + + if (TRACE_ON(d3dxof)) + { + char string[17]; + memcpy(string, header, 16); + string[16] = 0; + TRACE("header = '%s'\n", string); + } } else { FIXME("Source type %d is not handled yet\n", dwLoadOptions); + hr = DXFILEERR_NOTDONEYET; + goto error; + } + + if (header[0] != XOFFILE_FORMAT_MAGIC) + { + hr = DXFILEERR_BADFILETYPE; + goto error; + } + + if (header[1] != XOFFILE_FORMAT_VERSION) + { + hr = DXFILEERR_BADFILEVERSION; + goto error; } + if ((header[2] != XOFFILE_FORMAT_BINARY) && (header[2] != XOFFILE_FORMAT_TEXT) && (header[2] != XOFFILE_FORMAT_COMPRESSED)) + { + hr = DXFILEERR_BADFILETYPE; + goto error; + } + + if (header[2] == XOFFILE_FORMAT_TEXT) + { + FIXME("Binary format not supported yet\n"); + hr = DXFILEERR_NOTDONEYET; + goto error; + } + + if (header[2] == XOFFILE_FORMAT_COMPRESSED) + { + FIXME("Compressed formats not supported yet"); + hr = DXFILEERR_BADVALUE; + goto error; + } + + if ((header[3] != XOFFILE_FORMAT_FLOAT_BITS_32) && (header[3] != XOFFILE_FORMAT_FLOAT_BITS_64)) + { + hr = DXFILEERR_BADFILEFLOATSIZE; + goto error; + } + + TRACE("Header is correct\n"); + hr = IDirectXFileEnumObjectImpl_Create(&object); if (!SUCCEEDED(hr)) - return hr; + goto error; + + object->source = dwLoadOptions; + object->hFile = hFile; *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object; return DXFILE_OK; + +error: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + *ppEnumObj = NULL; + + return hr; } static HRESULT WINAPI IDirectXFileImpl_CreateSaveObject(IDirectXFile* iface, LPCSTR szFileName, DXFILEFORMAT dwFileFormat, LPDIRECTXFILESAVEOBJECT* ppSaveObj) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 9bbf629..2e9964c 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -88,6 +88,8 @@ typedef struct { typedef struct { IDirectXFileEnumObject lpVtbl; LONG ref; + DXFILELOADOPTIONS source; + HANDLE hFile; } IDirectXFileEnumObjectImpl; typedef struct {

1 0

James Hawkins : shlwapi: Fix a few failing tests in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 3e76eacbfd6f892dc557c90e28c61f6da4052c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e76eacbfd6f892dc557c90e2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:09:59 2008 -0500 shlwapi: Fix a few failing tests in Vista. --- dlls/shlwapi/tests/path.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index d84ca7a..0fc092d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -891,7 +891,9 @@ static void test_PathCanonicalizeA(void) res = PathCanonicalizeA(dest, "C:\\one/.\\two\\.."); ok(res, "Expected success\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(!lstrcmp(dest, "C:\\one/."), "Expected C:\\one/., got %s\n", dest); + ok(!lstrcmp(dest, "C:\\one/.") || + !lstrcmp(dest, "C:\\one/"), /* Vista */ + "Expected \"C:\\one/.\" or \"C:\\one/\", got \"%s\"\n", dest); /* try forward slashes with change dirs * NOTE: if there is a forward slash in between two backslashes, @@ -1013,7 +1015,9 @@ static void test_PathBuildRootA(void) lstrcpy(path, "aaaaaaaaa"); root = PathBuildRootA(path, -1); ok(root == path, "Expected root == path, got %p\n", root); - ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path); + ok(!lstrcmp(path, "aaaaaaaaa") || + lstrlenA(path) == 0, /* Vista */ + "Expected aaaaaaaaa or empty string, got %s\n", path); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* test a drive number greater than 25 */ @@ -1021,7 +1025,9 @@ static void test_PathBuildRootA(void) lstrcpy(path, "aaaaaaaaa"); root = PathBuildRootA(path, 26); ok(root == path, "Expected root == path, got %p\n", root); - ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path); + ok(!lstrcmp(path, "aaaaaaaaa") || + lstrlenA(path) == 0, /* Vista */ + "Expected aaaaaaaaa or empty string, got %s\n", path); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* length of path is less than 4 */

1 0

James Hawkins : ntdll: Fix a few failing tests in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: f6a9514e96fec3a26fa764636f207b2042ced3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a9514e96fec3a26fa764636… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:06:52 2008 -0500 ntdll: Fix a few failing tests in Vista. --- dlls/ntdll/tests/path.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 99d9482..bf1271a 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -251,7 +251,6 @@ static void test_RtlGetFullPathName_U(void) { "c:/TEST", "c:\\test", "test"}, { "c:/test/file", "c:\\test\\file", "file"}, { "c:/test./file", "c:\\test\\file", "file"}, - { "c:/test../file", "c:\\test.\\file", "file"}, { "c:/test.. /file", "c:\\test.. \\file","file"}, { "c:/test/././file", "c:\\test\\file", "file"}, { "c:/test\\.\\.\\file", "c:\\test\\file", "file"}, @@ -267,6 +266,7 @@ static void test_RtlGetFullPathName_U(void) WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH]; CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH]; ULONG ret; + NTSTATUS status; WCHAR *file_part; DWORD reslen; UINT len; @@ -292,6 +292,23 @@ static void test_RtlGetFullPathName_U(void) } } + /* "c:/test../file", "c:\\test.\\file", "file"}, */ + pRtlMultiByteToUnicodeN(pathbufW, sizeof(pathbufW), NULL, + "c:/test../file", strlen("c:/test../file") + 1); + ret = pRtlGetFullPathName_U(pathbufW, MAX_PATH, rbufferW, &file_part); + ok(ret == strlen("c:\\test.\\file") * sizeof(WCHAR) || + ret == strlen("c:\\test..\\file") * sizeof(WCHAR), /* Vista */ + "Expected 26 or 28, got %d\n", ret); + status = pRtlUnicodeToMultiByteN(rbufferA, MAX_PATH, &reslen, rbufferW, + (lstrlenW(rbufferW) + 1) * sizeof(WCHAR)); + ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); + ok(!lstrcmpiA(rbufferA, "c:\\test.\\file") || + !lstrcmpiA(rbufferA, "c:\\test..\\file"), + "Expected \"c:\\test.\\file\" or \"c:\\test..\\file\", got \"%s\"\n", rbufferA); + status = pRtlUnicodeToMultiByteN(rfileA, MAX_PATH, &reslen, file_part, + (lstrlenW(file_part) + 1) * sizeof(WCHAR)); + ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); + ok(!lstrcmpiA(rfileA, "file"), "Got \"%s\" expected \"file\"\n", rfileA); } START_TEST(path)

1 0

James Hawkins : riched20: Trace the result of a failing test.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 6b1c6eebab3e9da949de79345ec89d6c1974708e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1c6eebab3e9da949de79345… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:08:07 2008 -0500 riched20: Trace the result of a failing test. --- dlls/riched20/tests/editor.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 765e8e2..6603e5c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -32,6 +32,17 @@ #include <time.h> #include <wine/test.h> +static CHAR string1[MAX_PATH], string2[MAX_PATH]; + +#define ok_w2(format, szString1, szString2) \ +\ + if (lstrcmpW(szString1, szString2) != 0) \ + { \ + WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ + ok(0, format, string1, string2); \ + } + static HMODULE hmoduleRichEdit; static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { @@ -3439,9 +3450,7 @@ static void test_EM_SETTEXTEX(void) setText.flags = ST_SELECTION; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) buf); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); - ok(lstrcmpW(buf, TestItem1alt) == 0, - "EM_GETTEXTEX results not what was set by EM_SETTEXTEX when" - " using ST_SELECTION on an RTF string and non-Unicode\n"); + ok_w2("Expected \"%s\", got \"%s\"\n", TestItem1alt, buf); /* The following test demonstrates that EM_SETTEXTEX replacing a selection */ setText.codepage = 1200; /* no constant for unicode */

1 0

James Hawkins : rpcrt4: Remove a test that was replaced by a better test.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 6b20075b1f449def55ab5cfeb9f486bfb4a1e1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b20075b1f449def55ab5cfeb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:08:47 2008 -0500 rpcrt4: Remove a test that was replaced by a better test. --- dlls/rpcrt4/tests/ndr_marshall.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 67dfae5..3cd1337 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1184,7 +1184,6 @@ static void test_client_init(void) TEST_ZERO(PointerLength, "%d"); TEST_ZERO(fInDontFree, "%d"); TEST_ZERO(fDontCallFreeInst, "%d"); - TEST_ZERO(fInOnlyParam, "%d"); ok(stubMsg.fInOnlyParam == 0 || stubMsg.fInOnlyParam == -1, /* Vista */ "fInOnlyParam should have been set to 0 or -1 instead of %d\n", stubMsg.fInOnlyParam);

1 0

James Hawkins : ole32: Fix a failing test in Vista.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 21cde57be521fc274e05073076f93ee0f631c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21cde57be521fc274e0507307… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 01:07:31 2008 -0500 ole32: Fix a failing test in Vista. --- dlls/ole32/tests/moniker.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 462190e..468eb62 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1749,7 +1749,9 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(bind_opts) || + bind_opts.cbStruct == 36, /* Vista */ + "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts);

1 0