July 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Only use the long filename when resolving the source path.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 26ae65898685a67f7be29cb94e679e4eb80fc6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ae65898685a67f7be29cb94… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:07:31 2008 -0500 msi: Only use the long filename when resolving the source path. --- dlls/msi/helpers.c | 24 ----------- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 102 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 83 insertions(+), 45 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index cffc09a..c578c68 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -323,34 +323,10 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, } else { - /* source may be in a few different places ... check each of them */ path = NULL; - /* try the long path directory */ if (f->SourceLongPath) - { path = build_directory_name( 3, p, f->SourceLongPath, NULL ); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free( path ); - path = NULL; - } - } - - /* try the short path directory */ - if (!path && f->SourceShortPath) - { - path = build_directory_name( 3, p, f->SourceShortPath, NULL ); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free( path ); - path = NULL; - } - } - - /* try the root of the install */ - if (!path) - path = get_source_root( package ); TRACE("source -> %s\n", debugstr_w(path)); f->ResolvedSource = strdupW( path ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8fa729a..e81e3a5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4422,11 +4422,11 @@ static void test_sourcefolder(void) RemoveDirectoryA("msitest"); r = MsiInstallProductA(msifile, NULL); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); todo_wine { ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest", FALSE), "File installed\n"); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c2ebe6b..2304703 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5546,11 +5546,8 @@ static void test_MsiGetSourcePath(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); r = MsiDoAction(hpkg, "ResolveSource"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5593,11 +5590,8 @@ static void test_MsiGetSourcePath(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); r = MsiDoAction(hpkg, "FileCost"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5632,11 +5626,8 @@ static void test_MsiGetSourcePath(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); r = MsiDoAction(hpkg, "CostFinalize"); ok(r == ERROR_SUCCESS, "file cost failed\n"); @@ -5671,11 +5662,8 @@ static void test_MsiGetSourcePath(void) lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SubDir", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); - ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); - } + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); /* nonexistent directory */ size = MAX_PATH; @@ -5730,6 +5718,79 @@ static void test_MsiGetSourcePath(void) DeleteFile(msifile); } +static void test_shortlongsource(void) +{ + MSIHANDLE hdb, hpkg; + CHAR path[MAX_PATH]; + CHAR cwd[MAX_PATH]; + CHAR subsrc[MAX_PATH]; + DWORD size; + UINT r; + + lstrcpyA(cwd, CURR_DIR); + lstrcatA(cwd, "\\"); + + lstrcpyA(subsrc, cwd); + lstrcatA(subsrc, "long"); + lstrcatA(subsrc, "\\"); + + hdb = create_package_db(); + ok( hdb, "failed to create database\n"); + + r = add_directory_entry(hdb, "'TARGETDIR', '', 'SourceDir'"); + ok(r == S_OK, "failed\n"); + + r = add_directory_entry(hdb, "'SubDir', 'TARGETDIR', 'short|long'"); + ok(r == S_OK, "failed\n"); + + hpkg = package_from_db(hdb); + ok(hpkg, "failed to create package\n"); + + MsiCloseHandle(hdb); + + r = MsiDoAction(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "file cost failed\n"); + + r = MsiDoAction(hpkg, "FileCost"); + ok(r == ERROR_SUCCESS, "file cost failed\n"); + + r = MsiDoAction(hpkg, "CostFinalize"); + ok(r == ERROR_SUCCESS, "file cost failed\n"); + + /* neither short nor long source directories exist */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + CreateDirectoryA("short", NULL); + + /* short source directory exists */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + CreateDirectoryA("long", NULL); + + /* both short and long source directories exist */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SubDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, subsrc), "Expected \"%s\", got \"%s\"\n", subsrc, path); + ok(size == lstrlenA(subsrc), "Expected %d, got %d\n", lstrlenA(subsrc), size); + + MsiCloseHandle(hpkg); + RemoveDirectoryA("short"); + RemoveDirectoryA("long"); + DeleteFileA(msifile); +} + START_TEST(package) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -5755,4 +5816,5 @@ START_TEST(package) test_ccpsearch(); test_complocator(); test_MsiGetSourcePath(); + test_shortlongsource(); }

1 0

James Hawkins : msi: Consolidate the MsiGetSourcePath tests and add more tests.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 44bfb9911bde298d28325ed13c832f6f7ab31fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44bfb9911bde298d28325ed13… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:06:36 2008 -0500 msi: Consolidate the MsiGetSourcePath tests and add more tests. --- dlls/msi/tests/package.c | 466 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 346 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44bfb9911bde298d28325…

1 0

James Hawkins : msi: Parse the MSIDBOPEN_PATCHFILE flag.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: ca4758201d94655765d2c92cec59dfcbee2cbf8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4758201d94655765d2c92ce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:05:31 2008 -0500 msi: Parse the MSIDBOPEN_PATCHFILE flag. --- dlls/msi/database.c | 7 +++++++ include/msiquery.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index eaf8ebd..2900860 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -90,6 +90,13 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( !pdb ) return ERROR_INVALID_PARAMETER; + if (szPersist - MSIDBOPEN_PATCHFILE >= MSIDBOPEN_READONLY && + szPersist - MSIDBOPEN_PATCHFILE <= MSIDBOPEN_CREATEDIRECT) + { + TRACE("Database is a patch\n"); + szPersist -= MSIDBOPEN_PATCHFILE; + } + save_path = szDBPath; szMode = szPersist; if( HIWORD( szPersist ) ) diff --git a/include/msiquery.h b/include/msiquery.h index 1358033..fa42f17 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -75,6 +75,8 @@ typedef enum tagMSIMODIFY #define MSIDBOPEN_CREATEDIRECT (LPCWSTR)4 #endif +#define MSIDBOPEN_PATCHFILE 32 / sizeof(*MSIDBOPEN_READONLY) + typedef enum tagMSIRUNMODE { MSIRUNMODE_ADMIN = 0,

1 0

James Hawkins : comctl32: Properly set and store the default icon spacing.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: ba1e75d9f646a7059cb79a1b069a6275322c4ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1e75d9f646a7059cb79a1b0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:55:36 2008 -0500 comctl32: Properly set and store the default icon spacing. --- dlls/comctl32/tests/listview.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 23b5f90..4f8b32d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -859,6 +859,10 @@ static void test_icon_spacing(void) r = SendMessage(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwndparent, (LPARAM)NF_REQUERY); expect(NFR_ANSI, r); + /* reset the icon spacing to defaults */ + SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1)); + + /* now we can request what the defaults are */ r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1)); w = LOWORD(r); h = LOWORD(r);

1 0

James Hawkins : msi: Add handling for the special _Storages table.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: ccd030c7d3e9fdddcfb26c7dd21e0f9ab176c311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd030c7d3e9fdddcfb26c7dd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:59:07 2008 -0500 msi: Add handling for the special _Storages table. --- dlls/msi/Makefile.in | 1 + dlls/msi/msiquery.c | 2 +- dlls/msi/query.h | 2 + dlls/msi/storages.c | 560 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/table.c | 3 + dlls/msi/tests/db.c | 82 +++----- 6 files changed, 591 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccd030c7d3e9fdddcfb26…

1 0

James Hawkins : ole32: Fix a few failing tests in win2k.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 833c342555801892f3c7a00266774c4e3c9abc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=833c342555801892f3c7a0026… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:54:02 2008 -0500 ole32: Fix a few failing tests in win2k. --- dlls/ole32/tests/ole2.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8d72b15..5ca6009 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -782,10 +782,14 @@ static void test_OleCreate(IStorage *pStorage) expected_method_list = methods_olerender_format; trace("OleCreate with OLERENDER_FORMAT:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_FORMAT, &formatetc, (IOleClientSite *)0xdeadbeef, pStorage, (void **)&pObject); - ok_ole_success(hr, "OleCreate"); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win2k */ + "OleCreate failed with error 0x%08x\n", hr); if (pObject) + { IOleObject_Release(pObject); - ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + } expected_method_list = methods_olerender_asis; trace("OleCreate with OLERENDER_ASIS:\n"); @@ -839,10 +843,15 @@ static void test_OleLoad(IStorage *pStorage) expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win2k */ + "OleLoad failed with error 0x%08x\n", hr); ok_ole_success(hr, "OleLoad"); if (pObject) + { IOleObject_Release(pObject); - ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + } } static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param)

1 0

James Hawkins : msi: Properly add a storage to the database and verify its contents.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: ae9b57913534a68e51aae10a7ef0334fe64c9d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9b57913534a68e51aae10a7… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:58:11 2008 -0500 msi: Properly add a storage to the database and verify its contents. --- dlls/msi/tests/db.c | 97 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 85 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5d5eb08..0b2dac4 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5996,11 +5996,47 @@ static void test_where_viewmodify(void) MsiCloseHandle(hdb); } +static BOOL create_storage(LPCSTR name) +{ + WCHAR nameW[MAX_PATH]; + IStorage *stg; + IStream *stm; + HRESULT hr; + DWORD count; + BOOL res = FALSE; + + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, MAX_PATH); + hr = StgCreateDocfile(nameW, STGM_CREATE | STGM_READWRITE | + STGM_DIRECT | STGM_SHARE_EXCLUSIVE, 0, &stg); + if (FAILED(hr)) + return FALSE; + + hr = IStorage_CreateStream(stg, nameW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, + 0, 0, &stm); + if (FAILED(hr)) + goto done; + + hr = IStream_Write(stm, "stgdata", 8, &count); + if (SUCCEEDED(hr)) + res = TRUE; + +done: + IStream_Release(stm); + IStorage_Release(stg); + + return res; +} + static void test_storages_table(void) { MSIHANDLE hdb, hview, hrec; + IStorage *stg, *inner; + IStream *stm; char file[MAX_PATH]; char buf[MAX_PATH]; + WCHAR name[MAX_PATH]; + LPCSTR query; + HRESULT hr; DWORD size; UINT r; @@ -6037,19 +6073,18 @@ static void test_storages_table(void) MsiCloseHandle(hrec); - /* insert a file into the _Storages table */ - create_file("test.txt"); + create_storage("storage.bin"); hrec = MsiCreateRecord(2); - MsiRecordSetString(hrec, 1, "data"); + MsiRecordSetString(hrec, 1, "stgname"); - r = MsiRecordSetStream(hrec, 2, "test.txt"); + r = MsiRecordSetStream(hrec, 2, "storage.bin"); ok(r == ERROR_SUCCESS, "Failed to add stream data to the hrecord: %d\n", r); - DeleteFile("test.txt"); + DeleteFileA("storage.bin"); - r = MsiDatabaseOpenView(hdb, - "INSERT INTO `_Storages` (`Name`, `Data`) VALUES (?, ?)", &hview); + query = "INSERT INTO `_Storages` (`Name`, `Data`) VALUES (?, ?)"; + r = MsiDatabaseOpenView(hdb, query, &hview); todo_wine { ok(r == ERROR_SUCCESS, "Failed to open database hview: %d\n", r); @@ -6062,10 +6097,11 @@ static void test_storages_table(void) } MsiCloseHandle(hrec); + MsiViewClose(hview); MsiCloseHandle(hview); - r = MsiDatabaseOpenView(hdb, - "SELECT `Name`, `Data` FROM `_Storages`", &hview); + query = "SELECT `Name`, `Data` FROM `_Storages`"; + r = MsiDatabaseOpenView(hdb, query, &hview); todo_wine { ok(r == ERROR_SUCCESS, "Failed to open database hview: %d\n", r); @@ -6088,7 +6124,7 @@ static void test_storages_table(void) todo_wine { ok(r == ERROR_SUCCESS, "Failed to get string: %d\n", r); - ok(!lstrcmp(file, "data"), "Expected 'data', got %s\n", file); + ok(!lstrcmp(file, "stgname"), "Expected \"stgname\", got \"%s\"\n", file); } size = MAX_PATH; @@ -6097,7 +6133,7 @@ static void test_storages_table(void) ok(!lstrcmp(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); todo_wine { - ok(r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + ok(r == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %d\n", r); ok(size == 0, "Expected 0, got %d\n", size); } @@ -6109,9 +6145,46 @@ static void test_storages_table(void) ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); } + MsiViewClose(hview); MsiCloseHandle(hview); + + MsiDatabaseCommit(hdb); MsiCloseHandle(hdb); - DeleteFile(msifile); + + MultiByteToWideChar(CP_ACP, 0, msifile, -1, name, MAX_PATH); + hr = StgOpenStorage(name, NULL, STGM_DIRECT | STGM_READ | + STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stg != NULL, "Expected non-NULL storage\n"); + + MultiByteToWideChar(CP_ACP, 0, "stgname", -1, name, MAX_PATH); + hr = IStorage_OpenStorage(stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, + NULL, 0, &inner); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(inner != NULL, "Expected non-NULL storage\n"); + } + + /* FIXME: remove when wine is fixed */ + if (inner) + { + MultiByteToWideChar(CP_ACP, 0, "storage.bin", -1, name, MAX_PATH); + hr = IStorage_OpenStream(inner, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stm != NULL, "Expected non-NULL stream\n"); + + hr = IStream_Read(stm, buf, MAX_PATH, &size); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(size == 8, "Expected 8, got %d\n", size); + ok(!lstrcmpA(buf, "stgdata"), "Expected \"stgdata\", got \"%s\"\n", buf); + + IStream_Release(stm); + IStorage_Release(inner); + } + + IStorage_Release(stg); + DeleteFileA(msifile); } START_TEST(db)

1 0

James Hawkins : d3d9: Fix a failing test for broken drivers.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 7d22101e6be886dcf48780570de79f181459af50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d22101e6be886dcf48780570… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:52:49 2008 -0500 d3d9: Fix a failing test for broken drivers. --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02eaf05..3733bf1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1982,7 +1982,9 @@ static void test_display_formats() hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, FALSE); if(r5g6b5_format_list[i].shouldPass) - ok(hr == D3D_OK, "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_NOTAVAILABLE), + "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat); }

1 0

James Hawkins : rpcrt4: Fix a test that fails in win2k3.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 490443ed4bfea82bcac55963931a840e8410b52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=490443ed4bfea82bcac559639… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:51:59 2008 -0500 rpcrt4: Fix a test that fails in win2k3. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index fa19674..969cce2 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1848,7 +1848,9 @@ static void test_ndr_buffer(void) ok(ret == StubMsg.Buffer, "NdrGetBuffer should have returned the same value as StubMsg.Buffer instead of %p\n", ret); ok(RpcMessage.Handle != NULL, "RpcMessage.Handle should not have been NULL\n"); ok(RpcMessage.Buffer != NULL, "RpcMessage.Buffer should not have been NULL\n"); - ok(RpcMessage.BufferLength == 10, "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); + ok(RpcMessage.BufferLength == 10 || + broken(RpcMessage.BufferLength == 12), /* win2k */ + "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%lx\n", RpcMessage.RpcFlags); ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart);

1 0

Roy Shea : wintrust/test: Verify array length before calling memcmp in test .
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 363516d7c394dac611468942a38567fc97de6a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363516d7c394dac611468942a… Author: Roy Shea <royshea(a)gmail.com> Date: Mon Jul 7 16:13:33 2008 -0700 wintrust/test: Verify array length before calling memcmp in test. --- dlls/wintrust/tests/crypt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index c28f98c..a45f853 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -335,7 +335,9 @@ static void test_calchash(void) { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(!memcmp(hash, expectedhash, sizeof(expectedhash)), "Hashes didn't match\n"); + ok(hashsize == sizeof(expectedhash) && + !memcmp(hash, expectedhash, sizeof(expectedhash)), + "Hashes didn't match\n"); } CloseHandle(file);

1 0