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

Francois Gouget : msi/tests: Avoid msi test failures when running in an account with insufficient privileges.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 601c5a1a68d93849214c75201d22861d0fd1c89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=601c5a1a68d93849214c75201… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:08:37 2014 +0100 msi/tests: Avoid msi test failures when running in an account with insufficient privileges. --- dlls/msi/tests/msi.c | 121 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 34 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index b65d131..1d63df5 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -42,6 +42,7 @@ static char PROG_FILES_DIR_NATIVE[MAX_PATH]; static char COMMON_FILES_DIR[MAX_PATH]; static char WINDOWS_DIR[MAX_PATH]; +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); @@ -100,6 +101,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hmsi, MsiSourceListGetInfoA) + GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA) GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -172,16 +174,38 @@ static BOOL delete_pf(const char *rel_path, BOOL is_file) static BOOL is_process_limited(void) { + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + PSID Group; + BOOL IsInGroup; HANDLE token; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - BOOL ret; - if (!pOpenProcessToken) return FALSE; - if (!pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) return FALSE; - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); + 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) + { + /* Only administrators have enough privileges for these tests */ + return TRUE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; } /* cabinet definitions */ @@ -1690,6 +1714,7 @@ static void test_MsiQueryProductState(void) { skip("Not enough rights to perform tests\n"); RegDeleteKeyA(userkey, ""); + RegCloseKey(userkey); LocalFree(usersid); return; } @@ -1724,6 +1749,14 @@ static void test_MsiQueryProductState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + RegDeleteKeyA(userkey, ""); + RegCloseKey(userkey); + LocalFree(usersid); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local product key exists */ @@ -2560,6 +2593,12 @@ static void test_MsiQueryComponentState(void) lstrcatA(keypath, "\\InstallProperties"); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + LocalFree(usersid); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local system product key exists */ @@ -10350,6 +10389,11 @@ static void test_MsiEnumPatchesEx_machine(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udprod, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + goto done; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* local UserData product key exists */ @@ -10577,15 +10621,17 @@ static void test_MsiEnumPatchesEx_machine(void) "Expected targetsid to be unchanged, got %s\n", targetsid); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + delete_key(hpatch, "", access & KEY_WOW64_64KEY); + RegCloseKey(hpatch); + delete_key(udpatch, "", access & KEY_WOW64_64KEY); + RegCloseKey(udpatch); + +done: RegDeleteValueA(patches, patch_squashed); RegDeleteValueA(patches, "Patches"); delete_key(patches, "", access & KEY_WOW64_64KEY); RegCloseKey(patches); RegDeleteValueA(hpatch, "State"); - delete_key(hpatch, "", access & KEY_WOW64_64KEY); - RegCloseKey(hpatch); - delete_key(udpatch, "", access & KEY_WOW64_64KEY); - RegCloseKey(udpatch); delete_key(udprod, "", access & KEY_WOW64_64KEY); RegCloseKey(udprod); delete_key(prodkey, "", access & KEY_WOW64_64KEY); @@ -12665,6 +12711,11 @@ static void test_MsiGetPatchInfo(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey_udproduct, NULL); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + goto done; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res); /* UserData product key exists */ @@ -12756,18 +12807,20 @@ static void test_MsiGetPatchInfo(void) RegCloseKey(hkey_udproductpatches); delete_key(hkey_udpatch, "", access & KEY_WOW64_64KEY); RegCloseKey(hkey_udpatch); - delete_key(hkey_patches, "", access & KEY_WOW64_64KEY); - RegCloseKey(hkey_patches); - delete_key(hkey_product, "", access & KEY_WOW64_64KEY); - RegCloseKey(hkey_product); - delete_key(hkey_patch, "", access & KEY_WOW64_64KEY); - RegCloseKey(hkey_patch); delete_key(hkey_udpatches, "", access & KEY_WOW64_64KEY); RegCloseKey(hkey_udpatches); delete_key(hkey_udprops, "", access & KEY_WOW64_64KEY); RegCloseKey(hkey_udprops); delete_key(hkey_udproduct, "", access & KEY_WOW64_64KEY); RegCloseKey(hkey_udproduct); + +done: + delete_key(hkey_patches, "", access & KEY_WOW64_64KEY); + RegCloseKey(hkey_patches); + delete_key(hkey_product, "", access & KEY_WOW64_64KEY); + RegCloseKey(hkey_product); + delete_key(hkey_patch, "", access & KEY_WOW64_64KEY); + RegCloseKey(hkey_patch); } static void test_MsiEnumProducts(void) @@ -12790,10 +12843,12 @@ static void test_MsiEnumProducts(void) if (is_wow64) access |= KEY_WOW64_64KEY; - strcpy(keypath1, "Software\\Classes\\Installer\\Products\\"); - strcat(keypath1, product_squashed1); + strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\"); + strcat(keypath2, usersid); + strcat(keypath2, "\\Installer\\Products\\"); + strcat(keypath2, product_squashed2); - r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL); + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL); if (r == ERROR_ACCESS_DENIED) { skip("Not enough rights to perform tests\n"); @@ -12802,12 +12857,10 @@ static void test_MsiEnumProducts(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\"); - strcat(keypath2, usersid); - strcat(keypath2, "\\Installer\\Products\\"); - strcat(keypath2, product_squashed2); + strcpy(keypath1, "Software\\Classes\\Installer\\Products\\"); + strcat(keypath1, product_squashed1); - r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL); + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\"); @@ -12921,10 +12974,12 @@ static void test_MsiEnumProductsEx(void) if (is_wow64) access |= KEY_WOW64_64KEY; - strcpy( keypath1, "Software\\Classes\\Installer\\Products\\" ); - strcat( keypath1, product_squashed1 ); + strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\" ); + strcat( keypath2, usersid ); + strcat( keypath2, "\\Installer\\Products\\" ); + strcat( keypath2, product_squashed2 ); - r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); if (r == ERROR_ACCESS_DENIED) { skip( "insufficient rights\n" ); @@ -12932,12 +12987,10 @@ static void test_MsiEnumProductsEx(void) } ok( r == ERROR_SUCCESS, "got %u\n", r ); - strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\" ); - strcat( keypath2, usersid ); - strcat( keypath2, "\\Installer\\Products\\" ); - strcat( keypath2, product_squashed2 ); + strcpy( keypath1, "Software\\Classes\\Installer\\Products\\" ); + strcat( keypath1, product_squashed1 ); - r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL ); + r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL ); ok( r == ERROR_SUCCESS, "got %u\n", r ); strcpy( keypath3, usersid );

1 0

Francois Gouget : msi/tests: Skip some package tests if in a non-administrator, non-power user account.
by Alexandre Julliard 05 Mar '14

05 Mar '14

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: Update is_process_limited() to deal with non-administrator accounts.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: f6ccfaa6f37e1e4bf8e269a88f0fc4661d8683f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ccfaa6f37e1e4bf8e269a88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:15:46 2014 +0100 msi/tests: Update is_process_limited() to deal with non-administrator accounts. --- dlls/msi/tests/action.c | 21 ++++++++++++++++++++- dlls/msi/tests/install.c | 21 ++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c6b45ec..047854b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -46,6 +46,7 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) static UINT (WINAPI *pMsiQueryFeatureStateExA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); +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); @@ -2238,6 +2239,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiQueryFeatureStateExA); + GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -2252,9 +2254,26 @@ 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) + { + /* Only administrators have enough privileges for these tests */ + return TRUE; + } if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3068c12..603042a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -43,6 +43,7 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); +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); @@ -2026,6 +2027,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiGetComponentPathExA); + GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) @@ -2040,9 +2042,26 @@ 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) + { + /* Only administrators have enough privileges for these tests */ + return TRUE; + } if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {

1 0

Francois Gouget : faultrep/tests: Update is_process_limited() to deal with non-administrator, non-power user accounts.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: c4ae0298d089e4499fdebe9e748d53efd910944d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ae0298d089e4499fdebe9e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 5 11:30:52 2014 +0100 faultrep/tests: Update is_process_limited() to deal with non-administrator, non-power user accounts. --- dlls/faultrep/tests/faultrep.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index e6961f9..d45c606 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -36,15 +36,50 @@ static const char regpath_exclude[] = "ExclusionList"; static BOOL is_process_limited(void) { + static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL) = NULL; static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + PSID Group; + BOOL IsInGroup; HANDLE token; if (!pOpenProcessToken) { HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - if (!pOpenProcessToken) + pCheckTokenMembership = (void*)GetProcAddress(hadvapi32, "CheckTokenMembership"); + if (!pCheckTokenMembership || !pOpenProcessToken) + { + /* Win9x (power to the masses) or NT4 (no way to know) */ + trace("missing pOpenProcessToken or CheckTokenMembership\n"); 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

Jacek Caban : wininet: Renamed read_mode_t to blocking_mode_t.
by Alexandre Julliard 05 Mar '14

05 Mar '14

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

Jacek Caban : wininet: Use blocking_mode_t instead of flags in NETCON_recv.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: 0767e06044abb17e56e4c4fca4f8b73ccfb18c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0767e06044abb17e56e4c4fca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:27:36 2014 +0100 wininet: Use blocking_mode_t instead of flags in NETCON_recv. --- dlls/wininet/http.c | 23 +++++++++++------------ dlls/wininet/internet.h | 9 +++++++-- dlls/wininet/netconnection.c | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1232d35..62faadd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -379,12 +379,6 @@ static LPHTTPHEADERW HTTP_GetHeader(http_request_t *req, LPCWSTR head) return &req->custHeaders[HeaderIndex]; } -typedef enum { - BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL -} blocking_mode_t; - struct data_stream_vtbl_t { DWORD (*get_avail_data)(data_stream_t*,http_request_t*); BOOL (*end_of_data)(data_stream_t*,http_request_t*); @@ -2497,7 +2491,7 @@ static DWORD read_more_data( http_request_t *req, int maxlen ) if (maxlen == -1) maxlen = sizeof(req->read_buf); res = NETCON_recv( req->netconn, req->read_buf + req->read_size, - maxlen - req->read_size, 0, &len ); + maxlen - req->read_size, BLOCKING_ALLOW, &len ); if(res == ERROR_SUCCESS) req->read_size += len; @@ -2654,10 +2648,15 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, } if(size && is_valid_netconn(req->netconn)) { - if((res = NETCON_recv(req->netconn, buf, size, blocking_mode == BLOCKING_WAITALL ? MSG_WAITALL : 0, &len))) + if((res = NETCON_recv(req->netconn, buf, size, blocking_mode, &len))) { len = 0; - if(!len) + if(blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK) + res = ERROR_SUCCESS; + else + netconn_stream->content_length = netconn_stream->content_read; + }else if(!len) { netconn_stream->content_length = netconn_stream->content_read; + } } netconn_stream->content_read += *read = len; @@ -2680,7 +2679,7 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) if(!avail) return FALSE; - if(NETCON_recv(req->netconn, buf, min(avail, sizeof(buf)), 0, &len) != ERROR_SUCCESS) + if(NETCON_recv(req->netconn, buf, min(avail, sizeof(buf)), BLOCKING_ALLOW, &len) != ERROR_SUCCESS) return FALSE; netconn_stream->content_read += len; @@ -2720,7 +2719,7 @@ static DWORD read_more_chunked_data(chunked_stream_t *stream, http_request_t *re if (maxlen == -1) maxlen = sizeof(stream->buf); res = NETCON_recv( req->netconn, stream->buf + stream->buf_size, - maxlen - stream->buf_size, 0, &len ); + maxlen - stream->buf_size, BLOCKING_ALLOW, &len ); if(res == ERROR_SUCCESS) stream->buf_size += len; @@ -2845,7 +2844,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, break; } - res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, 0, (int*)&read_bytes); + res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, BLOCKING_ALLOW, (int*)&read_bytes); if(res != ERROR_SUCCESS) break; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 28af0f7..a641340 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -438,14 +438,19 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; +typedef enum { + BLOCKING_ALLOW, + BLOCKING_DISALLOW, + BLOCKING_WAITALL +} blocking_mode_t; + DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, - int *recvd /* out */) DECLSPEC_HIDDEN; +DWORD NETCON_recv(netconn_t*,void*,size_t,blocking_mode_t,int*) DECLSPEC_HIDDEN; BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 86c9b08..4c97924 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -491,6 +491,14 @@ int sock_get_error( int err ) return err; } +static void set_socket_blocking(int socket, blocking_mode_t mode) +{ +#if defined(__MINGW32__) || defined (_MSC_VER) + ULONG arg = mode == BLOCKING_DISALLOW; + ioctlsocket(socket, FIONBIO, &arg); +#endif +} + static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; @@ -845,7 +853,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t mode, int *recvd) { *recvd = 0; if (!len) @@ -853,6 +861,22 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * if (!connection->secure) { + int flags = 0; + + switch(mode) { + case BLOCKING_ALLOW: + break; + case BLOCKING_DISALLOW: +#ifdef MSG_DONTWAIT + flags = MSG_DONTWAIT; +#endif + break; + case BLOCKING_WAITALL: + flags = MSG_WAITALL; + break; + } + + set_socket_blocking(connection->socket, mode); *recvd = recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } @@ -872,12 +896,16 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * connection->peek_msg_mem = connection->peek_msg = NULL; } /* check if we have enough data from the peek buffer */ - if(!(flags & MSG_WAITALL) || size == len) { + if(mode != BLOCKING_WAITALL || size == len) { *recvd = size; return ERROR_SUCCESS; } } + if(mode == BLOCKING_DISALLOW) + return WSAEWOULDBLOCK; /* FIXME: We can do better */ + set_socket_blocking(connection->socket, BLOCKING_ALLOW); + do { res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, &cread, &eof); if(!res) { @@ -893,7 +921,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * } size += cread; - }while(!size || ((flags & MSG_WAITALL) && size < len)); + }while(!size || (mode == BLOCKING_WAITALL && size < len)); TRACE("received %ld bytes\n", size); *recvd = size;

1 0

Jacek Caban : wininet: Improved non-blocking mode in secure NETCON_recv.
by Alexandre Julliard 05 Mar '14

05 Mar '14

Module: wine Branch: master Commit: d8948da1b4ede8f9425b8e42c3307a7eda273268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8948da1b4ede8f9425b8e42c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 5 18:27:53 2014 +0100 wininet: Improved non-blocking mode in secure NETCON_recv. --- dlls/wininet/netconnection.c | 102 ++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4c97924..fa07a9b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -86,6 +86,11 @@ #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ +#ifdef MSG_DONTWAIT +#define WINE_MSG_DONTWAIT MSG_DONTWAIT +#else +#define WINE_MSG_DONTWAIT 0 +#endif WINE_DEFAULT_DEBUG_CHANNEL(wininet); @@ -755,37 +760,53 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, } } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking_mode_t mode, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; - SSIZE_T size, buf_len; + SSIZE_T size, buf_len = 0; + blocking_mode_t tmp_mode; int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); + /* BLOCKING_WAITALL is handled by caller */ + if(mode == BLOCKING_WAITALL) + mode = BLOCKING_ALLOW; + if(conn->extra_len) { memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; conn->extra_len = 0; heap_free(conn->extra_buf); conn->extra_buf = NULL; - }else { - buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); - if(buf_len < 0) { - WARN("recv failed\n"); - return FALSE; - } + } + tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; + set_socket_blocking(conn->socket, tmp_mode); + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + if(size < 0) { if(!buf_len) { - *eof = TRUE; - return TRUE; + if(errno == EAGAIN || errno == EWOULDBLOCK) { + TRACE("would block\n"); + return WSAEWOULDBLOCK; + } + WARN("recv failed\n"); + return ERROR_INTERNET_CONNECTION_ABORTED; } + }else { + buf_len += size; + } + + *ret_size = buf_len; + + if(!buf_len) { + *eof = TRUE; + return ERROR_SUCCESS; } - *ret_size = 0; *eof = FALSE; do { @@ -801,19 +822,34 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * case SEC_I_CONTEXT_EXPIRED: TRACE("context expired\n"); *eof = TRUE; - return TRUE; + return ERROR_SUCCESS; case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); - if(size < 1) - return FALSE; + set_socket_blocking(conn->socket, mode); + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + if(size < 1) { + if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { + TRACE("would block\n"); + + /* FIXME: Optimize extra_buf usage. */ + conn->extra_buf = heap_alloc(buf_len); + if(!conn->extra_buf) + return ERROR_NOT_ENOUGH_MEMORY; + + conn->extra_len = buf_len; + memcpy(conn->extra_buf, conn->ssl_buf, conn->extra_len); + return WSAEWOULDBLOCK; + } + + return ERROR_INTERNET_CONNECTION_ABORTED; + } buf_len += size; continue; default: WARN("failed: %08x\n", res); - return FALSE; + return ERROR_INTERNET_CONNECTION_ABORTED; } } while(res != SEC_E_OK); @@ -825,7 +861,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * assert(!conn->peek_len); conn->peek_msg_mem = conn->peek_msg = heap_alloc(bufs[i].cbBuffer - size); if(!conn->peek_msg) - return FALSE; + return ERROR_NOT_ENOUGH_MEMORY; conn->peek_len = bufs[i].cbBuffer-size; memcpy(conn->peek_msg, (char*)bufs[i].pvBuffer+size, conn->peek_len); } @@ -838,14 +874,14 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * if(bufs[i].BufferType == SECBUFFER_EXTRA) { conn->extra_buf = heap_alloc(bufs[i].cbBuffer); if(!conn->extra_buf) - return FALSE; + return ERROR_NOT_ENOUGH_MEMORY; conn->extra_len = bufs[i].cbBuffer; memcpy(conn->extra_buf, bufs[i].pvBuffer, conn->extra_len); } } - return TRUE; + return ERROR_SUCCESS; } /****************************************************************************** @@ -867,9 +903,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t case BLOCKING_ALLOW: break; case BLOCKING_DISALLOW: -#ifdef MSG_DONTWAIT - flags = MSG_DONTWAIT; -#endif + flags = WINE_MSG_DONTWAIT; break; case BLOCKING_WAITALL: flags = MSG_WAITALL; @@ -883,7 +917,8 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t else { SIZE_T size = 0, cread; - BOOL res, eof; + BOOL eof; + DWORD res; if(connection->peek_msg) { size = min(len, connection->peek_len); @@ -900,18 +935,19 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t *recvd = size; return ERROR_SUCCESS; } - } - if(mode == BLOCKING_DISALLOW) - return WSAEWOULDBLOCK; /* FIXME: We can do better */ - set_socket_blocking(connection->socket, BLOCKING_ALLOW); + mode = BLOCKING_DISALLOW; + } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, &cread, &eof); - if(!res) { - WARN("read_ssl_chunk failed\n"); - if(!size) - return ERROR_INTERNET_CONNECTION_ABORTED; + res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, mode, &cread, &eof); + if(res != ERROR_SUCCESS) { + if(res == WSAEWOULDBLOCK) { + if(size) + res = ERROR_SUCCESS; + }else { + WARN("read_ssl_chunk failed\n"); + } break; } @@ -925,7 +961,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t TRACE("received %ld bytes\n", size); *recvd = size; - return ERROR_SUCCESS; + return res; } }

1 0

Daniel Lehman : ole32: Make some COM functions hot-patchable.
by Alexandre Julliard 05 Mar '14

05 Mar '14

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

Vincent Povirk : ole32: Use pstgPriority if specified in StgOpenStorage.
by Alexandre Julliard 05 Mar '14

05 Mar '14

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

Nikolay Sivov : msxml3: Added stub support for ISAXDTDHandler/ IVBSAXDTDHandler for MXWriter.
by Alexandre Julliard 05 Mar '14

05 Mar '14

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