wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Łukasz Wojniłowicz : cmd: Update Polish translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 5792a1595fef54a351cf6645a7aba99815af983b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5792a1595fef54a351cf6645a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Dec 21 20:07:00 2010 +0100 cmd: Update Polish translation. --- programs/cmd/Pl.rc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 1271c57..7e4e30d 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -202,6 +202,10 @@ Ustawienia flagi nic nie zmieniaj WCMD_MORE, "MORE wy�wietla strona po stronie wyj�cie pliku lub potoku.\n" + WCMD_CHOICE, "CHOICE wy�wietla tekst i czeka, a� U�ytkownik\n\ +naci�nie dozwolony Przycisk z zaznaczalnej listy.\n\ +CHOICE jest u�ywany g��wnie do budowania menu wyboru w plikach typu bat.\n" + WCMD_EXIT, "EXIT ko�czy bie��c� sesj� cmd i powraca do systemu operacyjnego\n\ lub pow�oki, w kt�rej uruchomiono cmd.\n" @@ -243,7 +247,7 @@ Wpisz HELP <komenda> dla dok WCMD_NOFTYPE, "Brak skojarzenia polecenia otw�rz z typem plik�w '%s'\n" WCMD_OVERWRITE, "Nadpisa� %s" WCMD_MORESTR, "Wi�cej..." - WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n" + WCMD_TRUNCATEDLINE, "Linia przy przetwarzaniu pliku bat prawdopodobnie obci�ta. U�ywam:\n" WCMD_NYI, "Jeszcze niezaimplementowane\n\n" WCMD_NOARG, "Brakuje argumentu\n" WCMD_SYNTAXERR, "B��d sk�adni\n" @@ -256,7 +260,7 @@ Wpisz HELP <komenda> dla dok WCMD_NEWTIME, "Wpisz nowy czas: " WCMD_MISSINGENV, "Zmienna �rodowiskowa %s niezdefiniowana\n" WCMD_READFAIL, "Nieudane otwarcie '%s'\n" - WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" + WCMD_CALLINSCRIPT, "Nie mo�na wywo�a� etykiety bat poza skryptem bat\n" WCMD_ALL, "A" WCMD_DELPROMPT, "%s, Usun��" WCMD_ECHOPROMPT, "Echo jest %s\n"

1 0

Łukasz Wojniłowicz : taskmgr: Update Polish translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: b83cee62efa533c4bdf933caf331dcd7898bc35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83cee62efa533c4bdf933caf… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Dec 21 20:07:01 2010 +0100 taskmgr: Update Polish translation. --- programs/taskmgr/Pl.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc index 6c5c8f4..a8e0730 100644 --- a/programs/taskmgr/Pl.rc +++ b/programs/taskmgr/Pl.rc @@ -216,7 +216,7 @@ BEGIN GROUPBOX "U�ycie procesora",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "U�ycie pami�ci",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Sumy",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Pami�c zadeklarowana (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Pami�� zadeklarowana (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Pami�� fizyczna (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Pami�� j�dra (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT LTEXT "Uchwyty",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 @@ -386,7 +386,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 CONTROL "ID Ses&ji",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,120,10 - CONTROL "Na&zwa u�ytownika",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + CONTROL "Na&zwa u�ytkownika",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,120,10 CONTROL "R�nica b��&d�w strony",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,130,28,120,10 @@ -436,7 +436,7 @@ BEGIN ID_VIEW_LARGE "Wy�wietl zadania u�ywaj�c du�ych ikon" ID_VIEW_SMALL "Wy�wietl zadania u�ywaj�c ma�ych ikon" ID_VIEW_DETAILS "Wy�wietla szczeg�y ka�dego zadania" - ID_VIEW_UPDATESPEED_HIGH "Od�wie�a list� dwa razy na sekund�" + ID_VIEW_UPDATESPEED_HIGH "Od�wie�a list� dwa razy na sekund�" ID_VIEW_UPDATESPEED_NORMAL "Od�wie�a list� co dwie sekundy" ID_VIEW_UPDATESPEED_LOW "Od�wie�a list� co cztery sekundy" END @@ -455,7 +455,7 @@ BEGIN ID_HELP_ABOUT "Wy�wietl informacje o programie, wersji i prawach autorskich" ID_FILE_EXIT "Zako�cz aplikacj� Mened�era zada�" ID_OPTIONS_SHOW16BITTASKS - "Wy�witels 16-bitowe zadania pod odpowiednim ntvdm.exe" + "Wy�wietl 16-bitowe zadania pod odpowiednim ntvdm.exe" ID_VIEW_SELECTCOLUMNS "Wybierz kolumny, kt�re b�d� widoczne na zak�adce Procesy" ID_VIEW_SHOWKERNELTIMES "Pokazuje czasy j�dra na wykresach wydajno�ci" ID_VIEW_CPUHISTORY_ONEGRAPHALL @@ -473,7 +473,7 @@ BEGIN ID_PROCESS_PAGE_ENDPROCESS "Usuwa dane zadanie z systemu" ID_PROCESS_PAGE_ENDPROCESSTREE "Usuwa dany proces i wszystkich jego potomk�w z systemu" - ID_PROCESS_PAGE_DEBUG "Pod��cza debuger do tego zadania" + ID_PROCESS_PAGE_DEBUG "Pod��cza debugger do tego zadania" ID_PROCESS_PAGE_SETAFFINITY "Ustala na jakich procesorach ten proces mo�e si� wykonywa�" ID_PROCESS_PAGE_SETPRIORITY_REALTIME @@ -524,11 +524,11 @@ BEGIN IDS_IOREADS "Odczyty We/Wy" IDS_IOREADBYTES "Odczyty We/Wy w bajtach" IDS_SESSIONID "Identyfikator sesji" - IDS_USERNAME "Nazwa u�ytkowinka" + IDS_USERNAME "Nazwa u�ytkownika" IDS_PAGEFAULTSDELTA "Zmiana b��d�w stron" IDS_VIRTUALMEMORYSIZE "Rozmiar pami�ci wirtualnej" - IDS_PAGEDPOOL "Pula stronnicowania" - IDS_NONPAGEDPOOL "Pula niestronnicowania" + IDS_PAGEDPOOL "Pula stronicowania" + IDS_NONPAGEDPOOL "Pula niestronicowana" IDS_BASEPRIORITY "Priorytet podstawowy" IDS_HANDLECOUNT "Liczba doj��" IDS_THREADCOUNT "Liczba w�tk�w" @@ -542,18 +542,18 @@ END STRINGTABLE BEGIN IDS_WARNING_TITLE "Ostrze�enie menad�era zada�" - IDS_PRIORITY_CHANGE_MESSAGE "OSTRZE�ENIE: Zmiana priorytetu tego rprcesu mo�e przynie��\n\ - nieporz�dane skutki, w tym r�wnie� niestabilno�� systemu\n\ + IDS_PRIORITY_CHANGE_MESSAGE "OSTRZE�ENIE: Zmiana priorytetu tego procesu mo�e przynie��\n\ + niepo��dane skutki, w tym r�wnie� niestabilno�� systemu\n\ Czy na pewno chcesz zmieni� priorytet?" - IDS_PRIORITY_UNABLE2CHANGE "Nie mozna zmieni� priorytetu" + IDS_PRIORITY_UNABLE2CHANGE "Nie mo�na zmieni� priorytetu" IDS_TERMINATE_MESSAGE "OSTRZE�ENIE: Zako�czenie procesu mo�e przynie��\n\ - nieporz�dane skutki, w tym r�wnie�\n\ + niepo��dane skutki, w tym r�wnie�\n\ utrat� danych i niestabilno�� systemu.\n\ Proces nie b�dzie mia� szansy na zapisanie danych\n\ Czy na pewno chcesz zako�czy�?" IDS_TERMINATE_UNABLE2TERMINATE "Nie mo�na zako�czy� procesu" IDS_DEBUG_MESSAGE "OSTRZE�ENIE: Debugowanie tego procesu mo�e spowodowa� utrat� tanych.\n\ - Czy na pewno chcesz uruchomi� debugera?" + Czy na pewno chcesz uruchomi� debuggera?" IDS_DEBUG_UNABLE2DEBUG "Nie mo�na debugowa� procesu" IDS_AFFINITY_ERROR_MESSAGE "Proces musi by� skoligacony z co najmniej jednym procesorem" IDS_AFFINITY_ERROR_TITLE "Niew�a�ciwa opcja" @@ -562,7 +562,7 @@ END STRINGTABLE BEGIN - IDS_SYSTEM_IDLE_PROCESS "System Idle Process" + IDS_SYSTEM_IDLE_PROCESS "Proces bezczynno�ci" IDS_APPLICATION_NOT_RESPONDING "Nie odpowiada" IDS_APPLICATION_RUNNING "Uruchomiony" IDS_APPLICATION_TASK "Zadanie"

1 0

Łukasz Wojniłowicz : wininet: Update Polish translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: c2be1747d3791590ab729fe86c393fe33fe0c796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2be1747d3791590ab729fe86… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Dec 21 20:06:59 2010 +0100 wininet: Update Polish translation. --- dlls/wininet/wininet_Pl.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Pl.rc b/dlls/wininet/wininet_Pl.rc index 0da9dab..2cf0e3c 100644 --- a/dlls/wininet/wininet_Pl.rc +++ b/dlls/wininet/wininet_Pl.rc @@ -62,7 +62,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ostrze�enie o zabezpieczeniach" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wyst�pi� problem z certyfikatem dla tej strony.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Czy mimo to chcesz kontynuowa�?", -1, 40, 46, 200, 20 + PUSHBUTTON "Tak", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Nie", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "Po��czenie LAN" + IDS_CERT_CA_INVALID "Certyfikat jest wydany przez nieznanego lub niezaufanego wydawc�." + IDS_CERT_DATE_INVALID "Data na certyfikacie jest niepoprawna." + IDS_CERT_CN_INVALID "Nazwa na certyfikacie nie zgadza si� z t� stron�." + IDS_CERT_ERRORS "Wyst�pi� przynajmniej jeden nieokre�lony problem z tym certyfikatem." }

1 0

Łukasz Wojniłowicz : avifile: Update Polish translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 1b382ea26030538db85191686d04c7205fef5dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b382ea26030538db85191686… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Dec 21 20:06:57 2010 +0100 avifile: Update Polish translation. --- dlls/avifil32/avifile_Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile_Pl.rc b/dlls/avifil32/avifile_Pl.rc index 45caaae..50d074c 100644 --- a/dlls/avifil32/avifile_Pl.rc +++ b/dlls/avifil32/avifile_Pl.rc @@ -41,8 +41,8 @@ END STRINGTABLE { - IDS_WAVESTREAMFORMAT "Waveform: %s" - IDS_WAVEFILETYPE "Waveform" + IDS_WAVESTREAMFORMAT "Kszta�t fali: %s" + IDS_WAVEFILETYPE "Kszta�t fali" IDS_ALLMULTIMEDIA "Wszystkie pliki multimedialne" IDS_ALLFILES "Wszystkie pliki (*.*)(a)*.*" IDS_VIDEO "obraz"

1 0

André Hentschel : include: Add new suite masks.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: d4b26c308e6fe0e60e2349dbea8c51d3958571b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b26c308e6fe0e60e2349dbe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 21 17:58:21 2010 +0100 include: Add new suite masks. --- include/winnt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 380ad3f..65dde7a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5414,6 +5414,11 @@ NTSYSAPI ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #define VER_SUITE_SINGLEUSERTS 0x00000100 #define VER_SUITE_PERSONAL 0x00000200 #define VER_SUITE_BLADE 0x00000400 +#define VER_SUITE_EMBEDDED_RESTRICTED 0x00000800 +#define VER_SUITE_SECURITY_APPLIANCE 0x00001000 +#define VER_SUITE_STORAGE_SERVER 0x00002000 +#define VER_SUITE_COMPUTE_SERVER 0x00004000 +#define VER_SUITE_WH_SERVER 0x00008000 #define VER_EQUAL 1 #define VER_GREATER 2

1 0

André Hentschel : include: Add ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED for wininet tests.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: cc90dc6f3b51745bf20f31edd86352811ca6341d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc90dc6f3b51745bf20f31edd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 21 17:59:30 2010 +0100 include: Add ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED for wininet tests. --- dlls/wininet/tests/internet.c | 2 +- include/wininet.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index df0a882..d066830 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1226,7 +1226,7 @@ void test_InternetErrorDlg(void) continue; } break; - case 12054: /* ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED */ + case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: if(res != expected) { /* Windows XP, W2K3 */ diff --git a/include/wininet.h b/include/wininet.h index a0ec408..0c98aa4 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1442,6 +1442,7 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_RETRY_DIALOG (INTERNET_ERROR_BASE + 50) #define ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR (INTERNET_ERROR_BASE + 52) #define ERROR_INTERNET_INSERT_CDROM (INTERNET_ERROR_BASE + 53) +#define ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED (INTERNET_ERROR_BASE + 54) #define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) #define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) #define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57)

1 0

Alexandre Julliard : loader: Setup the TLS register on x86-64 for stack protector checks.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 7e112c29173c5b8766542fcfec46e43e99e0c4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e112c29173c5b8766542fcfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 19:38:27 2010 +0100 loader: Setup the TLS register on x86-64 for stack protector checks. --- loader/preloader.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 4344a16..e1c2276 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -344,6 +344,8 @@ static inline int wld_prctl( int code, long arg ) #elif defined(__x86_64__) +void *thread_data[256]; + /* * The _start function is the entry and exit point of this program * @@ -355,8 +357,12 @@ extern char _end[]; __ASM_GLOBAL_FUNC(_start, "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ + "movq %rax,(%rsp)\n\t" /* orig stack pointer */ + "movq $thread_data,%rsi\n\t" + "movq $0x1002,%rdi\n\t" /* ARCH_SET_FS */ + "movq $158,%rax\n\t" /* SYS_arch_prctl */ + "syscall\n\t" "movq %rsp,%rdi\n\t" /* ptr to orig stack pointer */ - "movq %rax,(%rdi)\n\t" /* orig stack pointer */ "call wld_start\n\t" "movq (%rsp),%rsp\n\t" /* new stack pointer */ "pushq %rax\n\t" /* ELF interpreter entry point */

1 0

Jacek Caban : aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 0b6bfade5240eafe1c9ab5653192dc88ccf31b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6bfade5240eafe1c9ab5653… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 21 18:08:38 2010 +0100 aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 485f8d6..39546f0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,7 +125,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) - ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], diff --git a/configure b/configure index e1da621..b6444c5 100755 --- a/configure +++ b/configure @@ -7042,7 +7042,7 @@ if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dl then case "$host_cpu" in i[3456789]86*) - ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;; *)

1 0

André Hentschel : wininet: Update German translation.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 5c7bb1e5b84e1c5835585443095f2b9b367cb0f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7bb1e5b84e1c58355854430… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 21 17:59:09 2010 +0100 wininet: Update German translation. --- dlls/wininet/wininet_De.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index d597247..2998976 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -63,7 +63,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Security Warning" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Es gibt ein Problem mit dem Zertifikat dieser Seite.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Möchten Sie dennoch fortfahren?", -1, 40, 46, 200, 20 + PUSHBUTTON "Ja", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Nein", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "LAN Verbindung" + IDS_CERT_CA_INVALID "Das Zertifikat wurde von einem unbekannten oder vertrauensunwürdigen Herausgeber ausgestellt." + IDS_CERT_DATE_INVALID "Das Datum des Zertifkats ist ungültig." + IDS_CERT_CN_INVALID "Der Name auf dem Zertifikat entspricht nicht der Seite." + IDS_CERT_ERRORS "Es gibt mindestens ein unbekanntes Sicherheitsproblem mit diesem Zertifikat." }

1 0

Damian Dixon : advapi32: Added check for NULL pointer being passed to QueryServiceStatus for either parameter .
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: fd0bec1f960407ba4a4411e41d7585274ebe5ad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0bec1f960407ba4a4411e41… Author: Damian Dixon <damian.dixon(a)gmail.com> Date: Mon Dec 20 20:34:49 2010 +0000 advapi32: Added check for NULL pointer being passed to QueryServiceStatus for either parameter. --- dlls/advapi32/service.c | 11 +++++++++++ dlls/advapi32/tests/service.c | 1 - 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 5d09d18..92790c1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1130,6 +1130,17 @@ BOOL WINAPI QueryServiceStatus(SC_HANDLE hService, TRACE("%p %p\n", hService, lpservicestatus); + if (!hService) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!lpservicestatus) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&SvcStatusData, sizeof(SERVICE_STATUS_PROCESS), &dummy); if (ret) memcpy(lpservicestatus, &SvcStatusData, sizeof(SERVICE_STATUS)) ; diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 48d9386..4605ffd 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -925,7 +925,6 @@ static void test_query_svc(void) SetLastError(0xdeadbeef); ret = QueryServiceStatus(svc_handle, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_ADDRESS || GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Unexpected last error %d\n", GetLastError());

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010