December 2010 - Wine-Commits

Detlef Riekenberg : cmd: Add german translation for CHOICE.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 7506d41e75c283b42fa421d88067ccffb744d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7506d41e75c283b42fa421d88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:33 2010 +0100 cmd: Add german translation for CHOICE. --- programs/cmd/De.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 157bc4f..8b4bfb3 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -228,6 +228,10 @@ mit PUSHD gespeicherten.\n" WCMD_MORE, "MORE gibt Dateien und Pipes seitenweise aus.\n" + WCMD_CHOICE, "CHOICE zeigt einen Text auf dem Bildschirm an und wartet,\n\ +bis der Benutzer eine erlaubte Taste aus einer wählbaren Liste drückt.\n\ +CHOICE wird hauptsächlich als Menüauswahl in einer Batchdatei genutzt.\n" + WCMD_EXIT, "EXIT beendet die aktuelle Befehlssitzung und kehrt zum\n\ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" @@ -237,6 +241,7 @@ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\ +CHOICE\t\tWartet auf einen Tastendruck aus einer wählbaren Liste\n\ CLS\t\tLöscht den Inhalt der Konsole\n\ COPY\t\tKopiert eine Datei\n\ CTTY\t\tÄndert das Eingabe/Ausgabe - Gerät\n\

1 0

André Hentschel : msi/tests: Remove superfluous check.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 0e5c2f346d5ac1becb0a33f91d06cc3d36295af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5c2f346d5ac1becb0a33f91… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 20 01:48:13 2010 +0100 msi/tests: Remove superfluous check. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 0032222..1db7845 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3420,7 +3420,7 @@ static void test_publish(void) ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Greg Geldorp : rsaenh/tests: CryptGetKeyParam doesn't fail on Win7/Win2K8R2 .
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: ad8ce8388b199474db47edc8eb5c00590670708c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8ce8388b199474db47edc8e… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Dec 20 00:32:18 2010 +0100 rsaenh/tests: CryptGetKeyParam doesn't fail on Win7/Win2K8R2. --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 8f46a09..7892f1a 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -947,8 +947,8 @@ static void test_aes(int keylen) /* AES provider doesn't support salt */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, + "expected NTE_BAD_KEY, got %08x\n", GetLastError()); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16);

1 0

André Hentschel : sane.ds: Fix translation of microsecond.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 2f30e3e464f65ffc808337d5296867a6bd5dcdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f30e3e464f65ffc808337d52… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 19:48:07 2010 +0100 sane.ds: Fix translation of microsecond. --- dlls/sane.ds/sane_Da.rc | 2 +- dlls/sane.ds/sane_De.rc | 3 ++- dlls/sane.ds/sane_En.rc | 2 +- dlls/sane.ds/sane_Es.rc | 2 +- dlls/sane.ds/sane_Fi.rc | 2 +- dlls/sane.ds/sane_Fr.rc | 2 +- dlls/sane.ds/sane_Hu.rc | 2 +- dlls/sane.ds/sane_It.rc | 2 +- dlls/sane.ds/sane_Ja.rc | 2 +- dlls/sane.ds/sane_Ko.rc | 2 +- dlls/sane.ds/sane_Lt.rc | 2 +- dlls/sane.ds/sane_Nl.rc | 2 +- dlls/sane.ds/sane_No.rc | 2 +- dlls/sane.ds/sane_Pl.rc | 2 +- dlls/sane.ds/sane_Pt.rc | 2 +- dlls/sane.ds/sane_Ro.rc | 2 +- dlls/sane.ds/sane_Si.rc | 2 +- dlls/sane.ds/sane_Sr.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 2 +- dlls/sane.ds/sane_Uk.rc | 2 +- dlls/sane.ds/sane_Zh.rc | 4 ++-- 21 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 77b6640..3cfb199 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_Da.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 537666b..29eafec 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -2,6 +2,7 @@ * German resources for Twain * * Copyright 2006 Henning Gerhardt + * Copyright 2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 9e4bee8..f899758 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index 7f5e8c2..6ac520c 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 9c8dd04..0f9869e 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index bd3017d..d63f348 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Hu.rc b/dlls/sane.ds/sane_Hu.rc index 9b778b8..9491d2c 100644 --- a/dlls/sane.ds/sane_Hu.rc +++ b/dlls/sane.ds/sane_Hu.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_It.rc b/dlls/sane.ds/sane_It.rc index 076188c..d18e90b 100644 --- a/dlls/sane.ds/sane_It.rc +++ b/dlls/sane.ds/sane_It.rc @@ -42,5 +42,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ja.rc b/dlls/sane.ds/sane_Ja.rc index 34883d7..636b050 100644 --- a/dlls/sane.ds/sane_Ja.rc +++ b/dlls/sane.ds/sane_Ja.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 59f65f6..87caca4 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc index 18ade7a..a116ced 100644 --- a/dlls/sane.ds/sane_Lt.rc +++ b/dlls/sane.ds/sane_Lt.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "tašk./col." 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 31f506f..4171637 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index 0baf618..18a2030 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 11ffe0f..66ed348 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index ea50ab4..cc7a98b 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -52,5 +52,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc index 276ef6b..fc1b94f 100644 --- a/dlls/sane.ds/sane_Ro.rc +++ b/dlls/sane.ds/sane_Ro.rc @@ -39,5 +39,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Si.rc b/dlls/sane.ds/sane_Si.rc index 538a1dc..e67676a 100644 --- a/dlls/sane.ds/sane_Si.rc +++ b/dlls/sane.ds/sane_Si.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Sr.rc b/dlls/sane.ds/sane_Sr.rc index 5657c13..c1738cc 100644 --- a/dlls/sane.ds/sane_Sr.rc +++ b/dlls/sane.ds/sane_Sr.rc @@ -41,7 +41,7 @@ STRINGTABLE 3 "мм" 4 "тпи" 5 "%" - 6 "нс" + 6 "µс" } LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN @@ -62,5 +62,5 @@ STRINGTABLE 3 "mm" 4 "tpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index a0ee5e7..853ab28 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_Sv.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Uk.rc b/dlls/sane.ds/sane_Uk.rc index 02d8a09..53e0f99 100644 --- a/dlls/sane.ds/sane_Uk.rc +++ b/dlls/sane.ds/sane_Uk.rc @@ -42,5 +42,5 @@ STRINGTABLE 3 "мм" 4 "точок на дюйм" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Zh.rc b/dlls/sane.ds/sane_Zh.rc index 7050a4a..19dba3b 100644 --- a/dlls/sane.ds/sane_Zh.rc +++ b/dlls/sane.ds/sane_Zh.rc @@ -41,7 +41,7 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -62,5 +62,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" }

1 0

David Hedberg : shell32: Add IShellItem2 stub to ShellItem implementation.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: d2091a8043a732d28cf3a1da425999d893349cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2091a8043a732d28cf3a1da4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:13 2010 +0100 shell32: Add IShellItem2 stub to ShellItem implementation. --- dlls/shell32/shellitem.c | 170 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 141 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2091a8043a732d28cf3a…

1 0

André Hentschel : gameux: Fix Path for the statistics.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 9eda42fe94d3d0fc98cb529147a84e053f1ac3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eda42fe94d3d0fc98cb52914… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 20:11:15 2010 +0100 gameux: Fix Path for the statistics. --- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 97a8f13..5650c94 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -323,7 +323,7 @@ static HRESULT GAMEUX_buildStatisticsFilePath( static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s',0}; + 't','i','c','s','\\',0}; static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; HRESULT hr; diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 7eb9864..c49e693 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -128,7 +128,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s',0}; + 't','i','c','s','\\',0}; static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; static const DWORD dwGuidLength = 49;

1 0

André Hentschel : gameux: Fix test failures on Wine wow64.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 9b97fa1a604660b8adfc28615daab2166af02c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b97fa1a604660b8adfc28615… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 20:35:38 2010 +0100 gameux: Fix test failures on Wine wow64. --- dlls/gameux/gameexplorer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index bddc131..ea9307b 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -217,7 +217,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, + 0, NULL, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, NULL, &hKey, NULL)); if(SUCCEEDED(hr)) @@ -252,7 +252,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) if(FAILED(hr)) { /* if something failed, remove whole key */ - hr2 = RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, 0, 0); + hr2 = RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, KEY_WOW64_64KEY, 0); /* do not overwrite old failure code with new success code */ if(FAILED(hr2)) hr = hr2; @@ -481,7 +481,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) /* first, check is game installed for all users */ hr = GAMEUX_buildGameRegistryPath(GIS_ALL_USERS, pInstanceID, &lpRegistryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, 0)); + hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, KEY_WOW64_64KEY, 0)); HeapFree(GetProcessHeap(), 0, lpRegistryPath); @@ -490,7 +490,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) { hr = GAMEUX_buildGameRegistryPath(GIS_CURRENT_USER, pInstanceID, &lpRegistryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, 0)); + hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, KEY_WOW64_64KEY, 0)); HeapFree(GetProcessHeap(), 0, lpRegistryPath); }

1 0

Albert Pool : winecfg: Update Dutch translation.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 018930a01e0b6bcf2625d8ced63da525dff74686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018930a01e0b6bcf2625d8ced… Author: Albert Pool <albertpool(a)solcon.nl> Date: Wed Dec 15 11:37:48 2010 +0100 winecfg: Update Dutch translation. --- programs/winecfg/Nl.rc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 495e567..e1021a7 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -6,6 +6,7 @@ * Copyright 2005-2006 Paul Vriens * Copyright 2007 Maarten Lankhorst * Copyright 2009 Vincent Beers + * Copyright 2010 Albert Pool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,7 +45,7 @@ BEGIN LTEXT PACKAGE_NAME,IDC_ABT_TITLE_TEXT,105,30,55,30 LTEXT PACKAGE_VERSION,IDC_ABT_PANEL_TEXT,160,43,140,8 CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 - LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "Dit programma is gratis software; u kunt het verspreiden en/of aanpassen binnen de voorwaarden van de GNU Lesser General Public License zoals gepubliceerd door de Free Software Foundation; versie 2.1 van de licentie, of (naar keuze) een latere versie.", IDC_ABT_LICENSE_TEXT,105,64,145,60 GROUPBOX " Windows registratie-informatie ", IDC_STATIC, 15, 155, 230, 55 LTEXT "Eigenaar:", IDC_STATIC, 22, 171, 40, 20 @@ -58,13 +59,13 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Toepassingsinstellingen ",IDC_STATIC, 8,4,244,210 - LTEXT "Wine geeft de mogelijkheid om per toepassing de Windowsversie in te stellen. Deze tab is gekoppeld aan de Libraries en Graphics tabs om zowel systeemwijde als applicatiespecifieke instellingen in deze tabs mogelijk te maken.", + LTEXT "Wine geeft de mogelijkheid om per toepassing de Windowsversie in te stellen. Deze tab is gekoppeld aan de \"Bibliotheken\" en \"Grafisch\" tabs om zowel systeemwijde als applicatiespecifieke instellingen in deze tabs mogelijk te maken.", IDC_STATIC,15,20,227,40 CONTROL "Toepassingen",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,60,230,110 PUSHBUTTON "Toepassing toevoegen..",IDC_APP_ADDAPP, 80,174,80,14 PUSHBUTTON "Toepassing verwijderen",IDC_APP_REMOVEAPP, 165,174,80,14 - LTEXT "Windows Versie:",IDC_STATIC,17,196,58,8 + LTEXT "Windowsversie:",IDC_STATIC,17,196,58,8 COMBOBOX IDC_WINVER,83,194,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -76,9 +77,9 @@ BEGIN CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Laat de window manager de vensters &decoreren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Emuleer een virtueel bureaublad",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED + LTEXT "Afmetingen:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -100,7 +101,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " DLL Overrides ",IDC_STATIC,8,4,244,210 - LTEXT "Het is mogelijk om per uitvoerbaar bestand te specificeren of deze \"builtin\" dan wel \"native\" moet zijn. De specificatie voor ""*"" geldt voor alle niet expliciet genoemde bestanden." + LTEXT "Het is mogelijk om per uitvoerbaar bestand in te stellen of deze \"builtin\" dan wel \"native\" moet zijn. De instelling voor ""*"" geldt voor alle niet expliciet genoemde bestanden." ,IDC_STATIC,16,16,220,32 LTEXT "Nieuwe override voor dll:",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE @@ -232,7 +233,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configuratie voor %s" IDS_THEMEFILE "Thema-bestanden (*.msstyles; *.theme)" IDS_THEMEFILE_SELECT "Thema-bestanden kiezen" - IDS_AUDIO_MISSING "Op dit moment is er geen stuurprogramma voor geluid gespecificeerd in het register.\n\nEen aanbevolen stuurprogramma is voor u geselecteerd.\nU kunt dit stuurprogramma gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op Toepassen om deze selectie te activeren." + IDS_AUDIO_MISSING "Op dit moment is er geen stuurprogramma voor geluid ingesteld in het register.\n\nEen aanbevolen stuurprogramma is voor u geselecteerd.\nU kunt dit stuurprogramma gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op Toepassen om deze selectie te activeren." IDS_SHELL_FOLDER "Persoonlijke map" IDS_LINKS_TO "Verwijst naar" END

1 0

Greg Geldorp : kernel32/tests: Add tests to verify USERPROFILE and environment variables from registry are present and correct .
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 0650cb2456c1fc75cadf299a54eff321b59fe1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0650cb2456c1fc75cadf299a5… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Dec 19 17:47:42 2010 +0100 kernel32/tests: Add tests to verify USERPROFILE and environment variables from registry are present and correct. --- dlls/kernel32/tests/environ.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index c38aef7..b6a900e 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "winreg.h" static CHAR string[MAX_PATH]; #define ok_w(res, format, szString) \ @@ -34,13 +35,120 @@ static CHAR string[MAX_PATH]; static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE,DWORD,PHANDLE); +static BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD); static void init_functionpointers(void) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE huserenv = LoadLibraryA("userenv.dll"); pGetComputerNameExA = (void *)GetProcAddress(hkernel32, "GetComputerNameExA"); pGetComputerNameExW = (void *)GetProcAddress(hkernel32, "GetComputerNameExW"); + pOpenProcessToken = (void *)GetProcAddress(hadvapi32, "OpenProcessToken"); + pGetUserProfileDirectoryA = (void *)GetProcAddress(huserenv, + "GetUserProfileDirectoryA"); +} + +static void test_Predefined(void) +{ + /* + * If anything fails here, your test environment is probably not set up + * correctly. + */ + HKEY UserEnvironment; + LSTATUS Err; + DWORD Index; + char ValueName[256]; + DWORD ValueNameSize; + DWORD Type; + char Data[1024]; + DWORD DataSize; + char Env[sizeof(Data)]; + DWORD EnvSize; + HANDLE Token; + BOOL NoErr; + + /* + * Enumerate all values in HKCU\Environment and verify that environment + * variables with those names/values are present. + */ + Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE, + &UserEnvironment); + ok(Err == ERROR_SUCCESS || Err == ERROR_FILE_NOT_FOUND, + "Failed to open HKCU\\Environment key, error %d\n", + Err); + + if (Err == ERROR_SUCCESS) + { + Index = 0; + do + { + ValueNameSize = sizeof(ValueName); + DataSize = sizeof(Data); + Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize, + NULL, &Type, (LPBYTE) Data, &DataSize); + if (Err == ERROR_SUCCESS) + { + if (Type == REG_EXPAND_SZ) + { + char Expanded[sizeof(Data)]; + DWORD ExpandedSize; + ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded, + sizeof(Expanded)); + ok(ExpandedSize != 0 && ExpandedSize <= sizeof(Expanded), + "Failed to expand %s, error %u\n", Data, GetLastError()); + memcpy(Data, Expanded, ExpandedSize); + Type = REG_SZ; + } + ok(Type == REG_SZ, "Expected data type REG_SZ, got %d\n", Type); + EnvSize = GetEnvironmentVariableA(ValueName, Env, sizeof(Env)); + ok(EnvSize != 0 && EnvSize <= sizeof(Env), + "Failed to retrieve environment variable %s, error %u\n", + ValueName, GetLastError()); + ok(strcmp(Data, Env) == 0, + "Expected value %s for env var %s, got %s\n", Data, ValueName, + Env); + } + Index++; + } + while (Err == ERROR_SUCCESS); + ok(Err == ERROR_NO_MORE_ITEMS, + "Unexpected return %d from RegEnumValueA\n", Err); + + Err = RegCloseKey(UserEnvironment); + ok(Err == ERROR_SUCCESS, "Failed to close reg key, error %d\n", Err); + } + + /* + * Check value of %USERPROFILE%, should be same as GetUserProfileDirectory() + */ + if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL) + { + skip("Skipping USERPROFILE check\n"); + return; + } + NoErr = pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); + ok(NoErr, "Failed to open token, error %u\n", GetLastError()); + DataSize = sizeof(Data); + NoErr = pGetUserProfileDirectoryA(Token, Data, &DataSize); + todo_wine ok(NoErr, "Failed to get user profile dir, error %u\n", + GetLastError()); + if (NoErr) + { + EnvSize = GetEnvironmentVariableA("USERPROFILE", Env, sizeof(Env)); + ok(EnvSize != 0 && EnvSize <= sizeof(Env), + "Failed to retrieve environment variable USERPROFILE, error %u\n", + GetLastError()); + ok(strcmp(Data, Env) == 0, + "USERPROFILE env var %s doesn't match GetUserProfileDirectory %s\n", + Env, Data); + } + else + skip("Skipping USERPROFILE check, can't get user profile dir\n"); + NoErr = CloseHandle(Token); + ok(NoErr, "Failed to close token, error %u\n", GetLastError()); } static void test_GetSetEnvironmentVariableA(void) @@ -512,6 +620,7 @@ START_TEST(environ) { init_functionpointers(); + test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); test_ExpandEnvironmentStringsA();

1 0

David Hedberg : shell32: Fix ExplorerBrowser:: SetRect to work properly when passed a NULL-valued hdwp.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: f6dad197304b2771d56470a6e3d39063c487a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dad197304b2771d56470a6e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 22:07:12 2010 +0100 shell32: Fix ExplorerBrowser::SetRect to work properly when passed a NULL-valued hdwp. --- dlls/shell32/ebrowser.c | 4 +++- dlls/shell32/tests/ebrowser.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 87ff578..e6d1165 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -908,11 +908,13 @@ static HRESULT WINAPI IExplorerBrowser_fnSetRect(IExplorerBrowser *iface, ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; TRACE("%p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); - if(phdwp) + if(phdwp && *phdwp) { *phdwp = DeferWindowPos(*phdwp, This->hwnd_main, NULL, rcBrowser.left, rcBrowser.top, rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, SWP_NOZORDER | SWP_NOACTIVATE); + if(!*phdwp) + return E_FAIL; } else { diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index faaf6c7..99368d0 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1076,6 +1076,7 @@ static void test_basics(void) HWND eb_hwnd; RECT eb_rc; static const RECT exp_rc = {11, 21, 49, 49}; + static const RECT exp_rc2 = {11, 21, 49, 24}; hr = IShellBrowser_GetWindow(psb, &eb_hwnd); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -1085,6 +1086,24 @@ static void test_basics(void) ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + /* Try resizing with invalid hdwp */ + rc.bottom = 25; + hdwp = (HDWP)0xdeadbeef; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + + hdwp = NULL; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc2), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + IShellBrowser_Release(psb); }

1 0