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

Louis Lenders : d3d9: Add a few tests for GetAdapterDisplayModeEx.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 277fdc6b33a66906269e3c6af87a6b3cf94dace2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277fdc6b33a66906269e3c6af… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jul 9 13:25:56 2010 +0200 d3d9: Add a few tests for GetAdapterDisplayModeEx. --- dlls/d3d9/tests/d3d9ex.c | 108 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1a052ac..5af2e4e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2010 Louis Lenders * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +22,17 @@ */ #define COBJMACROS +#include "wine/test.h" +#include "winuser.h" +#include "wingdi.h" #include <initguid.h> #include <d3d9.h> -#include "wine/test.h" static HMODULE d3d9_handle = 0; +static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); +static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); + static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion); static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); @@ -216,6 +222,105 @@ static void test_get_adapter_luid(void) IDirect3D9Ex_Release(d3d9ex); } +static void test_get_adapter_displaymode_ex(void) +{ + HWND window = create_window(); + IDirect3D9 *d3d9 = (void *) 0xdeadbeef; + IDirect3D9Ex *d3d9ex; + UINT count; + HRESULT hr; + D3DDISPLAYMODE mode; + D3DDISPLAYMODEEX mode_ex; + D3DDISPLAYROTATION rotation; + HANDLE hdll; + DEVMODEA startmode; + LONG retval; + + hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); + if (FAILED(hr)) + { + skip("Direct3D9Ex is not available (%#x)\n", hr); + DestroyWindow(window); + return; + } + + count = IDirect3D9Ex_GetAdapterCount(d3d9ex); + if (!count) + { + skip("No adapters available.\n"); + IDirect3D9Ex_Release(d3d9ex); + DestroyWindow(window); + return; + } + + hr = IDirect3D9Ex_QueryInterface(d3d9ex, &IID_IDirect3D9, (void **) &d3d9); + ok(hr == D3D_OK, + "IDirect3D9Ex::QueryInterface for IID_IDirect3D9 returned %08x, expected D3D_OK\n", + hr); + ok(d3d9 != NULL && d3d9 != (void *) 0xdeadbeef, + "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef\n", d3d9); + /* change displayorientation*/ + hdll = GetModuleHandleA("user32.dll"); + pEnumDisplaySettingsExA = (void*)GetProcAddress(hdll, "EnumDisplaySettingsExA"); + pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); + + if (!pEnumDisplaySettingsExA || !pChangeDisplaySettingsExA) goto out; + + memset(&startmode, 0, sizeof(startmode)); + startmode.dmSize = sizeof(startmode); + startmode.dmFields = DM_DISPLAYORIENTATION; + startmode.dmDisplayOrientation = DMDO_180; + + retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); + + if(retval == DISP_CHANGE_BADMODE) + { + trace(" Test skipped: graphics mode is not supported\n"); + goto out; + } + + ok(retval == DISP_CHANGE_SUCCESSFUL,"ChangeDisplaySettingsEx failed with %d\n", retval); + /* try retrieve orientation info with EnumDisplaySettingsEx*/ + startmode.dmFields = 0; + startmode.dmDisplayOrientation = 0; + ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); + + /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ + memset(&mode_ex, 0, sizeof(mode_ex)); + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, &rotation); + todo_wine ok(hr == D3DERR_INVALIDCALL, "GetAdapterDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL\n", hr); + + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + /* invalid count*/ + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, count + 1, &mode_ex, &rotation); + todo_wine ok(hr == D3DERR_INVALIDCALL, "GetAdapterDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL\n", hr); + /*valid count and valid Size*/ + hr = IDirect3D9Ex_GetAdapterDisplayModeEx(d3d9ex, D3DADAPTER_DEFAULT, &mode_ex, &rotation); + todo_wine ok(SUCCEEDED(hr), "GetAdapterDisplayModeEx failed, hr %#x.\n", hr); + + /* Compare what GetAdapterDisplayMode returns with what GetAdapterDisplayModeEx returns*/ + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &mode); + ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d instead of %d\n", mode_ex.Size, sizeof(D3DDISPLAYMODEEX)); + todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); + todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); + todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate); + todo_wine ok(mode_ex.Format == mode.Format, "format is %x instead of %x\n", mode_ex.Format, mode.Format); + /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ + todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); + /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ + todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); + + /* return to the default mode */ + pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", + mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); +out: + IDirect3D9_Release(d3d9); + IDirect3D9Ex_Release(d3d9ex); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -239,4 +344,5 @@ START_TEST(d3d9ex) test_qi_base_to_ex(); test_qi_ex_to_base(); test_get_adapter_luid(); + test_get_adapter_displaymode_ex(); }

1 0

Igor Paliychuk : winhlp32: Ukrainian translation update.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 92047639b89095525e3179aca57950eba4eaff9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92047639b89095525e3179aca… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 9 16:45:22 2010 +0300 winhlp32: Ukrainian translation update. --- programs/winhlp32/Uk.rc | 110 +++++++++------------------------------------- 1 files changed, 22 insertions(+), 88 deletions(-) diff --git a/programs/winhlp32/Uk.rc b/programs/winhlp32/Uk.rc index bf026b0..eb01092 100644 --- a/programs/winhlp32/Uk.rc +++ b/programs/winhlp32/Uk.rc @@ -28,54 +28,11 @@ /* UTF-8 */ #pragma code_page(65001) -/* Menu */ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -{ - POPUP "&Файл" { - MENUITEM "&Відкрити", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Друк", MNID_FILE_PRINT - MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "В&ихід", MNID_FILE_EXIT - } - POPUP "&Правка" { - MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE - } - POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE - } - POPUP "&Налаштування" { - POPUP "Help always visible" - BEGIN - MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE - END - MENUITEM "Історія", MNID_OPTS_HISTORY - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_OPTS_FONTS_SMALL - MENUITEM "Нормальний", MNID_OPTS_FONTS_NORMAL - MENUITEM "Великий", MNID_OPTS_FONTS_LARGE - END - MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS - } - POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON - MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Інформація...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Про Wine", MNID_HELP_WINE -#endif - } -} +/* Menu */ -MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Файл" { MENUITEM "&Відкрити", MNID_FILE_OPEN @@ -88,17 +45,17 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL POPUP "&Правка" { MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + MENUITEM "&Замітки...", MNID_EDIT_ANNOTATE } POPUP "&Закладка" { - MENUITEM "&Define...", MNID_BKMK_DEFINE + MENUITEM "&Задати...", MNID_BKMK_DEFINE } POPUP "&Налаштування" { - POPUP "Help always visible" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT - MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE - MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не зверху", MNID_OPTS_HELP_NONVISIBLE END MENUITEM "Історія", MNID_OPTS_HISTORY POPUP "Шрифти" @@ -110,7 +67,7 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS } POPUP "&Довідка" { - MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Довідка &про Довідку", MNID_HELP_HELPON MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Інформація...", MNID_HELP_ABOUT @@ -120,24 +77,24 @@ MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Index" +CAPTION "Вказівник" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Search" +CAPTION "Пошук" { LTEXT "Ще не впроваджено", -1, 10, 10, 180, 150 } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Довідка Wine" STID_WHERROR, "ПОМИЛКА" @@ -145,21 +102,21 @@ STID_WARNING, "УВАГА" STID_INFO, "Інформація" STID_NOT_IMPLEMENTED, "Не впроваджено" STID_HLPFILE_ERROR_s, "Помилка читання файлу довідки `%s'" -STID_INDEX, "&Index" -STID_CONTENTS, "Summary" +STID_INDEX, "&Зміст" +STID_CONTENTS, "Сумарно" STID_BACK, "&Назад" STID_ALL_FILES, "Всі файли (*.*)" STID_HELP_FILES_HLP, "Файли довідки (*.hlp)" STID_FILE_NOT_FOUND_s "Не можу знайти '%s'. Хочете знайти цей файл самотужки?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Не можу знайти richedit... Скасовую" STID_PSH_INDEX, "Розділи Довідки: " } -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Замітки...", MNID_CTXT_ANNOTATE MENUITEM "Копіювати", MNID_CTXT_COPY MENUITEM "Друк...", MNID_CTXT_PRINT POPUP "Шрифти" @@ -168,35 +125,12 @@ BEGIN MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL MENUITEM "Великий", MNID_CTXT_FONTS_LARGE END - POPUP "Довідка завжди видима" + POPUP "Видимість Довідки" BEGIN MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "Зверху", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не зверху", MNID_CTXT_HELP_NONVISIBLE END MENUITEM "Використати системні кольори", MNID_CTXT_SYSTEM_COLORS END END - -CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL -BEGIN - POPUP "" - BEGIN - MENUITEM "Annotation...", MNID_CTXT_ANNOTATE - MENUITEM "Копіювати", MNID_CTXT_COPY - MENUITEM "Друк...", MNID_CTXT_PRINT - POPUP "Шрифти" - BEGIN - MENUITEM "Малий", MNID_CTXT_FONTS_SMALL - MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL - MENUITEM "Великий", MNID_CTXT_FONTS_LARGE - END - POPUP "Довідка завжди видима" - BEGIN - MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT - MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE - MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE - END - MENUITEM "Використати ситемні кольори", MNID_CTXT_SYSTEM_COLORS - END -END

1 0

Andrew Nguyen : msi/tests: Run the automation tests in silent mode to avoid a dialog.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: ff188900f3b89f965c9c853062529afa7ca1858d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff188900f3b89f965c9c85306… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:08:38 2010 -0500 msi/tests: Run the automation tests in silent mode to avoid a dialog. --- dlls/msi/tests/automation.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bad4882..35b660b 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1081,6 +1081,20 @@ static HRESULT Installer_VersionGet(LPWSTR szVersion) return hr; } +static HRESULT Installer_UILevelPut(int level) +{ + VARIANT varresult; + VARIANTARG vararg; + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dispparams = {&vararg, &dispid, sizeof(vararg)/sizeof(VARIANTARG), 1}; + + VariantInit(&vararg); + V_VT(&vararg) = VT_I4; + V_I4(&vararg) = level; + + return invoke(pInstaller, "UILevel", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); +} + static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) { VARIANT varresult; @@ -2383,6 +2397,10 @@ static void test_Installer_InstallProduct(void) create_test_files(); + /* Avoid an interactive dialog in case of insufficient privileges. */ + hr = Installer_UILevelPut(INSTALLUILEVEL_NONE); + ok(hr == S_OK, "Expected UILevel propery put invoke to return S_OK, got 0x%08x\n", hr); + /* Installer::InstallProduct */ hr = Installer_InstallProduct(szMsifile, NULL); if (hr == DISP_E_EXCEPTION)

1 0

Andrew Nguyen : msi/tests: Delete the test patch file for proper patch test cleanup.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 577554260e23257b6819f95173acd8c29251559e URL: http://source.winehq.org/git/wine.git/?a=commit;h=577554260e23257b6819f9517… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:08:52 2010 -0500 msi/tests: Delete the test patch file for proper patch test cleanup. --- dlls/msi/tests/patch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 4e10505..d2275a0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -841,6 +841,7 @@ static void test_simple_patch( void ) DeleteFileA( msifile ); DeleteFileA( mspfile ); + DeleteFileA( "msitest\\patch.txt" ); RemoveDirectoryA( "msitest" ); } @@ -1058,6 +1059,7 @@ static void test_system_tables( void ) DeleteFileA( msifile ); DeleteFileA( mspfile ); + DeleteFileA( "msitest\\patch.txt" ); RemoveDirectoryA( "msitest" ); } @@ -1148,6 +1150,7 @@ static void test_patch_registration( void ) DeleteFileA( msifile ); DeleteFileA( mspfile ); + DeleteFileA( "msitest\\patch.txt" ); RemoveDirectoryA( "msitest" ); }

1 0

Andrew Nguyen : msi/test: Uninstall the test product when skipping patch tests.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: f01b9aab0902421d554e66f0789e518ab836bada URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01b9aab0902421d554e66f07… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:09:31 2010 -0500 msi/test: Uninstall the test product when skipping patch tests. This seems to be a reasonable cleanup action. --- dlls/msi/tests/patch.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index d2275a0..ca0906b 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -759,7 +759,7 @@ static void test_simple_patch( void ) if (r == ERROR_PATCH_PACKAGE_INVALID) { win_skip("Windows Installer < 3.0 detected\n"); - return; + goto uninstall; } size = get_pf_file_size( "msitest\\patch.txt" ); @@ -827,6 +827,7 @@ static void test_simple_patch( void ) MsiCloseHandle( hview ); MsiCloseHandle( hdb ); +uninstall: size = sizeof(path); r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", "InstallSource", path, &size ); @@ -990,7 +991,7 @@ static void test_system_tables( void ) if (r == ERROR_PATCH_PACKAGE_INVALID) { win_skip("Windows Installer < 3.0 detected\n"); - return; + goto uninstall; } r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); @@ -1054,6 +1055,7 @@ static void test_system_tables( void ) MsiCloseHandle( hdb ); MsiCloseHandle( hproduct ); +uninstall: r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -1092,7 +1094,7 @@ static void test_patch_registration( void ) if (r == ERROR_PATCH_PACKAGE_INVALID) { win_skip("Windows Installer < 3.0 detected\n"); - return; + goto uninstall; } buffer[0] = 0; @@ -1137,6 +1139,7 @@ static void test_patch_registration( void ) 0, patch_code, NULL, NULL, NULL, NULL ); ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); +uninstall: r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Andrew Nguyen : msi/tests: Skip patch tests if product installation failed.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 3b79a7b4ac0e78152b643c721edd1ba250010919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b79a7b4ac0e78152b643c721… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:09:52 2010 -0500 msi/tests: Skip patch tests if product installation failed. --- dlls/msi/tests/patch.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ca0906b..6b4faf1 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -700,7 +700,11 @@ static void test_simple_patch( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); r = MsiInstallProductA( msifile, NULL ); - ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + if (r != ERROR_SUCCESS) + { + skip("Product installation failed with error code %u\n", r); + goto cleanup; + } size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1000, "expected 1000, got %u\n", size ); @@ -840,6 +844,7 @@ uninstall: ok( !delete_pf( "msitest\\patch.txt", TRUE ), "file not removed\n" ); ok( !delete_pf( "msitest", FALSE ), "directory not removed\n" ); +cleanup: DeleteFileA( msifile ); DeleteFileA( mspfile ); DeleteFileA( "msitest\\patch.txt" ); @@ -930,7 +935,11 @@ static void test_system_tables( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); r = MsiInstallProductA( msifile, NULL ); - ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + if (r != ERROR_SUCCESS) + { + skip("Product installation failed with error code %d\n", r); + goto cleanup; + } r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -1059,6 +1068,7 @@ uninstall: r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); +cleanup: DeleteFileA( msifile ); DeleteFileA( mspfile ); DeleteFileA( "msitest\\patch.txt" ); @@ -1085,7 +1095,11 @@ static void test_patch_registration( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); r = MsiInstallProductA( msifile, NULL ); - ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + if (r != ERROR_SUCCESS) + { + skip("Product installation failed with error code %d\n", r); + goto cleanup; + } r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ @@ -1151,6 +1165,7 @@ uninstall: INSTALLPROPERTY_LOCALPACKAGE, buffer, &size ); ok( r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r ); +cleanup: DeleteFileA( msifile ); DeleteFileA( mspfile ); DeleteFileA( "msitest\\patch.txt" );

1 0

Andrew Nguyen : msi/tests: Free the user SID string buffer with the correct deallocator in the source tests .
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: ba180b8600c3fa65135519c196e8d83496961a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba180b8600c3fa65135519c19… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:08 2010 -0500 msi/tests: Free the user SID string buffer with the correct deallocator in the source tests. --- dlls/msi/tests/source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 1826f21..274cb43 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1001,7 +1001,7 @@ static void test_MsiSourceListAddSourceEx(void) RegCloseKey(url); RegCloseKey(prodkey); - HeapFree(GetProcessHeap(), 0, usersid); + LocalFree(usersid); } static void test_MsiSourceListEnumSources(void)

1 0

Andrew Nguyen : msi/tests: Remove a redundant source test.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: abe900a23c4548606f30b573e716e947caecca23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe900a23c4548606f30b573e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 9 04:10:32 2010 -0500 msi/tests: Remove a redundant source test. --- dlls/msi/tests/source.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 274cb43..fbf93fe 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -219,11 +219,6 @@ static void test_MsiSourceListGetInfo(void) MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - /* szProductCodeOrPatchCode */ - r = pMsiSourceListGetInfoA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - /* guid without brackets */ r = pMsiSourceListGetInfoA("51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL);

1 0

David Adam : d3dx9_36/test: Fix a copy/paste typo.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: 4771ee2c5f2e95929a19caade12c5918ed9a42b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4771ee2c5f2e95929a19caade… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 9 04:34:13 2010 +0200 d3dx9_36/test: Fix a copy/paste typo. --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 113613e..e675d7d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -270,7 +270,7 @@ static void D3DXDeclaratorFromFVFTest(void) ok(decl[i].Method == exp1[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp1[i].Method); ok(decl[i].Usage == exp1[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp1[i].Usage); ok(decl[i].UsageIndex == exp1[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp1[i].UsageIndex); - ok(decl[i].Offset == exp1[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp1[i].Offset); + ok(decl[i].Offset == exp1[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp1[i].Offset); } ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ } @@ -291,7 +291,7 @@ static void D3DXDeclaratorFromFVFTest(void) ok(decl[i].Method == exp2[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp2[i].Method); ok(decl[i].Usage == exp2[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp2[i].Usage); ok(decl[i].UsageIndex == exp2[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp2[i].UsageIndex); - ok(decl[i].Offset == exp2[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp2[i].Offset); + ok(decl[i].Offset == exp2[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp2[i].Offset); } ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ } @@ -315,7 +315,7 @@ static void D3DXDeclaratorFromFVFTest(void) ok(decl[i].Method == exp3[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp3[i].Method); ok(decl[i].Usage == exp3[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp3[i].Usage); ok(decl[i].UsageIndex == exp3[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp3[i].UsageIndex); - ok(decl[i].Offset == exp3[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, exp3[i].Offset); + ok(decl[i].Offset == exp3[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp3[i].Offset); } ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ }

1 0

Alexandre Julliard : msvcrt/tests: Add some alternative locale names that happen on Windows.
by Alexandre Julliard 09 Jul '10

09 Jul '10

Module: wine Branch: master Commit: d2cda58a1f7780d26ad0fef2edd79453f6740e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cda58a1f7780d26ad0fef2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 9 11:38:08 2010 +0200 msvcrt/tests: Add some alternative locale names that happen on Windows. --- dlls/msvcrt/tests/locale.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index cf51c4c..2496ebc 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -117,7 +117,8 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") - || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) + || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-traditional"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); @@ -439,12 +440,14 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); @@ -453,6 +456,7 @@ static void test_setlocale(void) todo_wine ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk");

1 0