March 2014 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Renamed read_mode_t to blocking_mode_t.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: ac58c3e8bcb34daea69f607a1cf74c50aa262ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac58c3e8bcb34daea69f607a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:27:22 2014 +0100 wininet: Renamed read_mode_t to blocking_mode_t. --- dlls/wininet/http.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac58c3e8bcb34daea69f6…

1 0

Henri Verbeet : wined3d: Recognize VMware SVGA3D.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 720f686874c6c8896eee36cfd89554243a406d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720f686874c6c8896eee36cfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:39 2014 +0100 wined3d: Recognize VMware SVGA3D. Unfortunately I was only able to test this by overriding the GL_RENDERER and GL_VENDOR strings returned by the driver. --- dlls/wined3d/directx.c | 58 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 11 +++++--- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a779af7..178b246 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -52,6 +52,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCE6, + DRIVER_VMWARE, DRIVER_UNKNOWN }; @@ -1168,6 +1169,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 12, 6658}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 12, 6658}, + + /* VMware */ + {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, }; struct gpu_description @@ -1296,6 +1300,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, + + /* VMware */ + {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, + /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_830M, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_855GM, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1616,6 +1624,9 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; + if (strstr(gl_renderer, "SVGA3D")) + return HW_VENDOR_VMWARE; + if (strstr(gl_vendor_string, "Mesa") || strstr(gl_vendor_string, "Brian Paul") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") @@ -2238,29 +2249,41 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return PCI_DEVICE_NONE; } +static enum wined3d_pci_device select_card_vmware(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +{ + if (strstr(gl_renderer, "SVGA3D")) + return CARD_VMWARE_SVGA3D; + + return PCI_DEVICE_NONE; +} + static const struct gl_vendor_selection { enum wined3d_gl_vendor gl_vendor; const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ enum wined3d_pci_device (*select_card)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); } +amd_gl_vendor_table[] = +{ + {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", select_card_amd_binary}, + {GL_VENDOR_FGLRX, "AMD/ATI binary driver", select_card_amd_binary}, + {GL_VENDOR_MESA, "Mesa AMD/ATI driver", select_card_amd_mesa}, +}, nvidia_gl_vendor_table[] = { - {GL_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, - {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, - {GL_VENDOR_MESA, "Mesa Nouveau driver", select_card_nvidia_mesa}, + {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, + {GL_VENDOR_MESA, "Mesa Nouveau driver", select_card_nvidia_mesa}, + {GL_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, }, -amd_gl_vendor_table[] = +vmware_gl_vendor_table[] = { - {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", select_card_amd_binary}, - {GL_VENDOR_FGLRX, "AMD/ATI binary driver", select_card_amd_binary}, - {GL_VENDOR_MESA, "Mesa AMD/ATI driver", select_card_amd_mesa}, + {GL_VENDOR_MESA, "VMware driver", select_card_vmware}, }, intel_gl_vendor_table[] = { - {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", select_card_intel}, - {GL_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, - {GL_VENDOR_MESA, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", select_card_intel}, + {GL_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_MESA, "Mesa Intel driver", select_card_intel}, }; static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_gl_info *gl_info) @@ -2333,14 +2356,17 @@ static const struct } card_vendor_table[] = { - {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, - sizeof(nvidia_gl_vendor_table) / sizeof(nvidia_gl_vendor_table[0]), + {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, + sizeof(amd_gl_vendor_table) / sizeof(*amd_gl_vendor_table), + select_card_fallback_amd}, + {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, + sizeof(nvidia_gl_vendor_table) / sizeof(*nvidia_gl_vendor_table), select_card_fallback_nvidia}, - {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, - sizeof(amd_gl_vendor_table) / sizeof(amd_gl_vendor_table[0]), + {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, + sizeof(vmware_gl_vendor_table) / sizeof(*vmware_gl_vendor_table), select_card_fallback_amd}, - {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, - sizeof(intel_gl_vendor_table) / sizeof(intel_gl_vendor_table[0]), + {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, + sizeof(intel_gl_vendor_table) / sizeof(*intel_gl_vendor_table), select_card_fallback_intel}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ceb6f1..60088e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1350,10 +1350,11 @@ struct wined3d_pixel_format enum wined3d_pci_vendor { - HW_VENDOR_SOFTWARE = 0x0000, - HW_VENDOR_AMD = 0x1002, - HW_VENDOR_NVIDIA = 0x10de, - HW_VENDOR_INTEL = 0x8086, + HW_VENDOR_SOFTWARE = 0x0000, + HW_VENDOR_AMD = 0x1002, + HW_VENDOR_NVIDIA = 0x10de, + HW_VENDOR_VMWARE = 0x15ad, + HW_VENDOR_INTEL = 0x8086, }; enum wined3d_pci_device @@ -1475,6 +1476,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, + CARD_VMWARE_SVGA3D = 0x0405, + CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582, CARD_INTEL_845G = 0x2562,

1 0

Henri Verbeet : ddraw/tests: Add a test for creating surfaces with an explicit pitch.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 75935f9499d33bf1c5a0200257b45d728b025a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75935f9499d33bf1c5a020025… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:37 2014 +0100 ddraw/tests: Add a test for creating surfaces with an explicit pitch. --- dlls/ddraw/tests/ddraw1.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 404 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75935f9499d33bf1c5a02…

1 0

Henri Verbeet : ddraw/tests: Avoid using EnumDevices() to get a supported Z buffer format.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 9ee120f108333ff53bb96ac36131d2d776a02fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee120f108333ff53bb96ac36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 5 10:46:38 2014 +0100 ddraw/tests: Avoid using EnumDevices() to get a supported Z buffer format. --- dlls/ddraw/tests/ddraw1.c | 112 +++++++++++++++++++-------------------------- dlls/ddraw/tests/ddraw2.c | 97 ++++++++++++++++++++------------------- 2 files changed, 96 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ee120f108333ff53bb96…

1 0

Francois Gouget : msi/tests: Skip some package tests if in a non-administrator, non-power user account.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 38aa71b2c6eaa27b8760d0c66d4bc7bcdb5ef82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38aa71b2c6eaa27b8760d0c66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:14:10 2014 +0100 msi/tests: Skip some package tests if in a non-administrator, non-power user account. --- dlls/msi/tests/package.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 935a0fd..d5c37ea 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -41,6 +41,7 @@ static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); +static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); @@ -68,6 +69,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hshell32, SHGetFolderPathA); + GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -85,9 +87,38 @@ static void init_functionpointers(void) static BOOL is_process_limited(void) { + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + PSID Group; + BOOL IsInGroup; HANDLE token; - if (!pOpenProcessToken) return FALSE; + if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; + + if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, &Group) || + !pCheckTokenMembership(NULL, Group, &IsInGroup)) + { + trace("Could not check if the current user is an administrator\n"); + return FALSE; + } + if (!IsInGroup) + { + if (!AllocateAndInitializeSid(&NtAuthority, 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_POWER_USERS, + 0, 0, 0, 0, 0, 0, &Group) || + !pCheckTokenMembership(NULL, Group, &IsInGroup)) + { + trace("Could not check if the current user is a power user\n"); + return FALSE; + } + if (!IsInGroup) + { + /* Only administrators and power users can be powerful */ + return TRUE; + } + } if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {

1 0

Francois Gouget : msi/tests: Avoid source test failures when running in an account with insufficient privileges.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 65bacd4b696db63a57986b4310d27ad8e9cecc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bacd4b696db63a57986b431… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:07:13 2014 +0100 msi/tests: Avoid source test failures when running in an account with insufficient privileges. --- dlls/msi/tests/source.c | 48 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b429c10..9fddd90 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1014,19 +1014,24 @@ machine_tests: r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_ACCESS_DENIED) + skip("MsiSourceListAddSourceEx (insufficient privileges)\n"); + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegOpenKeyExA(prodkey, "SourceList\\URL", 0, access, &url); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - size = MAX_PATH; - res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value); - ok(size == 11, "Expected 11, got %d\n", size); + size = MAX_PATH; + res = RegQueryValueExA(url, "1", NULL, NULL, (LPBYTE)value, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!lstrcmpA(value, "C:\\source/"), "Expected 'C:\\source/', got %s\n", value); + ok(size == 11, "Expected 11, got %d\n", size); - RegCloseKey(url); - RegCloseKey(prodkey); + RegCloseKey(url); + RegCloseKey(prodkey); + } LocalFree(usersid); } @@ -2050,6 +2055,11 @@ machine_tests: r = pMsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHA, "path"); + if (r == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListSetInfo (insufficient privileges)\n"); + goto done; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media key is created by MsiSourceListSetInfo */ @@ -2063,10 +2073,11 @@ machine_tests: INSTALLPROPERTY_MEDIAPACKAGEPATHA, "path"); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - RegDeleteValueA(media, "MediaPackage"); delete_key(media, "", access); RegCloseKey(media); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access); @@ -2361,6 +2372,11 @@ machine_tests: r = pMsiSourceListAddMediaDiskA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, 1, "label", "prompt"); + if (r == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListAddMediaDisk (insufficient privileges)\n"); + goto done; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* Media subkey is created by MsiSourceListAddMediaDisk */ @@ -2375,10 +2391,11 @@ machine_tests: MSICODE_PRODUCT, 1, "label", "prompt"); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - RegDeleteValueA(media, "1"); delete_key(media, "", access); RegCloseKey(media); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access); @@ -3452,6 +3469,11 @@ machine_tests: /* Net key is created */ res = RegOpenKeyExA(source, "Net", 0, access, &net); + if (res == ERROR_ACCESS_DENIED) + { + skip("MsiSourceListAddSource (insufficient privileges)\n"); + goto done; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(net, "1", "source\\"); @@ -3467,6 +3489,8 @@ machine_tests: RegDeleteValueA(net, "1"); delete_key(net, "", access); RegCloseKey(net); + +done: delete_key(source, "", access); RegCloseKey(source); delete_key(prodkey, "", access);

1 0

Nikolay Sivov : msxml3: Fix return values for some methods needed by SAX reader.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 3cce31b1324513c7f2d6c9d4ba5fe9e5ca7cf834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cce31b1324513c7f2d6c9d4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:40:20 2014 +0400 msxml3: Fix return values for some methods needed by SAX reader. --- dlls/msxml3/mxwriter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d38e837..a0c2a2b 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1155,8 +1155,8 @@ static HRESULT WINAPI SAXContentHandler_startPrefixMapping( int nuri) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s)\n", This, debugstr_wn(prefix, nprefix), debugstr_wn(uri, nuri)); - return E_NOTIMPL; + TRACE("(%p)->(%s %s)\n", This, debugstr_wn(prefix, nprefix), debugstr_wn(uri, nuri)); + return S_OK; } static HRESULT WINAPI SAXContentHandler_endPrefixMapping( @@ -1165,8 +1165,8 @@ static HRESULT WINAPI SAXContentHandler_endPrefixMapping( int nprefix) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(prefix, nprefix)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_wn(prefix, nprefix)); + return S_OK; } static HRESULT WINAPI SAXContentHandler_startElement( @@ -2007,8 +2007,8 @@ static HRESULT WINAPI VBSAXContentHandler_Invoke(IVBSAXContentHandler *iface, DI static HRESULT WINAPI VBSAXContentHandler_putref_documentLocator(IVBSAXContentHandler *iface, IVBSAXLocator *locator) { mxwriter *This = impl_from_IVBSAXContentHandler( iface ); - FIXME("(%p)->(%p): stub\n", This, locator); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, locator); + return S_OK; } static HRESULT WINAPI VBSAXContentHandler_startDocument(IVBSAXContentHandler *iface)

1 0

Nikolay Sivov : msxml3: Added stub support for ISAXDTDHandler/ IVBSAXDTDHandler for MXWriter.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 71ecd3b422daef6926f270e8f8d260929c1a6b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ecd3b422daef6926f270e8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 5 10:39:39 2014 +0400 msxml3: Added stub support for ISAXDTDHandler/IVBSAXDTDHandler for MXWriter. --- dlls/msxml3/mxwriter.c | 156 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 121 +++++++++----------------------- 2 files changed, 190 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71ecd3b422daef6926f27…

1 0

Vincent Povirk : ole32: Use pstgPriority if specified in StgOpenStorage.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: 2e384c4f95a259434a69ec058773428357ee62a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e384c4f95a259434a69ec058… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 4 14:45:27 2014 -0600 ole32: Use pstgPriority if specified in StgOpenStorage. --- dlls/ole32/storage32.c | 12 ++++++++++++ dlls/ole32/tests/storage32.c | 43 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9c71f85..debdbbf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7609,11 +7609,21 @@ HRESULT WINAPI StgOpenStorage( HANDLE hFile = 0; DWORD shareMode; DWORD accessMode; + LPWSTR temp_name = NULL; TRACE("(%s, %p, %x, %p, %d, %p)\n", debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstgOpen); + if (pstgPriority) + { + /* FIXME: Copy ILockBytes instead? But currently for STGM_PRIORITY it'll be read-only. */ + hr = StorageBaseImpl_GetFilename((StorageBaseImpl*)pstgPriority, &temp_name); + if (FAILED(hr)) goto end; + pwcsName = temp_name; + TRACE("using filename %s\n", debugstr_w(temp_name)); + } + if (pwcsName == 0) { hr = STG_E_INVALIDNAME; @@ -7775,6 +7785,8 @@ HRESULT WINAPI StgOpenStorage( *ppstgOpen = &newStorage->IStorage_iface; end: + CoTaskMemFree(temp_name); + if (pstgPriority) IStorage_Release(pstgPriority); TRACE("<-- %08x, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL); return hr; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b298f8d..a14f19b 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -929,7 +929,48 @@ static void test_storage_refcount(void) r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); } - IStorage_Release(stgprio); + + /* Multiple STGM_PRIORITY opens are possible. */ + r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); + if(stg) + { + r = IStorage_Release(stg); + ok(r == 0, "wrong ref count\n"); + } + + r = StgOpenStorage( NULL, stgprio, STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); + if(stg) + { + static const WCHAR stgname[] = { ' ',' ',' ','2','9',0 }; + IStorage *stg2; + STATSTG statstg; + + r = IStorage_Stat( stg, &statstg, STATFLAG_NONAME ); + ok(r == S_OK, "Stat should have succeeded instead of returning 0x%08x\n", r); + ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %d\n", statstg.type); + ok(U(statstg.cbSize).LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %d\n", U(statstg.cbSize).LowPart); + ok(U(statstg.cbSize).HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %d\n", U(statstg.cbSize).HighPart); + ok(statstg.grfMode == (STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE), + "Statstg grfMode should have been 0x10022 instead of 0x%x\n", statstg.grfMode); + ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %d\n", statstg.grfLocksSupported); + ok(IsEqualCLSID(&statstg.clsid, &test_stg_cls), "Statstg clsid is not test_stg_cls\n"); + ok(statstg.grfStateBits == 0, "Statstg grfStateBits should have been 0 instead of %d\n", statstg.grfStateBits); + ok(statstg.reserved == 0, "Statstg reserved should have been 0 instead of %d\n", statstg.reserved); + + r = IStorage_CreateStorage( stg, stgname, STGM_SHARE_EXCLUSIVE, 0, 0, &stg2 ); + ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08x\n", r); + + IStorage_Release(stg2); + + r = IStorage_Commit( stg, 0 ); + ok(r == S_OK, "Commit should have succeeded instead of returning 0x%08x\n", r); + + r = IStorage_Release(stg); + ok(r == 0, "wrong ref count\n"); + } + /* IStorage_Release(stgprio) not necessary because StgOpenStorage released it. */ DeleteFileA(filenameA); }

1 0

Daniel Lehman : ole32: Make some COM functions hot-patchable.
by Alexandre Julliard March 5, 2014

March 5, 2014

Module: wine Branch: master Commit: cdc03fa9b84fd4affb2fcfafbe849909593af019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc03fa9b84fd4affb2fcfafb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Dec 19 16:16:29 2013 -0800 ole32: Make some COM functions hot-patchable. --- dlls/ole32/compobj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8ded196..51c0b20 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2369,7 +2369,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey * E_OUTOFMEMORY * REGDB_E_CLASSNOTREG if the given clsid has no associated ProgID */ -HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) +HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) { static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; ACTCTX_SECTION_KEYED_DATA data; @@ -2441,7 +2441,7 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) * Success: S_OK * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. */ -HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) +HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { ACTCTX_SECTION_KEYED_DATA data; @@ -2921,7 +2921,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da * SEE ALSO * CoCreateInstance() */ -HRESULT WINAPI CoGetClassObject( +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv) { @@ -3254,7 +3254,7 @@ static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi) /*********************************************************************** * CoCreateInstanceEx [OLE32.@] */ -HRESULT WINAPI CoCreateInstanceEx( +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, @@ -3493,7 +3493,7 @@ void WINAPI CoFreeAllLibraries(void) * SEE ALSO * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary */ -void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) { struct apartment *apt = COM_CurrentApt(); if (!apt) @@ -3517,7 +3517,7 @@ void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) * SEE ALSO * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary */ -void WINAPI CoFreeUnusedLibraries(void) +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) { CoFreeUnusedLibrariesEx(INFINITE, 0); }

1 0