August 2007 - Wine-Commits - list.winehq.org

Kirill K. Smirnov : programs/cmd: Do not use hardcoded constants when corresponding macro is already defined .
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 42c26ded0421b2155078e470d45d341f42f416c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c26ded0421b2155078e470d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Aug 16 16:16:10 2007 +0400 programs/cmd: Do not use hardcoded constants when corresponding macro is already defined. --- programs/cmd/Cs.rc | 2 +- programs/cmd/De.rc | 2 +- programs/cmd/En.rc | 2 +- programs/cmd/Es.rc | 2 +- programs/cmd/Fr.rc | 2 +- programs/cmd/Ja.rc | 2 +- programs/cmd/Ko.rc | 2 +- programs/cmd/Nl.rc | 2 +- programs/cmd/No.rc | 2 +- programs/cmd/Pl.rc | 2 +- programs/cmd/Pt.rc | 4 ++-- programs/cmd/Ru.rc | 2 +- programs/cmd/Si.rc | 2 +- programs/cmd/Tr.rc | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc index 4db0e0d..4afa21e 100644 --- a/programs/cmd/Cs.rc +++ b/programs/cmd/Cs.rc @@ -206,7 +206,7 @@ P��znak verify nem� ve Wine ��dnou funkci.\n" opera�n�mu syst�mu nebo p��kazov�mu interpretu,\n\ ze kter�ho byl cmd spu�t�n.\n" - 1000, "Vestav�n� p��kazy CMD jsou:\n\ + WCMD_ALLHELP, "Vestav�n� p��kazy CMD jsou:\n\ ATTRIB\t\tZobraz� nebo nastav� DOS-ovsk� souborov� attributy\n\ CALL\t\tZavol� d�vkov� soubor z jin�ho\n\ CD (CHDIR)\tZm�n� pracovn� adres��\n\ diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 19b590d..ef72531 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -229,7 +229,7 @@ mit PUSHD gespeicherten.\n" Betriebssystem oder der Shell zur�ck, von der CMD gestart wurde.\n" - 1000, "CMD eingebauten Befehle sind:\n\ + WCMD_ALLHELP, "CMD eingebauten Befehle sind:\n\ ATTRIB\t\tZeigt an oder �ndert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in das Verzeichnis\n\ diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 72d0dd9..602b2b5 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -208,7 +208,7 @@ PUSHD.\n" "EXIT terminates the current command session and returns\n\ to the operating system or shell from which you invoked cmd.\n" - 1000, "CMD built-in commands are:\n\ + WCMD_ALLHELP, "CMD built-in commands are:\n\ ATTRIB\t\tShow or change DOS file attributes\n\ CALL\t\tInvoke a batch file from inside another\n\ CD (CHDIR)\tChange current default directory\n\ diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc index c6842b7..b7891d3 100644 --- a/programs/cmd/Es.rc +++ b/programs/cmd/Es.rc @@ -225,7 +225,7 @@ PUSHD.\n" "EXIT termina la sesi�n de comandos actual y regresa al sistema\n\ operativo o int�rprete de comandos desde el que invoc� cmd.\n" - 1000, "Los comandos internos de CMD son:\n\ + WCMD_ALLHELP, "Los comandos internos de CMD son:\n\ ATTRIB\t\tMostrar o cambiar los atributos de archivo de DOS\n\ CALL\t\tInvocar un archivo por lotes desde dentro de otro\n\ CD (CHDIR)\tCambiar el directorio por defecto actual\n\ diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index e783186..fc12bdd 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -200,7 +200,7 @@ Le flag de verification n'a pas de fonction dans Wine.\n" "EXIT termine la session de ligne de commande et retourne\n\ au syst�me d'exploitation ou au shell o� vous avez invoqu� cmd.\n" - 1000, "Les commandes internes CMD sont:\n\ + WCMD_ALLHELP, "Les commandes internes CMD sont:\n\ ATTRIB\t\tAffiche ou change les attributs de fichiers DOS\n\ CALL\t\tInvoque un fichier batch � l'int�rieur d'un autre\n\ CD (CHDIR)\tChange le r�pertoire courant par d�faut\n\ diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index 1576841..1acc8e9 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -204,7 +204,7 @@ Wine��ł�verify�t��O�͈Ӗ��܂��B\n" WCMD_EXIT, "EXIT �͌��݂̃R�}��h�Z�b�V��I��cmd��Ăяo��OS�܂��̓V�F��ɖ߂��܂��B\n" - 1000, "CMD ��̃R�}��h:\n\ + WCMD_ALLHELP, "CMD ��̃R�}��h:\n\ ATTRIB\t\tDOS�t�@�C��̑��\��͕ύX\n\ CALL\t\t�O��̃o�b�`�t�@�C��Ăяo��\n\ CD (CHDIR)\t�J��g�f�B��N�g��ύX\n\ diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index cc584a3..dcc27a8 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -200,7 +200,7 @@ verify �÷��״� Wine��  �ϵ� ��մϴ�.\n" "EXIT�� ߴܽ�Ű�� ü�� ư��ų� cmd��\n\ ȣ�� ư��ϴ�.\n" - 1000, "CMD �� ɵ�:\n\ + WCMD_ALLHELP, "CMD �� ɵ�:\n\ ATTRIB\t\t�� ְų� �ٲٱ�\n\ CALL\t\tI��ġ �� ȿ�� ٸ� �� ҷ��\n\ CD (CHDIR)\t�� ⺻ ��丮 �ٲٱ�\n\ diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 9704d4d..1aae36c 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -203,7 +203,7 @@ De verify-schakelaar heeft geen functie binnen Wine.\n" "EXIT be�indigt de lopende sessie en keert terug\n\ naar het besturingssysteem of de schil van waaruit cmd werd gestart.\n" - 1000, "CMD's ingebouwde opdrachten zijn:\n\ + WCMD_ALLHELP, "CMD's ingebouwde opdrachten zijn:\n\ ATTRIB\t\tToon of wijzig DOS bestandsattributen\n\ CALL\t\tRoep een batchbestand aan vanuit een ander bestand\n\ CD (CHDIR)\tWijzig de huidige directory\n\ diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 5997130..8512650 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -206,7 +206,7 @@ arbeidskatalog til den som er oppgitt.\n" "EXIT avslutter gjeldende kommando�kt og returnerer til operativsystemet\n\ eller skallet CMD ble startet fra.\n" - 1000, "Innebygde kommandoer i CMD:\n\ + WCMD_ALLHELP, "Innebygde kommandoer i CMD:\n\ ATTRIB\t\tViser eller endrer DOS-filattributter\n\ CALL\t\tKall en satsvis fil inne i en annen\n\ CD (CHDIR)\tBytter arbeidskatalog\n\ diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 01ac02a..2e553e5 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -203,7 +203,7 @@ Ustawienia flagi nic nie zmieniaj� pod Wine'em.\n" "EXIT ko�czy bierz�c� sesj� cmd i powraca do systemu operacyjnego\n\ lub pow�oki, w kt�rej uruchomiono cmd.\n" - 1000, "CMD - wbudowane komendy:\n\ + WCMD_ALLHELP, "CMD - wbudowane komendy:\n\ ATTRIB\t\tPokazuje lub zmienia atrybuty pliku\n\ CALL\t\tWywo�uje plik bat z innego pliku\n\ CD (CHDIR)\tZmienia bierz�cy katalog\n\ diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index 3dcc089..baf5be1 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -202,7 +202,7 @@ O flag de verifica��o n�o tem fun��o no Wine.\n" "EXIT termina a sess�o de comando atual e retorna ao sistema operacional\n\ ou shell que tenha invocado o cmd.\n" - 1000, "CMD - os comando internos s�o:\n\ + WCMD_ALLHELP, "CMD - os comando internos s�o:\n\ ATTRIB\t\tMostra ou troca atributos de arquivo DOS\n\ CALL\t\tInvoca um arquivo de lote dentro de outro\n\ CD (CHDIR)\tMuda o diret�rio padr�o atual\n\ @@ -413,7 +413,7 @@ O flag de verifica��o n�o tem fun��o no Wine.\n" "EXIT termina a sess�o de comando actual e retorna ao sistema operacional\n\ ou shell que tenha invocado o cmd.\n" - 1000, "CMD - os comando internos s�o:\n\ + WCMD_ALLHELP, "CMD - os comando internos s�o:\n\ ATTRIB\t\tMostra ou troca atributos do ficheiro DOS\n\ CALL\t\tInvoca um ficheiro de lote dentro de outro\n\ CD (CHDIR)\tMuda o direct�rio padr�o actual\n\ diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 8e0cb82..7e08480 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -214,7 +214,7 @@ PUSHD.\n" "EXIT �� \n\ � �� cmd.\n" - 1000, "�� CMD:\n\ + WCMD_ALLHELP, "�� CMD:\n\ ATTRIB\t\t�� DOS-�� \n\ CALL\t\t�� bat-�� bat-��\n\ CD (CHDIR)\t�� \n\ diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc index a7b37df..0b3bb4f 100644 --- a/programs/cmd/Si.rc +++ b/programs/cmd/Si.rc @@ -202,7 +202,7 @@ The verify flag has no function in Wine.\n" "EXIT terminates the current command session and returns\n\ to the operating system or shell from which you invoked cmd.\n" - 1000, "CMD built-in commands are:\n\ + WCMD_ALLHELP, "CMD built-in commands are:\n\ ATTRIB\t\tShow or change DOS file attributes\n\ CALL\t\tInvoke a batch file from inside another\n\ CD (CHDIR)\tChange current default directory\n\ diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc index f70ad05..432c200 100644 --- a/programs/cmd/Tr.rc +++ b/programs/cmd/Tr.rc @@ -204,7 +204,7 @@ Do�rulama bayra��n�n Wine'da bir i�levi yoktur.\n" "EXIT ge�erli komut oturumunu sonland�r�r ve cmd'yi �a��rd��n�z\n\ yerden i�letim sistemine d�ner.\n" - 1000, "CMD dahili komutlar�:\n\ + WCMD_ALLHELP, "CMD dahili komutlar�:\n\ ATTRIB\t\tDOS dosya �zelliklerini g�ster veya de�i�tir\n\ CALL\t\tToplu i�lem dosyas� i�erisinden bir di�erini �al��t�r\n\ CD (CHDIR)\tGe�erli dizini de�i�tir\n\

1 0

Maarten Lankhorst : dxguid: Remove dsdriver.h from imports.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 33e1b6ffef2089c7903e811393617be92ecf627e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e1b6ffef2089c7903e81139… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Aug 16 18:39:29 2007 +0200 dxguid: Remove dsdriver.h from imports. --- dlls/dsound/dsound_main.c | 3 ++- dlls/dxguid/dxguid.c | 1 - dlls/wineoss.drv/audio.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 2feb935..5f29ad4 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -47,9 +47,10 @@ #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" +#include "dsconf.h" +#include "initguid.h" #include "dsdriver.h" #include "dsound_private.h" -#include "dsconf.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound); diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index c222c7c..ce2cce3 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -36,7 +36,6 @@ #include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "dsdriver.h" #include "dmusici.h" #include "dmusics.h" #include "dplay.h" diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 5c233da..4deee4b 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -65,10 +65,11 @@ #include "mmddk.h" #include "mmreg.h" #include "dsound.h" -#include "dsdriver.h" #include "ks.h" #include "ksguid.h" #include "ksmedia.h" +#include "initguid.h" +#include "dsdriver.h" #include "oss.h" #include "wine/debug.h"

1 0

Paul Vriens : avifil32/regsvr: Replace recursive delete functions by RegDeleteTree.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: daccba5de015d73c53dbb25f97be64518da3c1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daccba5de015d73c53dbb25f9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 16 15:30:33 2007 +0200 avifil32/regsvr: Replace recursive delete functions by RegDeleteTree. --- dlls/avifil32/regsvr.c | 79 +++++------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c index c98de1b..6ec4085 100644 --- a/dlls/avifil32/regsvr.c +++ b/dlls/avifil32/regsvr.c @@ -116,9 +116,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -207,7 +204,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -314,16 +312,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -436,70 +437,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_AVIProxy = {

1 0

Paul Vriens : advapi32/tests: Skip a test when not properly logged in on win9x.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 95af1823ca3c8a7cedf2f364600f8fee4aae7fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=95af1823ca3c8a7cedf2f3646… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 16 14:07:36 2007 +0200 advapi32/tests: Skip a test when not properly logged in on win9x. --- dlls/advapi32/tests/security.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a49662c..25df835 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1302,8 +1302,15 @@ static void test_LookupAccountName(void) */ user_size = UNLEN + 1; + SetLastError(0xdeadbeef); ret = GetUserNameA(user_name, &user_size); - ok(ret, "Failed to get user name\n"); + if (!ret && (GetLastError() == ERROR_NOT_LOGGED_ON)) + { + /* Probably on win9x where the user used 'Cancel' instead of properly logging in */ + skip("Cannot get the user name (win9x and not logged in properly)\n"); + return; + } + ok(ret, "Failed to get user name : %d\n", GetLastError()); /* get sizes */ sid_size = 0;

1 0

Paul Vriens : wininet/tests: Fix test failures for wininet. dll that comes with IE7.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 36e416b6143449de284da83cb6adcd24caf4f8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e416b6143449de284da83cb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 16 13:15:29 2007 +0200 wininet/tests: Fix test failures for wininet.dll that comes with IE7. --- dlls/wininet/tests/url.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 6da48be..729be53 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -98,8 +98,8 @@ static void InternetCrackUrl_test(void) URL_COMPONENTSA urlSrc, urlComponents; char protocol[32], hostName[1024], userName[1024]; char password[1024], extra[1024], path[1024]; - BOOL ret; - DWORD GLE; + BOOL ret, firstret; + DWORD GLE, firstGLE; ZeroMemory(&urlSrc, sizeof(urlSrc)); urlSrc.dwStructSize = sizeof(urlSrc); @@ -155,30 +155,42 @@ static void InternetCrackUrl_test(void) copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE %d\n",GetLastError()); - /* Tests for lpsz* members pointing to real strings while - * some corresponding length members are set to zero */ + * some corresponding length members are set to zero. + * As of IE7 (wininet 7.0*?) all members are checked. So we + * run the first test and expect the outcome to be the same + * for the first four (scheme, hostname, username and password). + * The last two (path and extrainfo) are the same for all versions + * of the wininet.dll. + */ copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); - ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); - ok(ret==1, "InternetCrackUrl returned %d with GLE=%d (expected to return 1)\n", - ret, GetLastError()); + SetLastError(0xdeadbeef); + firstret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); + firstGLE = GetLastError(); copy_compsA(&urlSrc, &urlComponents, 32, 0, 1024, 1024, 2048, 1024); + SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); - ok(ret==1, "InternetCrackUrl returned %d with GLE=%d (expected to return 1)\n", - ret, GetLastError()); + GLE = GetLastError(); + ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", + ret, GetLastError(), firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 2048, 1024); + SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); - ok(ret==1, "InternetCrackUrl returned %d with GLE=%d (expected to return 1)\n", - ret, GetLastError()); + GLE = GetLastError(); + ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", + ret, GetLastError(), firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 2048, 1024); + SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); - ok(ret==1, "InternetCrackUrl returned %d with GLE=%d (expected to return 1)\n", - ret, GetLastError()); + GLE = GetLastError(); + ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", + ret, GetLastError(), firstret); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 0, 1024); + SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); todo_wine @@ -187,6 +199,7 @@ static void InternetCrackUrl_test(void) ret, GLE); copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 0); + SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); todo_wine

1 0

Alexandre Julliard : winex11: Don' t try to activate the desktop window on take focus.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: eaad370987fd0f95b17606e4ff33d0751cf52284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad370987fd0f95b17606e4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 23:43:58 2007 +0200 winex11: Don't try to activate the desktop window on take focus. --- dlls/winex11.drv/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1f9d2a9..f3010de 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -349,6 +349,7 @@ static inline BOOL can_activate_window( HWND hwnd ) LONG style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + if (hwnd == GetDesktopWindow()) return FALSE; return !(style & WS_DISABLED); }

1 0

Alexandre Julliard : winex11: Store wm hints in the window data instead of fetching them when needed.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: bde89576b385ef10ceeba16992f9895c4b5225da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde89576b385ef10ceeba1699… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 23:27:37 2007 +0200 winex11: Store wm hints in the window data instead of fetching them when needed. --- dlls/winex11.drv/window.c | 54 +++++++++++++++++++------------------------- dlls/winex11.drv/winpos.c | 14 ++--------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 27 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c571684..459b8f9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -248,9 +248,10 @@ static void destroy_icon_window( Display *display, struct x11drv_win_data *data * * Set the icon wm hints */ -static void set_icon_hints( Display *display, struct x11drv_win_data *data, - XWMHints *hints, HICON hIcon ) +static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICON hIcon ) { + XWMHints *hints = data->wm_hints; + if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); data->hWMIconBitmap = 0; @@ -468,7 +469,6 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) { Window group_leader; XClassHint *class_hints; - XWMHints* wm_hints; Atom protocols[3]; Atom window_type; MwmHints mwm_hints; @@ -566,24 +566,19 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); - wm_hints = XAllocWMHints(); wine_tsx11_unlock(); /* wm hints */ - if (wm_hints) + if (data->wm_hints) { - wm_hints->flags = InputHint | StateHint | WindowGroupHint; - wm_hints->input = !(style & WS_DISABLED); - - set_icon_hints( display, data, wm_hints, - (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); - - wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; - wm_hints->window_group = group_leader; + data->wm_hints->flags = InputHint | StateHint | WindowGroupHint; + data->wm_hints->input = !(style & WS_DISABLED); + data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; + data->wm_hints->window_group = group_leader; + set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); wine_tsx11_lock(); - XSetWMHints( display, data->whole_window, wm_hints ); - XFree(wm_hints); + XSetWMHints( display, data->whole_window, data->wm_hints ); wine_tsx11_unlock(); } } @@ -599,7 +594,6 @@ void X11DRV_set_iconic_state( HWND hwnd ) Display *display = thread_display(); struct x11drv_win_data *data; RECT rect; - XWMHints* wm_hints; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL iconic = (style & WS_MINIMIZE) != 0; @@ -610,12 +604,14 @@ void X11DRV_set_iconic_state( HWND hwnd ) wine_tsx11_lock(); - if (!(wm_hints = XGetWMHints( display, data->whole_window ))) wm_hints = XAllocWMHints(); - wm_hints->flags |= StateHint | IconPositionHint; - wm_hints->initial_state = iconic ? IconicState : NormalState; - wm_hints->icon_x = rect.left - virtual_screen_rect.left; - wm_hints->icon_y = rect.top - virtual_screen_rect.top; - XSetWMHints( display, data->whole_window, wm_hints ); + if (data->wm_hints) + { + data->wm_hints->flags |= StateHint | IconPositionHint; + data->wm_hints->initial_state = iconic ? IconicState : NormalState; + data->wm_hints->icon_x = rect.left - virtual_screen_rect.left; + data->wm_hints->icon_y = rect.top - virtual_screen_rect.top; + XSetWMHints( display, data->whole_window, data->wm_hints ); + } if (style & WS_VISIBLE) { @@ -626,7 +622,6 @@ void X11DRV_set_iconic_state( HWND hwnd ) XMapWindow( display, data->whole_window ); } - XFree(wm_hints); wine_tsx11_unlock(); } @@ -913,6 +908,7 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); XDeleteContext( display, (XID)hwnd, win_data_context ); + XFree( data->wm_hints ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); } @@ -938,6 +934,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if (!winContext) winContext = XUniqueContext(); if (!win_data_context) win_data_context = XUniqueContext(); XSaveContext( display, (XID)hwnd, win_data_context, (char *)data ); + data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); } return data; @@ -1325,7 +1322,6 @@ void X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { Display *display = thread_display(); struct x11drv_win_data *data; - XWMHints* wm_hints; if (type != ICON_BIG) return; /* nothing to do here */ @@ -1333,15 +1329,11 @@ void X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) if (!data->whole_window) return; if (!data->managed) return; - wine_tsx11_lock(); - if (!(wm_hints = XGetWMHints( display, data->whole_window ))) wm_hints = XAllocWMHints(); - wine_tsx11_unlock(); - if (wm_hints) + if (data->wm_hints) { - set_icon_hints( display, data, wm_hints, icon ); + set_icon_hints( display, data, icon ); wine_tsx11_lock(); - XSetWMHints( display, data->whole_window, wm_hints ); - XFree( wm_hints ); + XSetWMHints( display, data->whole_window, data->wm_hints ); wine_tsx11_unlock(); } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 5e0e604..baee122 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -160,19 +160,11 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) if (changed & WS_DISABLED) { - if (data->whole_window && data->managed) + if (data->whole_window && data->wm_hints) { - XWMHints *wm_hints; wine_tsx11_lock(); - if (!(wm_hints = XGetWMHints( display, data->whole_window ))) - wm_hints = XAllocWMHints(); - if (wm_hints) - { - wm_hints->flags |= InputHint; - wm_hints->input = !(new_style & WS_DISABLED); - XSetWMHints( display, data->whole_window, wm_hints ); - XFree(wm_hints); - } + data->wm_hints->input = !(new_style & WS_DISABLED); + XSetWMHints( display, data->whole_window, data->wm_hints ); wine_tsx11_unlock(); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a778f64..1fca990 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -646,6 +646,7 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to whole window */ XIC xic; /* X input context */ + XWMHints *wm_hints; /* window manager hints */ BOOL managed; /* is window managed? */ struct dce *dce; /* DCE for CS_OWNDC or CS_CLASSDC windows */ unsigned int lock_changes; /* lock count for X11 change requests */

1 0

Paul Vriens : shell32/tests: Use GetModuleHandle instead of LoadLibrary.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 968d30514801f3a49c3807ce4a96d2b26da8b581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968d30514801f3a49c3807ce4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 16 13:12:27 2007 +0200 shell32/tests: Use GetModuleHandle instead of LoadLibrary. --- dlls/shell32/tests/shelllink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index bdf537e..091522b 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -64,7 +64,7 @@ static LPITEMIDLIST path_to_pidl(const char* path) if (!pSHSimpleIDListFromPathAW) { - HMODULE hdll=LoadLibraryA("shell32.dll"); + HMODULE hdll=GetModuleHandleA("shell32.dll"); pSHSimpleIDListFromPathAW=(void*)GetProcAddress(hdll, (char*)162); if (!pSHSimpleIDListFromPathAW) trace("SHSimpleIDListFromPathAW not found in shell32.dll\n");

1 0

tools/winetest gather
by Jeremy Newman Aug. 16, 2007

Aug. 16, 2007

ChangeSet ID: 31329 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/16 17:02:07 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Leave out empty groups on results page Patch: http://cvs.winehq.org/patch.py?id=31329 Old revision New revision Changes Path 1.26 1.27 +1 -3 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.26 tools/winetest/gather:1.27 --- tools/winetest/gather:1.26 16 Aug 2007 22: 2: 7 -0000 +++ tools/winetest/gather 16 Aug 2007 22: 2: 7 -0000 @@ -173,8 +173,6 @@ foreach (@groups) { <a href=\"$test->{dir}/report\">[file]</a></small></th> EOF } - } else { - $header .= " <th>$_->{name}</th>\n"; } } chop $header; @@ -290,7 +288,7 @@ foreach my $testname (sort keys %alltest EOF foreach my $group (@groups) { if (!exists $group->{tests}) { - print OUT " <td class=\"note\">.</td>\n"; + # Do nothing } elsif (@{$group->{tests}} == 1) { singletest ($group->{tests}->[0], $testname, $group->{name}); } else {

1 0

Detlef Riekenberg : winspool: Implement AddPrinterDriverExA.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 4ff59a8320f920c693cba8a2fa00ed5af2334bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff59a8320f920c693cba8a2f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 16 05:18:08 2007 +0200 winspool: Implement AddPrinterDriverExA. --- dlls/winspool.drv/info.c | 126 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6f09e7f..56203da 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6635,15 +6635,127 @@ BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, } /****************************************************************************** - * AddPrinterDriverExA (WINSPOOL.@) + * AddPrinterDriverExA (WINSPOOL.@) + * + * See AddPrinterDriverExW. + * */ -BOOL WINAPI AddPrinterDriverExA( LPSTR pName, DWORD Level, - LPBYTE pDriverInfo, DWORD dwFileCopyFlags) +BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags) { - FIXME("%s %d %p %d\n", debugstr_a(pName), - Level, pDriverInfo, dwFileCopyFlags); - SetLastError(ERROR_PRINTER_DRIVER_BLOCKED); - return FALSE; + DRIVER_INFO_8A *diA; + DRIVER_INFO_8W diW; + LPWSTR nameW = NULL; + DWORD lenA; + DWORD len; + DWORD res = FALSE; + + FIXME("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags); + diA = (DRIVER_INFO_8A *) pDriverInfo; + ZeroMemory(&diW, sizeof(diW)); + + if (Level < 2 || Level == 5 || Level == 7 || Level > 8) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (diA == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* convert servername to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + /* common fields */ + diW.cVersion = diA->cVersion; + + len = MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, NULL, 0); + diW.pName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, diW.pName, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, NULL, 0); + diW.pEnvironment = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, diW.pEnvironment, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, NULL, 0); + diW.pDriverPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, diW.pDriverPath, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, NULL, 0); + diW.pDataFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, diW.pDataFile, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, NULL, 0); + diW.pConfigFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); + + if (Level > 2) { + lenA = multi_sz_lenA(diA->pDependentFiles); + len = MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, NULL, 0); + diW.pDependentFiles = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, diW.pDependentFiles, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, NULL, 0); + diW.pMonitorName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, diW.pMonitorName, len); + } + + if (Level > 3) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, NULL, 0); + diW.pDefaultDataType = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, diW.pDefaultDataType, len); + + lenA = multi_sz_lenA(diA->pszzPreviousNames); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, NULL, 0); + diW.pszzPreviousNames = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, diW.pszzPreviousNames, len); + } + + if (Level > 5) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, NULL, 0); + diW.pszMfgName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, diW.pszMfgName, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, NULL, 0); + diW.pszOEMUrl = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, diW.pszOEMUrl, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, NULL, 0); + diW.pszHardwareID = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, diW.pszHardwareID, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, NULL, 0); + diW.pszProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, diW.pszProvider, len); + } + + if (Level > 7) { + FIXME("level %u is incomplete\n", Level); + } + + res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags); + TRACE("got %u with %u\n", res, GetLastError()); + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, diW.pName); + HeapFree(GetProcessHeap(), 0, diW.pEnvironment); + HeapFree(GetProcessHeap(), 0, diW.pDriverPath); + HeapFree(GetProcessHeap(), 0, diW.pDataFile); + HeapFree(GetProcessHeap(), 0, diW.pConfigFile); + HeapFree(GetProcessHeap(), 0, diW.pDependentFiles); + HeapFree(GetProcessHeap(), 0, diW.pMonitorName); + HeapFree(GetProcessHeap(), 0, diW.pDefaultDataType); + HeapFree(GetProcessHeap(), 0, diW.pszzPreviousNames); + HeapFree(GetProcessHeap(), 0, diW.pszMfgName); + HeapFree(GetProcessHeap(), 0, diW.pszOEMUrl); + HeapFree(GetProcessHeap(), 0, diW.pszHardwareID); + HeapFree(GetProcessHeap(), 0, diW.pszProvider); + + TRACE("=> %u with %u\n", res, GetLastError()); + return res; } /******************************************************************************

1 0