April 2012 - Wine-commits - list.winehq.org

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

Ł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

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

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

Henri Verbeet : ddraw: The texture interfaces can' t be queried from version 7 surfaces.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 7dd4f439e33c37d6a1f2afd1febee7062886b751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4f439e33c37d6a1f2afd1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:02 2012 +0200 ddraw: The texture interfaces can't be queried from version 7 surfaces. --- dlls/ddraw/surface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0109449..d8c43a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -222,21 +222,21 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return E_NOINTERFACE; } - if (IsEqualGUID( &IID_IDirect3DTexture2, riid) - || IsEqualGUID(&IID_IDirect3DTexture, riid)) + if (This->version != 7) { - if (IsEqualGUID( &IID_IDirect3DTexture, riid )) + if (IsEqualGUID(&IID_IDirect3DTexture2, riid)) { - *obj = &This->IDirect3DTexture_iface; - TRACE(" returning Direct3DTexture interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture2_iface); + *obj = &This->IDirect3DTexture2_iface; + return S_OK; } - else + + if (IsEqualGUID( &IID_IDirect3DTexture, riid )) { - *obj = &This->IDirect3DTexture2_iface; - TRACE(" returning Direct3DTexture2 interface at %p.\n", *obj); + IDirect3DTexture2_AddRef(&This->IDirect3DTexture_iface); + *obj = &This->IDirect3DTexture_iface; + return S_OK; } - IUnknown_AddRef( (IUnknown *) *obj); - return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));

1 0

Henri Verbeet : ddraw: The texture interface shares its refcount with the surface interface version used to create the surface .
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 814fd3b39efa7e2e99d598212648786bf301b914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814fd3b39efa7e2e99d598212… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:03 2012 +0200 ddraw: The texture interface shares its refcount with the surface interface version used to create the surface. This probably implies that on native the texture interface is part of a separate object that's aggregated by the surface. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 700a781..fa0f144 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -151,6 +151,7 @@ struct ddraw_surface LONG ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count; IUnknown *ifaceToRelease; + IUnknown *texture_outer; int version; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d8c43a1..860a80d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -429,7 +429,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface); + return IUnknown_AddRef(surface->texture_outer); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) @@ -438,7 +438,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) TRACE("iface %p.\n", iface); - return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface); + return IUnknown_AddRef(surface->texture_outer); } /***************************************************************************** @@ -659,18 +659,20 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { - struct ddraw_surface *This = impl_from_IDirect3DTexture2(iface); + struct ddraw_surface *surface = impl_from_IDirect3DTexture2(iface); + TRACE("iface %p.\n", iface); - return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); + return IUnknown_Release(surface->texture_outer); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { - struct ddraw_surface *This = impl_from_IDirect3DTexture(iface); + struct ddraw_surface *surface = impl_from_IDirect3DTexture(iface); + TRACE("iface %p.\n", iface); - return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); + return IUnknown_Release(surface->texture_outer); } /***************************************************************************** @@ -5733,14 +5735,17 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (version == 7) { surface->ref7 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface7_iface; } else if (version == 4) { surface->ref4 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface4_iface; } else { surface->ref1 = 1; + surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; } copy_to_surfacedesc2(&surface->surface_desc, desc);

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface ().
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 71aa7cd81edcfc4feae7cc0cfcbf9fcb27dfa542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71aa7cd81edcfc4feae7cc0cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 1 13:12:04 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DStateBlock9Impl_QueryInterface(). --- dlls/d3d9/stateblock.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 6ecf596..9123a1a 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -33,18 +33,18 @@ static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3D static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, REFIID riid, void **ppobj) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { + if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DStateBlock9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Hans Leidekker : msi: Implement MsiEnumComponentsEx.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 8cebf01702871fe73e9cc7e2b7960a47247f386f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cebf01702871fe73e9cc7e2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:12 2012 +0200 msi: Implement MsiEnumComponentsEx. --- dlls/msi/msi.spec | 4 +- dlls/msi/registry.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 6 ++ 3 files changed, 220 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 5f4a51f..8dc884a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -282,8 +282,8 @@ 286 stdcall MsiEndTransaction(long) 287 stub MsiJoinTransaction 288 stub MsiSetOfflineContextW -289 stub MsiEnumComponentsExA -290 stub MsiEnumComponentsExW +289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) +290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) 291 stub MsiEnumClientsExA 292 stub MsiEnumClientsExW 293 stub MsiGetComponentPathExA diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 0c72648..bc67ab2 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1235,6 +1235,218 @@ UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) return r; } +UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len ) +{ + UINT r; + WCHAR *user_sidW = NULL, *sidW = NULL, guidW[GUID_SIZE]; + + TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len); + + if (sid && !sid_len) return ERROR_INVALID_PARAMETER; + if (user_sid && !(user_sidW = strdupAtoW( user_sid ))) return ERROR_OUTOFMEMORY; + if (sid && !(sidW = msi_alloc( *sid_len * sizeof(WCHAR) ))) + { + msi_free( user_sidW ); + return ERROR_OUTOFMEMORY; + } + r = MsiEnumComponentsExW( user_sidW, ctx, index, guidW, installed_ctx, sidW, sid_len ); + if (r == ERROR_SUCCESS) + { + if (guid) WideCharToMultiByte( CP_ACP, 0, guidW, GUID_SIZE, guid, GUID_SIZE, NULL, NULL ); + if (sid) WideCharToMultiByte( CP_ACP, 0, sidW, *sid_len + 1, sid, *sid_len + 1, NULL, NULL ); + } + msi_free( user_sidW ); + msi_free( sidW ); + return r; +} + +static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + static const WCHAR componentsW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a','\\', + 'S','-','1','-','5','-','1','8','\\','C','o','m','p','o','n','e','n','t','s',0}; + UINT r = ERROR_SUCCESS; + WCHAR component[GUID_SIZE]; + DWORD i = 0, len_component; + REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; + HKEY key_components; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) + return ERROR_NO_MORE_ITEMS; + + len_component = sizeof(component)/sizeof(component[0]); + while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) + { + if (*idx == index) goto found; + (*idx)++; + len_component = sizeof(component)/sizeof(component[0]); + i++; + } + RegCloseKey( key_components ); + return ERROR_NO_MORE_ITEMS; + +found: + if (sid_len) + { + if (*sid_len < 1) + { + *sid_len = 1; + r = ERROR_MORE_DATA; + } + else if (sid) + { + *sid_len = 0; + sid[0] = 0; + } + } + if (guid) unsquash_guid( component, guid ); + if (installed_ctx) *installed_ctx = MSIINSTALLCONTEXT_MACHINE; + RegCloseKey( key_components ); + return r; +} + +static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, DWORD *idx, + WCHAR guid[39], MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, + LPDWORD sid_len ) +{ + static const WCHAR userdataW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a',0}; + static const WCHAR componentsW[] = {'\\','C','o','m','p','o','n','e','n','t','s',0}; + UINT r = ERROR_SUCCESS; + WCHAR path[MAX_PATH], component[GUID_SIZE], user[128]; + DWORD i = 0, j = 0, len_component, len_user; + REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; + HKEY key_users, key_components; + + if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: were to find these? */ + return ERROR_NO_MORE_ITEMS; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) + return ERROR_NO_MORE_ITEMS; + + len_user = sizeof(user)/sizeof(user[0]); + while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) + { + if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || + !strcmpW( szLocalSid, user )) + { + i++; + len_user = sizeof(user)/sizeof(user[0]); + continue; + } + strcpyW( path, user ); + strcatW( path, componentsW ); + if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) + { + i++; + len_user = sizeof(user)/sizeof(user[0]); + continue; + } + len_component = sizeof(component)/sizeof(component[0]); + while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) + { + if (*idx == index) goto found; + (*idx)++; + len_component = sizeof(component)/sizeof(component[0]); + j++; + } + RegCloseKey( key_components ); + len_user = sizeof(user)/sizeof(user[0]); + i++; + } + RegCloseKey( key_users ); + return ERROR_NO_MORE_ITEMS; + +found: + if (sid_len) + { + if (*sid_len < len_user + 1) + { + *sid_len = len_user + 1; + r = ERROR_MORE_DATA; + } + else if (sid) + { + *sid_len = len_user; + strcpyW( sid, user ); + } + } + if (guid) unsquash_guid( component, guid ); + if (installed_ctx) *installed_ctx = ctx; + RegCloseKey( key_components ); + RegCloseKey( key_users ); + return r; +} + +static UINT enum_components( const WCHAR *usersid, DWORD ctx, DWORD index, DWORD *idx, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + UINT r = ERROR_NO_MORE_ITEMS; + WCHAR *user = NULL; + + if (!usersid) + { + usersid = user = get_user_sid(); + if (!user) return ERROR_FUNCTION_FAILED; + } + if (ctx & MSIINSTALLCONTEXT_USERMANAGED) + { + r = fetch_user_component( usersid, MSIINSTALLCONTEXT_USERMANAGED, index, idx, guid, + installed_ctx, sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + if (ctx & MSIINSTALLCONTEXT_USERUNMANAGED) + { + r = fetch_user_component( usersid, MSIINSTALLCONTEXT_USERUNMANAGED, index, idx, guid, + installed_ctx, sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + if (ctx & MSIINSTALLCONTEXT_MACHINE) + { + r = fetch_machine_component( MSIINSTALLCONTEXT_MACHINE, index, idx, guid, installed_ctx, + sid, sid_len ); + if (r != ERROR_NO_MORE_ITEMS) goto done; + } + +done: + LocalFree( user ); + return r; +} + +UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +{ + UINT r; + DWORD idx = 0; + static DWORD last_index; + + TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len); + + if ((sid && !sid_len) || !ctx || (user_sid && ctx == MSIINSTALLCONTEXT_MACHINE)) + return ERROR_INVALID_PARAMETER; + + if (index && index - last_index != 1) + return ERROR_INVALID_PARAMETER; + + if (!index) last_index = 0; + + r = enum_components( user_sid, ctx, index, &idx, guid, installed_ctx, sid, sid_len ); + if (r == ERROR_SUCCESS) + last_index = index; + else + last_index = 0; + + return r; +} + UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct) { DWORD r; diff --git a/include/msi.h b/include/msi.h index 1afc89e..68b89d0 100644 --- a/include/msi.h +++ b/include/msi.h @@ -453,6 +453,12 @@ UINT WINAPI MsiEnumComponentsA(DWORD, LPSTR); UINT WINAPI MsiEnumComponentsW(DWORD, LPWSTR); #define MsiEnumComponents WINELIB_NAME_AW(MsiEnumComponents) +UINT WINAPI MsiEnumComponentsExA(LPCSTR, DWORD, DWORD, CHAR[39], + MSIINSTALLCONTEXT *, LPSTR, LPDWORD); +UINT WINAPI MsiEnumComponentsExW(LPCWSTR, DWORD, DWORD, WCHAR[39], + MSIINSTALLCONTEXT *, LPWSTR, LPDWORD); +#define MsiEnumComponentsEx WINELIB_NAME_AW(MsiEnumComponentsEx) + UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients)

1 0

Hans Leidekker : msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 25b7228274902fef682df818f70a5f675952d0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b7228274902fef682df818f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:30 2012 +0200 msi: Reimplement MsiEnumComponents on top of MsiEnumComponentsEx. --- dlls/msi/registry.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bc67ab2..31e7b4f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1205,7 +1205,9 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) DWORD r; WCHAR szwGuid[GUID_SIZE]; - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); + + if (!lpguid) return ERROR_INVALID_PARAMETER; r = MsiEnumComponentsW(index, szwGuid); if( r == ERROR_SUCCESS ) @@ -1216,23 +1218,11 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) { - HKEY hkey; - REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR szKeyName[SQUISH_GUID_SIZE]; - DWORD r; - - TRACE("%d %p\n", index, lpguid); + TRACE("%u, %p\n", index, lpguid); - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Components, 0, NULL, 0, access, NULL, &hkey, NULL); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + if (!lpguid) return ERROR_INVALID_PARAMETER; - r = RegEnumKeyW(hkey, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - unsquash_guid(szKeyName, lpguid); - - RegCloseKey(hkey); - return r; + return MsiEnumComponentsExW( szAllSid, MSIINSTALLCONTEXT_ALL, index, lpguid, NULL, NULL, NULL ); } UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39],

1 0

Hans Leidekker : msi/tests: Add tests for MsiEnumComponents and MsiEnumComponentsEx.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: f01cd3a36d3bce0706e6d2bea63838619a4312c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01cd3a36d3bce0706e6d2bea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 17:54:43 2012 +0200 msi/tests: Add tests for MsiEnumComponents and MsiEnumComponentsEx. --- dlls/msi/tests/msi.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index aaf1f42..f12af78 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -57,6 +57,8 @@ static UINT (WINAPI *pMsiGetPatchInfoExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, DWORD *); static UINT (WINAPI *pMsiEnumProductsExA) (LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT *, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiEnumComponentsExA) + (LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT *, LPSTR, LPDWORD); static void init_functionpointers(void) { @@ -79,6 +81,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiUseFeatureExA) GET_PROC(hmsi, MsiGetPatchInfoExA) GET_PROC(hmsi, MsiEnumProductsExA) + GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hadvapi32, ConvertSidToStringSidA) GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -11953,6 +11956,169 @@ static void test_MsiEnumProductsEx(void) LocalFree( usersid ); } +static void test_MsiEnumComponents(void) +{ + UINT r; + int found1, found2; + DWORD index; + char comp1[39], comp2[39], guid[39]; + char comp_squashed1[33], comp_squashed2[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH]; + REGSAM access = KEY_ALL_ACCESS; + char *usersid = get_user_sid(); + HKEY key1 = NULL, key2 = NULL; + + create_test_guid( comp1, comp_squashed1 ); + create_test_guid( comp2, comp_squashed2 ); + + if (is_wow64) access |= KEY_WOW64_64KEY; + + strcpy( keypath1, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath1, "S-1-5-18\\Components\\" ); + strcat( keypath1, comp_squashed1 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath2, usersid ); + strcat( keypath2, "\\Components\\" ); + strcat( keypath2, comp_squashed2 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + + r = MsiEnumComponentsA( 0, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + + index = 0; + guid[0] = 0; + found1 = found2 = 0; + while (!MsiEnumComponentsA( index, guid )) + { + if (!strcmp( guid, comp1 )) found1 = 1; + if (!strcmp( guid, comp2 )) found2 = 1; + ok( guid[0], "empty guid\n" ); + guid[0] = 0; + index++; + } + ok( found1, "comp1 not found\n" ); + ok( found2, "comp2 not found\n" ); + +done: + delete_key( key1, "", access ); + delete_key( key2, "", access ); + RegCloseKey( key1 ); + RegCloseKey( key2 ); + LocalFree( usersid ); +} + +static void test_MsiEnumComponentsEx(void) +{ + UINT r; + int found1, found2; + DWORD len, index; + MSIINSTALLCONTEXT context; + char comp1[39], comp2[39], guid[39], sid[128]; + char comp_squashed1[33], comp_squashed2[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH]; + HKEY key1 = NULL, key2 = NULL; + REGSAM access = KEY_ALL_ACCESS; + char *usersid = get_user_sid(); + + if (!pMsiEnumComponentsExA) + { + win_skip( "MsiEnumComponentsExA not implemented\n" ); + return; + } + create_test_guid( comp1, comp_squashed1 ); + create_test_guid( comp2, comp_squashed2 ); + + if (is_wow64) access |= KEY_WOW64_64KEY; + + strcpy( keypath1, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath1, "S-1-5-18\\Components\\" ); + strcat( keypath1, comp_squashed1 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\" ); + strcat( keypath2, usersid ); + strcat( keypath2, "\\Components\\" ); + strcat( keypath2, comp_squashed2 ); + + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); + if (r == ERROR_ACCESS_DENIED) + { + skip( "insufficient rights\n" ); + goto done; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + r = RegSetValueExA( key2, comp_squashed2, 0, REG_SZ, (const BYTE *)"c:\\doesnotexist", + sizeof("c:\\doesnotexist")); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + index = 0; + guid[0] = 0; + context = 0xdeadbeef; + sid[0] = 0; + len = sizeof(sid); + found1 = found2 = 0; + while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len )) + { + if (!strcmp( comp1, guid )) + { + ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context ); + ok( !sid[0], "got \"%s\"\n", sid ); + ok( !len, "unexpected length %u\n", len ); + found1 = 1; + } + if (!strcmp( comp2, guid )) + { + ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context ); + ok( sid[0], "empty sid\n" ); + ok( len == strlen(sid), "unexpected length %u\n", len ); + found2 = 1; + } + index++; + guid[0] = 0; + context = 0xdeadbeef; + sid[0] = 0; + len = sizeof(sid); + } + ok( found1, "comp1 not found\n" ); + ok( found2, "comp2 not found\n" ); + + r = pMsiEnumComponentsExA( NULL, 0, 0, NULL, NULL, NULL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + + r = pMsiEnumComponentsExA( NULL, MSIINSTALLCONTEXT_ALL, 0, NULL, NULL, sid, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r ); + +done: + RegDeleteValueA( key2, comp_squashed2 ); + delete_key( key1, "", access ); + delete_key( key2, "", access ); + RegCloseKey( key1 ); + RegCloseKey( key2 ); + LocalFree( usersid ); +} + START_TEST(msi) { init_functionpointers(); @@ -11986,6 +12152,8 @@ START_TEST(msi) test_MsiGetPatchInfo(); test_MsiEnumProducts(); test_MsiEnumProductsEx(); + test_MsiEnumComponents(); + test_MsiEnumComponentsEx(); } test_MsiGetFileVersion(); test_MsiGetFileSignatureInformation();

1 0