wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Hans Leidekker : msi: Use the state parameter passed to MsiSetMode.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a6b3d77021f97fa3c801c639e1c194f111fcb521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b3d77021f97fa3c801c639e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:15:33 2012 +0200 msi: Use the state parameter passed to MsiSetMode. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d78e604..709f4dc 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) switch (iRunMode) { case MSIRUNMODE_REBOOTATEND: - package->need_reboot_at_end = 1; + package->need_reboot_at_end = (fState != 0); r = ERROR_SUCCESS; break;

1 0

Hans Leidekker : msi: Rename the need_reboot flag to need_reboot_at_end.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 89c80c41ea708e1497c2d88b9673cf4d54d538ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c80c41ea708e1497c2d88b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:15:16 2012 +0200 msi: Rename the need_reboot flag to need_reboot_at_end. --- dlls/msi/action.c | 4 ++-- dlls/msi/files.c | 2 +- dlls/msi/install.c | 4 ++-- dlls/msi/media.c | 2 +- dlls/msi/msipriv.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8abf456..5ecf8a5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6883,7 +6883,7 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) { TRACE("\n"); - package->need_reboot = 1; + package->need_reboot_at_end = 1; return ERROR_SUCCESS; } @@ -7508,7 +7508,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, } msi_free( reinstall ); - if (rc == ERROR_SUCCESS && package->need_reboot) + if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED; return rc; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e3a12c3..6edf781 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -215,7 +215,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { file->state = msifs_installed; - package->need_reboot = 1; + package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } else diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 83b8b7d..d78e604 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -761,7 +761,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) break; case MSIRUNMODE_REBOOTATEND: - r = package->need_reboot; + r = package->need_reboot_at_end; break; case MSIRUNMODE_LOGENABLED: @@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) switch (iRunMode) { case MSIRUNMODE_REBOOTATEND: - package->need_reboot = 1; + package->need_reboot_at_end = 1; r = ERROR_SUCCESS; break; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index dd5ecd6..9a01277 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -477,7 +477,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) { - data->package->need_reboot = 1; + data->package->need_reboot_at_end = 1; } else { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cd16baf..bf15f50 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -406,7 +406,7 @@ typedef struct tagMSIPACKAGE unsigned char scheduled_action_running : 1; unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; - unsigned char need_reboot : 1; + unsigned char need_reboot_at_end : 1; unsigned char need_rollback : 1; } MSIPACKAGE;

1 0

Morten Rønne : po: Updated Danish translation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 4f60ddceb1baa1b923c4405cfae5389b6e11ab6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f60ddceb1baa1b923c4405cf… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sat Mar 31 10:51:56 2012 +0200 po: Updated Danish translation. --- po/da.po | 1165 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 442 insertions(+), 723 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f60ddceb1baa1b923c44…

1 0

Łukasz Wojniłowicz : po: Updated Polish translation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a40f70c9a5960e6c501ca856018a8d03df6190ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40f70c9a5960e6c501ca8560… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 31 07:52:32 2012 +0200 po: Updated Polish translation. --- po/pl.po | 105 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 45 insertions(+), 60 deletions(-) diff --git a/po/pl.po b/po/pl.po index 725e0ab..23186f2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-12 07:41+0100\n" +"PO-Revision-Date: 2012-03-31 07:45+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -528,11 +528,11 @@ msgstr "&Styl:" #: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:280 msgid "&Size:" -msgstr "Wielkość:" +msgstr "&Rozmiar:" #: comdlg32.rc:260 msgid "Effects" -msgstr "Efekty specialne" +msgstr "Efekty" #: comdlg32.rc:261 msgid "Stri&keout" @@ -544,7 +544,7 @@ msgstr "P&odkreślona" #: comdlg32.rc:263 winecfg.rc:278 msgid "&Color:" -msgstr "Kolor:" +msgstr "&Kolor:" #: comdlg32.rc:266 msgid "Sample" @@ -564,11 +564,11 @@ msgstr "&Podstawowe kolory:" #: comdlg32.rc:280 msgid "&Custom Colors:" -msgstr "Dowolne &kolory:" +msgstr "Własne &kolory:" #: comdlg32.rc:281 comdlg32.rc:304 msgid "Color | Sol&id" -msgstr "Kolor" +msgstr "Kolor | Jednol&ity" #: comdlg32.rc:282 msgid "&Red:" @@ -598,15 +598,15 @@ msgstr "&Jaskr:" #: comdlg32.rc:302 msgid "&Add to Custom Colors" -msgstr "&Dodaj do dowolnych" +msgstr "&Dodaj do własnych kolorów" #: comdlg32.rc:303 msgid "&Define Custom Colors >>" -msgstr "Z&definiuj kolor >>" +msgstr "Z&definiuj własne kolory >>" #: comdlg32.rc:310 regedit.rc:223 regedit.rc:233 msgid "Find" -msgstr "Wyszukaj w rejestrze" +msgstr "Znajdź" #: comdlg32.rc:313 comdlg32.rc:332 msgid "Fi&nd What:" @@ -614,7 +614,7 @@ msgstr "&Znajdź:" #: comdlg32.rc:315 comdlg32.rc:336 msgid "Match &Whole Word Only" -msgstr "Uwzględniaj tylko całe wyrazy" +msgstr "Uwzględniaj tylko całe &wyrazy" #: comdlg32.rc:316 comdlg32.rc:337 msgid "Match &Case" @@ -626,11 +626,11 @@ msgstr "Kierunek" #: comdlg32.rc:318 view.rc:39 msgid "&Up" -msgstr "Przesuń w &górę" +msgstr "W &górę" #: comdlg32.rc:319 view.rc:40 msgid "&Down" -msgstr "Przesuń w &dół" +msgstr "W &dół" #: comdlg32.rc:321 comdlg32.rc:339 msgid "&Find Next" @@ -687,7 +687,7 @@ msgstr "Kopie" #: comdlg32.rc:372 msgid "Number of &copies:" -msgstr "Lczba &kopii:" +msgstr "Liczba &kopii:" #: comdlg32.rc:374 msgid "C&ollate" @@ -1861,7 +1861,7 @@ msgstr "OCSP" #: crypt32.rc:200 msgid "CA Issuers" -msgstr "Wystawcy CA" +msgstr "Wystawcy UC" #: crypt32.rc:201 msgid "Unknown Access Method" @@ -1897,27 +1897,27 @@ msgstr "Wystawca CRL" #: crypt32.rc:209 msgid "Key Compromise" -msgstr "Key Compromise" +msgstr "Złamanie klucza" #: crypt32.rc:210 msgid "CA Compromise" -msgstr "CA Compromise" +msgstr "Naruszenie bezpieczeństwa urzędu certyfikacji" #: crypt32.rc:211 msgid "Affiliation Changed" -msgstr "Zmieniona przynależność" +msgstr "Zmiana przynależności" #: crypt32.rc:212 msgid "Superseded" -msgstr "Zastąpiony" +msgstr "Zastąpienie nowszą wersją" #: crypt32.rc:213 msgid "Operation Ceased" -msgstr "Zaprzestano operacji" +msgstr "Zaprzestanie działania" #: crypt32.rc:214 msgid "Certificate Hold" -msgstr "Zawieszenie certyfikatu" +msgstr "Wstrzymanie certyfikatu" #: crypt32.rc:215 msgid "Financial Information=" @@ -1929,7 +1929,7 @@ msgstr "Dostępne" #: crypt32.rc:217 msgid "Not Available" -msgstr "Nie dostępne" +msgstr "Niedostępny" #: crypt32.rc:218 msgid "Meets Criteria=" @@ -2193,17 +2193,13 @@ msgstr "" "certyfikat, listę odwołania certyfikatu lub listę zaufania certyfikatu:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "" -"Standard składni wiadomości kryptograficznych - certyfikaty PKCS #7 (.p7b)" +"Standard składni wiadomości kryptograficznych - certyfikaty PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Wymiana informacji osobistych/PKCS #12 (.pfx, .p12)" +msgstr "Wymiana informacji osobistych/PKCS #12 (*.pfx; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2347,23 +2343,17 @@ msgid "Select the format you want to use:" msgstr "Wybierz format, którego chcesz użyć:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "Certyfikat X.509 szyfrowany binarnie algorytmem DER (.&cer)" +msgstr "Certyfikat X*.509 szyfrowany binarnie algorytmem &DER (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Certyfikat X.509 szyfrowany algorytmem B&ase64 (.cer):" +msgstr "Certyfikat X.509 szyfrowany algorytmem Ba&se64 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"&Standard składni wiadomości kryptograficznych - certyfikat PKCS #7 (.p7b)" +"&Standard składni wiadomości kryptograficznych - certyfikat PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2371,10 +2361,8 @@ msgstr "" "&Jeżeli jest to możliwe, dołącz wszystkie certyfikaty do ścieżki certyfikacji" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Wymiana informacji &osobistych - PKCS #12 (.pfx)" +msgstr "Wymiana informacji &osobistych - PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -3483,10 +3471,8 @@ msgid "Expected ')'" msgstr "Oczekiwane ')'" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Niepoprawny parametr.\n" +msgstr "Nieprawidłowy znak" #: jscript.rc:38 msgid "Unterminated string constant" @@ -4926,7 +4912,7 @@ msgstr "Konflikt danych poufnych sesji.\n" #: winerror.mc:1731 msgid "Remote session limit exceeded.\n" -msgstr "Limit zdalnych sesji przekroczony.\n" +msgstr "Przekroczono limit zdalnych sesji.\n" #: winerror.mc:1736 msgid "Duplicate domain or workgroup name.\n" @@ -4998,7 +4984,7 @@ msgstr "Proszę ponowić operację.\n" #: winerror.mc:1821 msgid "Connection count limit reached.\n" -msgstr "Liczba limitu połączeń osiągnięta.\n" +msgstr "Osiągnięto liczbę limitu połączeń.\n" #: winerror.mc:1826 msgid "Login time restriction.\n" @@ -5290,7 +5276,7 @@ msgstr "Domena już istnieje.\n" #: winerror.mc:2186 msgid "Domain limit exceeded.\n" -msgstr "Limit domen przekroczony.\n" +msgstr "Przekroczono limit domen.\n" #: winerror.mc:2191 msgid "Internal database corruption.\n" @@ -6584,7 +6570,7 @@ msgstr "Proszę wprowadzić nazwę użytkownika i hasło:" #: mpr.rc:36 wininet.rc:38 msgid "Proxy" -msgstr "Proxy" +msgstr "Pośrednik" #: mpr.rc:38 wininet.rc:40 wininet.rc:60 msgid "User" @@ -7684,7 +7670,7 @@ msgstr "Nowy" #: shell32.rc:66 msgid "New &Folder" -msgstr "&Folder" +msgstr "Nowy &Folder" #: shell32.rc:67 msgid "New &Link" @@ -7896,7 +7882,7 @@ msgstr "Pulpit" #: shell32.rc:208 msgid "NetHood" -msgstr "" +msgstr "Otoczenie sieciowe" #: shell32.rc:209 msgid "Templates" @@ -7904,7 +7890,7 @@ msgstr "Szablony" #: shell32.rc:210 msgid "PrintHood" -msgstr "" +msgstr "Drukowanie otoczenie" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -7912,7 +7898,7 @@ msgstr "Historia" #: shell32.rc:212 msgid "Program Files" -msgstr "" +msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" @@ -7944,7 +7930,7 @@ msgstr "Wideo" #: shell32.rc:213 msgid "Program Files (x86)" -msgstr "" +msgstr "Pliki programów (x86)" #: shell32.rc:221 msgid "Contacts" @@ -7952,7 +7938,7 @@ msgstr "Kontakty" #: shell32.rc:222 winefile.rc:110 msgid "Links" -msgstr "Dowiązania" +msgstr "Łącza" #: shell32.rc:223 msgid "Slide Shows" @@ -8204,7 +8190,7 @@ msgstr " godz." #: shlwapi.rc:29 msgctxt "time unit: minutes" msgid " min" -msgstr " min." +msgstr " min" #: shlwapi.rc:30 msgctxt "time unit: seconds" @@ -9001,7 +8987,7 @@ msgstr "Odwołanie" #: wldap32.rc:38 msgid "Administration Limit Exceeded" -msgstr "Przekroczony limit administracyjny na serwerze" +msgstr "Przekroczono limit administracyjny na serwerze" #: wldap32.rc:39 msgid "Unavailable Critical Extension" @@ -11719,7 +11705,7 @@ msgstr "Razem" #: taskmgr.rc:388 msgid "Limit" -msgstr "Limit" +msgstr "Ograniczenie" #: taskmgr.rc:389 msgid "Peak" @@ -12760,9 +12746,8 @@ msgid "Select an executable file" msgstr "Wybierz plik wykonywalny" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Automatyczne wykrywanie" +msgstr "Wykryj automatycznie" #: winecfg.rc:67 msgid "Local hard disk" @@ -13525,7 +13510,7 @@ msgstr "Podaj swoje imię" #: winemine.rc:84 msgid "Custom Game" -msgstr "Ustawienia Użytkownika" +msgstr "Własna gra" #: winemine.rc:86 msgid "Rows" @@ -13549,7 +13534,7 @@ msgstr "Anonimowy" #: winemine.rc:29 msgid "Copyright 2000 Joshua Thielen" -msgstr "Copyright 2000 Joshua Thielen" +msgstr "Prawa autorskie 2000 Joshua Thielen" #: winhlp32.rc:32 msgid "Printer &setup..."

1 0

Alexandre Julliard : ntdll: Add a __chkstk entry point for x86_64.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 3d4a73e6015a9d3f0d79810985700b2a45cd6439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4a73e6015a9d3f0d7981098… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:42:52 2012 +0200 ntdll: Add a __chkstk entry point for x86_64. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 8 ++++++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0bdad73..10d6da5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1277,6 +1277,8 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall ZombifyActCtx(ptr) +@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64 -private -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0976bc5..bd9d41e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1244,6 +1244,7 @@ # @ stub _CIsin # @ stub _CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -private -arch=x86_64 -norelay __chkstk() # @ stub __isascii # @ stub __iscsym # @ stub __iscsymf diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6677fed..b31cfb8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1483,6 +1483,14 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + + /*********************************************************************** * RtlCaptureContext (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move the _chkstk implementation to signal_i386. c.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: aa55603b731fee304ce949cdcaa6572907c99604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa55603b731fee304ce949cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:45:43 2012 +0200 ntdll: Move the _chkstk implementation to signal_i386.c. --- dlls/ntdll/rtl.c | 31 ------------------------------- dlls/ntdll/signal_i386.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1970251..34869e7 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -405,37 +405,6 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) return STATUS_NOT_IMPLEMENTED; } -/************************************************************************** - * _chkstk [NTDLL.@] - * - * Glorified "enter xxxx". - */ -#ifdef __i386__ -__ASM_STDCALL_FUNC( _chkstk, 0, - "negl %eax\n\t" - "addl %esp,%eax\n\t" - "xchgl %esp,%eax\n\t" - "movl 0(%eax),%eax\n\t" /* copy return address from old location */ - "movl %eax,0(%esp)\n\t" - "ret" ) -#endif - -/************************************************************************** - * _alloca_probe [NTDLL.@] - * - * Glorified "enter xxxx". - */ -#ifdef __i386__ -__ASM_STDCALL_FUNC( _alloca_probe, 0, - "negl %eax\n\t" - "addl %esp,%eax\n\t" - "xchgl %esp,%eax\n\t" - "movl 0(%eax),%eax\n\t" /* copy return address from old location */ - "movl %eax,0(%esp)\n\t" - "ret" ) -#endif - - /****************************************************************************** * RtlInitializeGenericTable [NTDLL.@] */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e839994..6763344 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2573,6 +2573,29 @@ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) +/************************************************************************** + * _chkstk (NTDLL.@) + */ +__ASM_STDCALL_FUNC( _chkstk, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) + +/************************************************************************** + * _alloca_probe (NTDLL.@) + */ +__ASM_STDCALL_FUNC( _alloca_probe, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) + + /********************************************************************** * EXC_CallHandler (internal) *

1 0

Dmitry Timoshkov : gdi32: Refuse to load a large .fot file earlier.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 62b9c26bb542581d62b6214bf0143dd32a1d3fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b9c26bb542581d62b6214bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 14:40:50 2012 +0900 gdi32: Refuse to load a large .fot file earlier. --- dlls/gdi32/font.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 230d421..f5c44d8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3454,10 +3454,15 @@ static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); if (file == INVALID_HANDLE_VALUE) return NULL; - GetFileSizeEx( file, size ); + if (!GetFileSizeEx( file, size ) || size->u.HighPart) + { + CloseHandle( file ); + return NULL; + } + mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); CloseHandle( file ); - if (mapping == NULL) return NULL; + if (!mapping) return NULL; ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); CloseHandle( mapping ); @@ -3478,7 +3483,6 @@ static WCHAR *get_scalable_filename( const WCHAR *res ) if (!ptr) return NULL; - if (size.u.HighPart) goto fail; if (size.u.LowPart < sizeof( *dos )) goto fail; dos = (const IMAGE_DOS_HEADER *)ptr; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail;

1 0

Dmitry Timoshkov : gdi32: Remove a no longer needed shortcut in CreateScalableFontResource test.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: b2af51956dd065e63e9935f9337b77d48095b949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2af51956dd065e63e9935f93… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 14:40:38 2012 +0900 gdi32: Remove a no longer needed shortcut in CreateScalableFontResource test. --- dlls/gdi32/tests/font.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 38a8544..93f174a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4003,9 +4003,6 @@ static void test_CreateScalableFontResource(void) todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); - /* FIXME: since CreateScalableFontResource is a stub further testing is impossible */ - if (ret) return; - /* test public font resource */ SetLastError(0xdeadbeef); ret = CreateScalableFontResource(0, fot_name, ttf_name, NULL); @@ -4022,11 +4019,11 @@ todo_wine ok(ret, "font wine_test should be enumerated\n"); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); +todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test");

1 0

Michael Stefaniuc : dmime: Move struct IDirectMusicPerformance8Impl to the c file.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: a84245463ad09b0ac2a4eeebb385b82521c61ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84245463ad09b0ac2a4eeebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 2 00:08:57 2012 +0200 dmime: Move struct IDirectMusicPerformance8Impl to the c file. --- dlls/dmime/dmime_private.h | 42 ------------------------------------------ dlls/dmime/performance.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 42 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 95c3324..de6533d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -46,7 +46,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicPerformance8Impl IDirectMusicPerformance8Impl; typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl; typedef struct IDirectMusicSegmentState8Impl IDirectMusicSegmentState8Impl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; @@ -124,47 +123,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; /***************************************************************************** - * IDirectMusicPerformance8Impl implementation structure - */ -struct IDirectMusicPerformance8Impl { - /* IUnknown fields */ - IDirectMusicPerformance8 IDirectMusicPerformance8_iface; - LONG ref; - - /* IDirectMusicPerformanceImpl fields */ - IDirectMusic8* pDirectMusic; - IDirectSound* pDirectSound; - IDirectMusicGraph* pToolGraph; - DMUS_AUDIOPARAMS pParams; - - /* global parameters */ - BOOL fAutoDownload; - char cMasterGrooveLevel; - float fMasterTempo; - long lMasterVolume; - - /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; - - /* IDirectMusicPerformance8Impl fields */ - IDirectMusicAudioPath* pDefaultPath; - HANDLE hNotification; - REFERENCE_TIME rtMinimum; - - REFERENCE_TIME rtLatencyTime; - DWORD dwBumperLength; - DWORD dwPrepareTime; - /** Message Processing */ - HANDLE procThread; - DWORD procThreadId; - REFERENCE_TIME procThreadStartTime; - BOOL procThreadTicStarted; - CRITICAL_SECTION safe; - struct DMUS_PMSGItem* head; - struct DMUS_PMSGItem* imm_head; -}; - -/***************************************************************************** * IDirectMusicSegment8Impl implementation structure */ struct IDirectMusicSegment8Impl { diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index dac4a42..bc44fa5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -22,6 +22,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); +typedef struct IDirectMusicPerformance8Impl { + IDirectMusicPerformance8 IDirectMusicPerformance8_iface; + LONG ref; + /* IDirectMusicPerformanceImpl fields */ + IDirectMusic8 *pDirectMusic; + IDirectSound *pDirectSound; + IDirectMusicGraph *pToolGraph; + DMUS_AUDIOPARAMS pParams; + /* global parameters */ + BOOL fAutoDownload; + char cMasterGrooveLevel; + float fMasterTempo; + long lMasterVolume; + /* performance channels */ + DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + /* IDirectMusicPerformance8Impl fields */ + IDirectMusicAudioPath *pDefaultPath; + HANDLE hNotification; + REFERENCE_TIME rtMinimum; + REFERENCE_TIME rtLatencyTime; + DWORD dwBumperLength; + DWORD dwPrepareTime; + /** Message Processing */ + HANDLE procThread; + DWORD procThreadId; + REFERENCE_TIME procThreadStartTime; + BOOL procThreadTicStarted; + CRITICAL_SECTION safe; + struct DMUS_PMSGItem *head; + struct DMUS_PMSGItem *imm_head; +} IDirectMusicPerformance8Impl; + typedef struct DMUS_PMSGItem DMUS_PMSGItem; struct DMUS_PMSGItem { DMUS_PMSGItem* next;

1 0

Michael Stefaniuc : dmime/tests: Add some COM tests for IDirectMusicPerformance.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 2259da712e73c374306fab63557282935f3cb60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2259da712e73c374306fab635… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 2 00:07:14 2012 +0200 dmime/tests: Add some COM tests for IDirectMusicPerformance. --- dlls/dmime/tests/performance.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index ddeed5d..931478c 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -195,6 +195,50 @@ static void test_createport(void) IDirectMusicPerformance_Release(perf); } +static void test_COM(void) +{ + IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; + IDirectMusicPerformance *dmp2; + IDirectMusicPerformance8 *dmp8; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown*)&dmp, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmp); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmp, "dmp = %p\n", dmp); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound, (void**)&dmp); + ok(hr == E_NOINTERFACE, + "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount */ + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance, (void**)&dmp); + ok(hr == S_OK, "DirectMusicPerformance create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicPerformance_AddRef(dmp); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance2, (void**)&dmp2); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %08x\n", hr); + IDirectMusicPerformance_AddRef(dmp); + refcount = IDirectMusicPerformance_Release(dmp); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance8, (void**)&dmp8); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %08x\n", hr); + refcount = IDirectMusicPerformance_Release(dmp); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + refcount = IDirectMusicPerformance8_Release(dmp8); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IDirectMusicPerformance_Release(dmp2); + ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + refcount = IDirectMusicPerformance_Release(dmp); + ok (refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST( performance ) { HRESULT hr; @@ -211,6 +255,7 @@ START_TEST( performance ) return; } + test_COM(); test_createport(); CoUninitialize();

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 April 2012