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

James Hawkins : kernel32: Fix test failures because of a broken ReplaceFile in win2k.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c7375427826fb42ca078b4833ca9a9234f9a2235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7375427826fb42ca078b4833… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:20:46 2008 -0500 kernel32: Fix test failures because of a broken ReplaceFile in win2k. --- dlls/kernel32/tests/file.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 57e0496..4730ec4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2074,7 +2074,8 @@ static void test_ReplaceFileA(void) ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - ok(hReplacementFile != INVALID_HANDLE_VALUE, + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ "unexpected error, replacement file should still exist %d\n", GetLastError()); CloseHandle(hReplacementFile); ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_NORMAL); @@ -2107,7 +2108,9 @@ static void test_ReplaceFileA(void) /* delete temporary files, replacement and replaced are already deleted */ ret = DeleteFileA(backup); - ok(ret, "DeleteFileA: error (backup) %d\n", GetLastError()); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileA: error (backup) %d\n", GetLastError()); } /* @@ -2178,7 +2181,9 @@ static void test_ReplaceFileW(void) "ReplaceFileW: unexpected error %d\n", GetLastError()); ret = DeleteFileW(backup); - ok(ret, "DeleteFileW: error %d\n", GetLastError()); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileW: error (backup) %d\n", GetLastError()); } START_TEST(file)

1 0

James Hawkins : advapi32: Fix a failing test in win2k.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 448cfaeb8fd436a7ab4bd3f10e2435dbb88ccf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448cfaeb8fd436a7ab4bd3f10… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:16:54 2008 -0500 advapi32: Fix a failing test in win2k. --- dlls/advapi32/tests/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d393f11..ea4d912 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1642,7 +1642,8 @@ static void test_LookupAccountName(void) ok(!ret, "Expected 0, got %d\n", ret); todo_wine { - ok(GetLastError() == ERROR_NONE_MAPPED, + ok(GetLastError() == ERROR_NONE_MAPPED || + broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE), "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); ok(sid_size == 0, "Expected 0, got %d\n", sid_size); ok(domain_size == 0, "Expected 0, got %d\n", domain_size);

1 0

James Hawkins : ddraw: Fix a failing test for broken drivers.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 8830dbcca8b021c5b3f6d94dfedc87947e72f2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8830dbcca8b021c5b3f6d94df… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:18:05 2008 -0500 ddraw: Fix a failing test for broken drivers. --- dlls/ddraw/tests/d3d.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f4e4970..bf933bc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -327,7 +327,8 @@ static void LightTest(void) light.dvAttenuation0 = zero / zero; /* NaN */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); - ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + ok(rc==D3D_OK || + broken(rc==DDERR_INVALIDPARAMS), "SetLight returned: %x\n", rc); /* Directional light ignores attenuation */ light.dltType = D3DLIGHT_DIRECTIONAL;

1 0

James Hawkins : ddraw: Fix a failing test for broken drivers.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 11e31e580c4c0bddd04a883f5edf8432734f6eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e31e580c4c0bddd04a883f5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:19:06 2008 -0500 ddraw: Fix a failing test for broken drivers. --- dlls/ddraw/tests/dsurface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 342b88a..7dba28b 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1873,8 +1873,8 @@ static void CompressedTest(void) U4(ddsd).ddpfPixelFormat.dwFourCC = MAKEFOURCC('D','X','T','1'); hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); - ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW || hr == DDERR_INVALIDPARAMS, - "CreateSurface returned %08x\n", hr); + ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW || hr == DDERR_INVALIDPARAMS || + broken(hr == DDERR_NODIRECTDRAWHW), "CreateSurface returned %08x\n", hr); /* Not supported everywhere */ if(SUCCEEDED(hr))

1 0

James Hawkins : fusion: pwzFilePath is an out parameter, so don' t trace its contents.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: e9acfbee57d98307f4e685090ca9a06e3ab245d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9acfbee57d98307f4e685090… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:16:15 2008 -0500 fusion: pwzFilePath is an out parameter, so don't trace its contents. --- dlls/fusion/fusion.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index cabe68e..462c5d5 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -94,6 +94,6 @@ HRESULT WINAPI GetAssemblyIdentityFromFile(LPCWSTR pwzFilePath, REFIID riid, HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, PDWORD pcchPath) { - FIXME("(%08x, %s, %p) stub!\n", dwCacheFlags, debugstr_w(pwzCachePath), pcchPath); + FIXME("(%08x, %p, %p) stub!\n", dwCacheFlags, pwzCachePath, pcchPath); return E_NOTIMPL; }

1 0

Alexandre Julliard : winex11: Get rid of the XKB initialisation workaround now that we no longer use XInitThreads .
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 5998bd59d7033b1c1623017839508413514949f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5998bd59d7033b1c162301783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:03:26 2008 +0200 winex11: Get rid of the XKB initialisation workaround now that we no longer use XInitThreads. --- dlls/winex11.drv/x11drv_main.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 434778a..e2375b2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -637,18 +637,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ #ifdef HAVE_XKB - if (use_xkb) - { - use_xkb = XkbUseExtension( data->display, NULL, NULL ); - if (use_xkb) - { - /* Hack: dummy call to XkbKeysymToModifiers to force initialisation of Xkb internals */ - /* This works around an Xlib bug where it tries to get the display lock */ - /* twice during XFilterEvents if Xkb hasn't been initialised yet. */ - XkbKeysymToModifiers( data->display, 'A' ); - XkbSetDetectableAutoRepeat( data->display, True, NULL ); - } - } + if (use_xkb && XkbUseExtension( data->display, NULL, NULL )) + XkbSetDetectableAutoRepeat( data->display, True, NULL ); #endif if (TRACE_ON(synchronous)) XSynchronize( data->display, True );

1 0

James Hawkins : msi: Test the special _Storages table.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: d9ac95be5bb51de2293326920c2eb4509834ff93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ac95be5bb51de2293326920… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 14:56:05 2008 -0500 msi: Test the special _Storages table. --- dlls/msi/tests/db.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3a627c0..5d5eb08 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3248,6 +3248,9 @@ static void test_temporary_table(void) ok( cond == MSICONDITION_NONE, "wrong return condition\n"); } + cond = MsiDatabaseIsTablePersistent(hdb, "_Storages"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + cond = MsiDatabaseIsTablePersistent(hdb, "_Streams"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); @@ -3963,6 +3966,11 @@ static void test_special_tables(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to create table\n"); + query = "CREATE TABLE `_Storages` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + query = "CREATE TABLE `_Streams` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, 0, query); @@ -5988,6 +5996,124 @@ static void test_where_viewmodify(void) MsiCloseHandle(hdb); } +static void test_storages_table(void) +{ + MSIHANDLE hdb, hview, hrec; + char file[MAX_PATH]; + char buf[MAX_PATH]; + DWORD size; + UINT r; + + hdb = create_db(); + ok(hdb, "failed to create db\n"); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS , "Failed to commit database\n"); + + MsiCloseHandle(hdb); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb); + ok(r == ERROR_SUCCESS , "Failed to open database\n"); + + /* check the column types */ + hrec = get_column_info(hdb, "SELECT * FROM `_Storages`", MSICOLINFO_TYPES); + ok(hrec, "failed to get column info hrecord\n"); + todo_wine + { + ok(check_record(hrec, 1, "s62"), "wrong hrecord type\n"); + ok(check_record(hrec, 2, "V0"), "wrong hrecord type\n"); + } + + MsiCloseHandle(hrec); + + /* now try the names */ + hrec = get_column_info(hdb, "SELECT * FROM `_Storages`", MSICOLINFO_NAMES); + ok(hrec, "failed to get column info hrecord\n"); + todo_wine + { + ok(check_record(hrec, 1, "Name"), "wrong hrecord type\n"); + ok(check_record(hrec, 2, "Data"), "wrong hrecord type\n"); + } + + MsiCloseHandle(hrec); + + /* insert a file into the _Storages table */ + create_file("test.txt"); + + hrec = MsiCreateRecord(2); + MsiRecordSetString(hrec, 1, "data"); + + r = MsiRecordSetStream(hrec, 2, "test.txt"); + ok(r == ERROR_SUCCESS, "Failed to add stream data to the hrecord: %d\n", r); + + DeleteFile("test.txt"); + + r = MsiDatabaseOpenView(hdb, + "INSERT INTO `_Storages` (`Name`, `Data`) VALUES (?, ?)", &hview); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to open database hview: %d\n", r); + } + + r = MsiViewExecute(hview, hrec); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to execute hview: %d\n", r); + } + + MsiCloseHandle(hrec); + MsiCloseHandle(hview); + + r = MsiDatabaseOpenView(hdb, + "SELECT `Name`, `Data` FROM `_Storages`", &hview); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to open database hview: %d\n", r); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to execute hview: %d\n", r); + } + + r = MsiViewFetch(hview, &hrec); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to fetch hrecord: %d\n", r); + } + + size = MAX_PATH; + r = MsiRecordGetString(hrec, 1, file, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok(!lstrcmp(file, "data"), "Expected 'data', got %s\n", file); + } + + size = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordReadStream(hrec, 2, buf, &size); + 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(size == 0, "Expected 0, got %d\n", size); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } + + MsiCloseHandle(hview); + MsiCloseHandle(hdb); + DeleteFile(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -6025,4 +6151,5 @@ START_TEST(db) test_forcecodepage(); test_viewmodify_refresh(); test_where_viewmodify(); + test_storages_table(); }

1 0

Alexandre Julliard : winex11: Check for XKB extension on the GDI display too.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 219ae804ba4de3e3dfb71c1822e1a8a0007b5971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219ae804ba4de3e3dfb71c182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:03:52 2008 +0200 winex11: Check for XKB extension on the GDI display too. --- dlls/winex11.drv/x11drv_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e2375b2..2e19913 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -537,6 +537,9 @@ static BOOL process_attach(void) X11DRV_XComposite_Init(); #endif +#ifdef HAVE_XKB + if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL ); +#endif X11DRV_InitKeyboard( gdi_display ); X11DRV_InitClipboard(); if (use_xim) use_xim = X11DRV_InitXIM( input_style );

1 0

Hwang YunSong(황윤성) : taskmgr: Updated Korean resource.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: a617634e2eea1e72c00d6b0c36fd6dc778d502f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a617634e2eea1e72c00d6b0c3… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 2 10:13:54 2008 +0900 taskmgr: Updated Korean resource. --- programs/taskmgr/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 14070a2..00e05b6 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -433,12 +433,12 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "�۾� ��" IDC_TASKMGR "�۾� ��" - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "�� ۾� ��" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "�� Ǯ�׸� ��" + ID_FILE_NEW "�� α׷� ��" ID_OPTIONS_ALWAYSONTOP "�۾��ڴ� �ּ�ȭ �� ʴ� �� ٸ� â �տ� �ְ� �˴ϴ�" ID_OPTIONS_MINIMIZEONUSE "�۾��ڴ� ��ȯ �۾�� Ϸ�� ּ�ȭ�˴ϴ�"

1 0

Hwang YunSong(황윤성) : winhlp32: Updated Korean resource.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c4133613df44441720a07cac60cc546698d3ef0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4133613df44441720a07cac6… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 2 10:14:25 2008 +0900 winhlp32: Updated Korean resource. --- programs/winhlp32/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 290bfc2..9b6b6c6 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -96,7 +96,7 @@ STID_ALL_FILES, " STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "%s�� ã�� ϴ�'. �� ã�ڽ��ϱ�?" STID_NO_RICHEDIT "richedit �� ã�� ϴ�.. ��" -STID_PSH_INDEX, "Help topics: " +STID_PSH_INDEX, "�� : " } CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL

1 0