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

Akihiro Sagawa : ole32: Search 32-bit registry in 64-bit CoGetPSClsid and vice versa.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: efdaa4a17a4a2582123e83da80a03f401e8146e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdaa4a17a4a2582123e83da8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:41 2014 +0900 ole32: Search 32-bit registry in 64-bit CoGetPSClsid and vice versa. --- dlls/ole32/compobj.c | 60 ++++++++++++++++++++++++++-------------------- dlls/ole32/tests/compobj.c | 4 ++-- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index acfb630..1fab04f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2491,6 +2491,28 @@ HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) return CLSIDFromProgID(progid, clsid); } +static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) +{ + HKEY hkey; + WCHAR value[CHARS_IN_GUID]; + DWORD len; + + access |= KEY_READ; + + if (open_classes_key(HKEY_CLASSES_ROOT, path, access, &hkey)) + return REGDB_E_IIDNOTREG; + + len = sizeof(value); + if (ERROR_SUCCESS != RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)value, &len)) + return REGDB_E_IIDNOTREG; + RegCloseKey(hkey); + + if (CLSIDFromString(value, pclsid) != NOERROR) + return REGDB_E_IIDNOTREG; + + return S_OK; +} + /***************************************************************************** * CoGetPSClsid [OLE32.@] * @@ -2532,12 +2554,12 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; - WCHAR value[CHARS_IN_GUID]; - LONG len; - HKEY hkey; APARTMENT *apt = COM_CurrentApt(); struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; + HRESULT hr; + REGSAM opposite = (sizeof(void*) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); @@ -2576,31 +2598,17 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); - /* Open the key.. */ - if (open_classes_key(HKEY_CLASSES_ROOT, path, KEY_READ, &hkey)) - { - WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); - return REGDB_E_IIDNOTREG; - } + hr = get_ps_clsid_from_registry(path, 0, pclsid); + if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = get_ps_clsid_from_registry(path, opposite, pclsid); - /* ... Once we have the key, query the registry to get the - value of CLSID as a string, and convert it into a - proper CLSID structure to be passed back to the app */ - len = sizeof(value); - if (ERROR_SUCCESS != RegQueryValueW(hkey, NULL, value, &len)) - { - RegCloseKey(hkey); - return REGDB_E_IIDNOTREG; - } - RegCloseKey(hkey); - - /* We have the CLSID we want back from the registry as a string, so - let's convert it into a CLSID structure */ - if (CLSIDFromString(value, pclsid) != NOERROR) - return REGDB_E_IIDNOTREG; + if (hr == S_OK) + TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); + else + WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); - TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); - return S_OK; + return hr; } /***************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b789794..1dfa9fb 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1162,8 +1162,8 @@ static void test_CoGetPSClsid(void) RegCloseKey(hkey_psclsid); hr = CoGetPSClsid(&IID_DeadBeef, &clsid); - todo_wine ok_ole_success(hr, "CoGetPSClsid"); - todo_wine ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); res = pRegDeleteKeyExA(hkey, "ProxyStubClsid32", opposite, 0); ok(!res, "RegDeleteKeyEx returned %d\n", res);

1 0

Akihiro Sagawa : oleaut32/tests: Add registry view flag to myRegDeleteTreeW like RegDeleteKeyEx.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: eb95ad074f4af5b847b6b2ea298c4db20d2d4e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb95ad074f4af5b847b6b2ea2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:43 2014 +0900 oleaut32/tests: Add registry view flag to myRegDeleteTreeW like RegDeleteKeyEx. --- dlls/oleaut32/tests/typelib.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 312195b..492975d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -75,6 +75,7 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); +static LONG (WINAPI *pRegDeleteKeyExW)(HKEY,LPCWSTR,REGSAM,DWORD); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; @@ -166,6 +167,7 @@ static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("oleaut32.dll"); HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadv = GetModuleHandleA("advapi32.dll"); pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); @@ -174,6 +176,7 @@ static void init_function_pointers(void) pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); + pRegDeleteKeyExW = (void*)GetProcAddress(hadv, "RegDeleteKeyExW"); } static void ref_count_test(LPCWSTR type_lib) @@ -1154,18 +1157,19 @@ static void test_DispCallFunc(void) ok(V_VT(&result) == 0xcccc, "V_VT(result) = %u\n", V_VT(&result)); } -/* RegDeleteTreeW from dlls/advapi32/registry.c */ -static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +/* RegDeleteTreeW from dlls/advapi32/registry.c, plus additional view flag */ +static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey, REGSAM view) { LONG ret; DWORD dwMaxSubkeyLen, dwMaxValueLen; DWORD dwMaxLen, dwSize; WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; HKEY hSubKey = hKey; + view &= (KEY_WOW64_64KEY | KEY_WOW64_32KEY); if(lpszSubKey) { - ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ | view, &hSubKey); if (ret) return ret; } @@ -1193,12 +1197,15 @@ static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL)) break; - ret = myRegDeleteTreeW(hSubKey, lpszName); + ret = myRegDeleteTreeW(hSubKey, lpszName, view); if (ret) goto cleanup; } if (lpszSubKey) - ret = RegDeleteKeyW(hKey, lpszSubKey); + if (pRegDeleteKeyExW && view != 0) + ret = pRegDeleteKeyExW(hKey, lpszSubKey, view, 0); + else + ret = RegDeleteKeyW(hKey, lpszSubKey); else while (TRUE) { @@ -1233,7 +1240,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, DWORD arch, LPCWST if (remove) { - ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); + ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf, 0) == ERROR_SUCCESS, "SHDeleteKey failed\n"); return TRUE; }

1 0

Akihiro Sagawa : oleaut32/tests: Add more test cases that proxy stub interface is on one side.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 8b0b6f90afb98be8345b654e187256307add794d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0b6f90afb98be8345b654e1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:44 2014 +0900 oleaut32/tests: Add more test cases that proxy stub interface is on one side. --- dlls/oleaut32/tests/typelib.c | 114 ++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 492975d..eb0c6e6 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5337,10 +5337,9 @@ IUnknown uk = {&vt}; static void test_stub(void) { + BOOL is_wow64 = FALSE; + DWORD *sam_list; HRESULT hr; - CLSID clsid; - IPSFactoryBuffer *factory; - IRpcStubBuffer *base_stub; ITypeLib *stdole; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; @@ -5349,14 +5348,22 @@ static void test_stub(void) HREFTYPE href; char filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; - HKEY hkey; - LONG lr; + int i; static const GUID libguid = {0x3b9ff02e,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID coclassguid = {0x3b9ff030,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static OLECHAR interfaceW[] = {'i','n','t','e','r','f','a','c','e',0}; static OLECHAR classW[] = {'c','l','a','s','s',0}; + static DWORD sam_list32[] = { 0, ~0 }; + static DWORD sam_list64[] = { 0, KEY_WOW64_32KEY, KEY_WOW64_64KEY, ~0 }; + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + if (is_wow64 || is_win64) + sam_list = sam_list64; + else + sam_list = sam_list32; CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -5421,41 +5428,86 @@ static void test_stub(void) hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); ok(hr == S_OK, "got %08x\n", hr); - hr = RegisterTypeLib(tl, filenameW, NULL); - if (hr == TYPE_E_REGISTRYACCESS) + for (i = 0; sam_list[i] != ~0; i++) { - win_skip("Insufficient privileges to register typelib in the registry\n"); - ITypeLib_Release(tl); - DeleteFileW(filenameW); - CoUninitialize(); - return; - } - ok(hr == S_OK, "got %08x\n", hr); + IPSFactoryBuffer *factory; + IRpcStubBuffer *base_stub; + REGSAM side = sam_list[i]; + CLSID clsid; + HKEY hkey; + LONG lr; + + hr = RegisterTypeLib(tl, filenameW, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + break; + } + ok(hr == S_OK, "got %08x, side: %04x\n", hr, side); - ITypeLib_Release(tl); - ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); + /* SYS_WIN32 typelibs should be registered only as 32-bit */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u, side: %04x\n", lr, side); - /* SYS_WIN32 typelibs should be registered only as 32-bit */ - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ, &hkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u\n", lr); + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "got wrong return code: %u\n", lr); - RegCloseKey(hkey); + /* Simulate pre-win7 installers that create interface key on one side */ + if (side != 0) + { + WCHAR guidW[40]; + REGSAM opposite = side ^ (KEY_WOW64_64KEY | KEY_WOW64_32KEY); + + StringFromGUID2(&interfaceguid, guidW, sizeof(guidW)/sizeof(guidW[0])); + + /* Delete the opposite interface key */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + lr = myRegDeleteTreeW(hkey, guidW, opposite); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + + /* Is our side interface key affected by above operation? */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface\\{3b9ff02f-9675-4861-b781-ceaea4782acc}", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND), "got wrong return code: %u, side: %04x\n", lr, side); + if (lr == ERROR_FILE_NOT_FOUND) + { + /* win2k3, vista, 2008 */ + win_skip("Registry reflection is enabled on this platform.\n"); + goto next; + } + RegCloseKey(hkey); - hr = CoGetPSClsid(&interfaceguid, &clsid); - ok(hr == S_OK, "got: %x\n", hr); + /* Opposite side typelib key still exists */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + } - hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, - &IID_IPSFactoryBuffer, (void **)&factory); - ok(hr == S_OK, "got: %x\n", hr); + hr = CoGetPSClsid(&interfaceguid, &clsid); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); - ok(hr == S_OK, "got: %x\n", hr); + hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, + &IID_IPSFactoryBuffer, (void **)&factory); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - IPSFactoryBuffer_Release(factory); + hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); + if ((is_win64 && side == KEY_WOW64_32KEY) + || (is_wow64 && side == KEY_WOW64_64KEY)) + todo_wine ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + else + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + + IPSFactoryBuffer_Release(factory); + next: + hr = UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + } + + ITypeLib_Release(tl); + ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); - UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); DeleteFileW(filenameW); CoUninitialize();

1 0

Akihiro Sagawa : oleaut32: Use the alternate interface key if not present on current view.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 75c02048713ba398a078d5ecc51ef9f77c0f47a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c02048713ba398a078d5ecc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:46 2014 +0900 oleaut32: Use the alternate interface key if not present on current view. --- dlls/oleaut32/tests/typelib.c | 6 +----- dlls/oleaut32/tmarshal.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index eb0c6e6..49057a4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5493,11 +5493,7 @@ static void test_stub(void) ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); - if ((is_win64 && side == KEY_WOW64_32KEY) - || (is_wow64 && side == KEY_WOW64_64KEY)) - todo_wine ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - else - ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); IPSFactoryBuffer_Release(factory); next: diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index ee2a95b..b812215 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -270,11 +270,13 @@ static HRESULT _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { HRESULT hres; HKEY ikey; + REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; char tlguid[200],typelibkey[300],interfacekey[300],ver[100]; char tlfn[260]; OLECHAR tlfnW[260]; DWORD tlguidlen, verlen, type; - LONG tlfnlen; + LONG tlfnlen, err; ITypeLib *tl; sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib", @@ -283,9 +285,14 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - if (RegOpenKeyA(HKEY_CLASSES_ROOT,interfacekey,&ikey)) { - ERR("No %s key found.\n",interfacekey); - return E_FAIL; + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ,&ikey); + if (err && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) + && is_wow64))) { + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ|opposite,&ikey); + } + if (err) { + ERR("No %s key found.\n",interfacekey); + return E_FAIL; } tlguidlen = sizeof(tlguid); if (RegQueryValueExA(ikey,NULL,NULL,&type,(LPBYTE)tlguid,&tlguidlen)) {

1 0

Jacek Caban : wininet: Added new cookie_set_t type and use it in get_cookie.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: e24ce4c128d91f7eb0bf727246ec36eb2fbc4092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24ce4c128d91f7eb0bf72724… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 15 17:13:03 2014 +0200 wininet: Added new cookie_set_t type and use it in get_cookie. --- dlls/wininet/cookie.c | 158 +++++++++++++++++++++++++++++++++--------------- dlls/wininet/http.c | 17 ++---- dlls/wininet/internet.h | 2 +- 3 files changed, 114 insertions(+), 63 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2c8dd84..d98a127 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -555,15 +555,23 @@ static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName return TRUE; } -DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size, DWORD flags) +typedef struct { + cookie_t **cookies; + unsigned cnt; + unsigned size; + + unsigned string_len; +} cookie_set_t; + +static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cookie_set_t *res) { static const WCHAR empty_path[] = { '/',0 }; - unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; + unsigned len; FILETIME tm; GetSystemTimeAsFileTime(&tm); @@ -600,8 +608,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD return ERROR_NO_MORE_ITEMS; } - ptr = cookie_data; - for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); @@ -613,7 +619,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if(!cookie_match_path(container, path)) continue; - domain_count++; TRACE("found domain %p\n", domain->domain); LIST_FOR_EACH_SAFE(cursor, cursor2, &container->cookie_list) { @@ -630,62 +635,93 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if (cookie_count) - cnt += 2; /* '; ' */ - cnt += name_len = strlenW(cookie_iter->name); - if ((len = strlenW(cookie_iter->data))) { - cnt += 1; /* = */ - cnt += len; + if(res->size) { + cookie_t **new_cookies = heap_realloc(res->cookies, res->size*2*sizeof(*res->cookies)); + if(!new_cookies) + continue; + res->cookies = new_cookies; + res->size *= 2; + }else { + res->cookies = heap_alloc(4*sizeof(*res->cookies)); + if(!res->cookies) + continue; + res->size = 4; } - if(ptr) { - if(*size > cnt) { - if(cookie_count) { - *ptr++ = ';'; - *ptr++ = ' '; - } + if(res->cnt) + res->string_len += 2; /* '; ' */ + res->cookies[res->cnt++] = cookie_iter; - memcpy(ptr, cookie_iter->name, name_len*sizeof(WCHAR)); - ptr += name_len; - - if(len) { - *ptr++ = '='; - memcpy(ptr, cookie_iter->data, len*sizeof(WCHAR)); - ptr += len; - } - - assert(cookie_data+cnt == ptr); - TRACE("Cookie: %s\n", debugstr_wn(cookie_data, cnt)); - }else { - /* Stop writing data, just compute the size */ - ptr = NULL; - } - } - - cookie_count++; + res->string_len += strlenW(cookie_iter->name); + if(*cookie_iter->data) + res->string_len += 1 /* = */ + strlenW(cookie_iter->data); } } } LeaveCriticalSection(&cookie_cs); + return ERROR_SUCCESS; +} - if(ptr) - *ptr = 0; +static void cookie_set_to_string(const cookie_set_t *cookie_set, WCHAR *str) +{ + WCHAR *ptr = str; + unsigned i, len; - if (!cnt) { - TRACE("no cookies found for %s\n", debugstr_w(host)); - return ERROR_NO_MORE_ITEMS; + for(i=0; i<cookie_set->cnt; i++) { + if(i) { + *ptr++ = ';'; + *ptr++ = ' '; + } + + len = strlenW(cookie_set->cookies[i]->name); + memcpy(ptr, cookie_set->cookies[i]->name, len*sizeof(WCHAR)); + ptr += len; + + if(*cookie_set->cookies[i]->data) { + *ptr++ = '='; + len = strlenW(cookie_set->cookies[i]->data); + memcpy(ptr, cookie_set->cookies[i]->data, len*sizeof(WCHAR)); + ptr += len; + } } - if(!cookie_data || !ptr) { - *size = (cnt + 1) * sizeof(WCHAR); - TRACE("returning %u\n", *size); - return cookie_data ? ERROR_INSUFFICIENT_BUFFER : ERROR_SUCCESS; + assert(ptr-str == cookie_set->string_len); + TRACE("%s\n", debugstr_wn(str, ptr-str)); +} + +DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) +{ + cookie_set_t cookie_set = {0}; + WCHAR *header, *ptr; + DWORD res; + + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + + res = get_cookie(host, path, INTERNET_COOKIE_HTTPONLY, &cookie_set); + if(res != ERROR_SUCCESS) + return res; + if(!cookie_set.cnt) { + *ret = NULL; + return ERROR_SUCCESS; } - *size = cnt + 1; + ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); + if(!header) + return ERROR_NOT_ENOUGH_MEMORY; + + memcpy(ptr, cookieW, sizeof(cookieW)); + ptr += sizeof(cookieW)/sizeof(*cookieW); + + cookie_set_to_string(&cookie_set, ptr); + heap_free(cookie_set.cookies); + ptr += cookie_set.string_len; - TRACE("Returning %u (from %u domains): %s\n", cnt, domain_count, debugstr_w(cookie_data)); + *ptr++ = '\r'; + *ptr++ = '\n'; + *ptr++ = 0; + + *ret = header; return ERROR_SUCCESS; } @@ -706,6 +742,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; + cookie_set_t cookie_set = {0}; DWORD res; BOOL ret; @@ -727,10 +764,33 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - res = get_cookie(host, path, lpCookieData, lpdwSize, flags); - if(res != ERROR_SUCCESS) + res = get_cookie(host, path, flags, &cookie_set); + if(res != ERROR_SUCCESS) { SetLastError(res); - return res == ERROR_SUCCESS; + return FALSE; + } + + if(!cookie_set.cnt) { + TRACE("no cookies found for %s\n", debugstr_w(host)); + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } + + if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { + *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); + TRACE("returning %u\n", *lpdwSize); + if(lpCookieData) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + }else { + *lpdwSize = cookie_set.string_len + 1; + cookie_set_to_string(&cookie_set, lpCookieData); + lpCookieData[cookie_set.string_len] = 0; + } + + heap_free(cookie_set.cookies); + return ret; } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8ff42a2..2486fbf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,24 +4176,15 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { - DWORD cookie_size, size, cnt = 0; WCHAR *cookies; + DWORD res; - static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - - if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) - return; - - size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); - if(!(cookies = heap_alloc(size))) + res = get_cookie_header(request->server->name, request->path, &cookies); + if(res != ERROR_SUCCESS || !cookies) return; - cnt += sprintfW(cookies, cookieW); - get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); - strcatW(cookies, szCrLf); - + get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); - heap_free(cookies); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2647f98..54f688d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -420,7 +420,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*,DWORD) DECLSPEC_HIDDEN; +DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Accept "v4.0" as a runtime version in config files.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 805da6bf838158b81a7e1b3d00ae7d983268c3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805da6bf838158b81a7e1b3d0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 14 15:55:18 2014 -0500 mscoree: Accept "v4.0" as a runtime version in config files. --- dlls/mscoree/metahost.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 61bd89e..2383068 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -981,14 +981,12 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D return FALSE; } -HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, - LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) +static HRESULT get_runtime(LPCWSTR pwzVersion, BOOL allow_short, + REFIID iid, LPVOID *ppRuntime) { int i; DWORD major, minor, build; - TRACE("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); - if (!pwzVersion) return E_POINTER; @@ -1003,7 +1001,7 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, for (i=0; i<NUM_RUNTIMES; i++) { if (runtimes[i].major == major && runtimes[i].minor == minor && - runtimes[i].build == build) + (runtimes[i].build == build || (allow_short && major >= 4 && build == 0))) { if (runtimes[i].found) return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, iid, @@ -1020,6 +1018,14 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, return CLR_E_SHIM_RUNTIME; } +HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, + LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) +{ + TRACE("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); + + return get_runtime(pwzVersion, FALSE, iid, ppRuntime); +} + HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { @@ -1389,7 +1395,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, supported_runtime *entry; LIST_FOR_EACH_ENTRY(entry, &parsed_config.supported_runtimes, supported_runtime, entry) { - hr = CLRMetaHost_GetRuntime(0, entry->version, &IID_ICLRRuntimeInfo, (void**)result); + hr = get_runtime(entry->version, TRUE, &IID_ICLRRuntimeInfo, (void**)result); if (SUCCEEDED(hr)) { found = TRUE;

1 0

Nikolay Sivov : kernel32: Implement GEO_PARENT for GetGeoInfo().
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: 17777c8497d1e314deaf65cd87660ed9a2aeb81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17777c8497d1e314deaf65cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 15 05:51:32 2014 +0400 kernel32: Implement GEO_PARENT for GetGeoInfo(). --- dlls/kernel32/locale.c | 680 ++++++++++++++++++++----------------------- dlls/kernel32/tests/locale.c | 64 ++++ 2 files changed, 376 insertions(+), 368 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17777c8497d1e314deaf6…

1 0

Nikolay Sivov : kernel32: Properly implement EnumSystemGeoID().
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: ed9e0304562826218336a22114245c4c84d30995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9e0304562826218336a2211… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 15 06:41:02 2014 +0400 kernel32: Properly implement EnumSystemGeoID(). --- dlls/kernel32/locale.c | 182 +++++++++++++++++++++---------------------- dlls/kernel32/tests/locale.c | 21 ++++- 2 files changed, 109 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9e0304562826218336a…

1 0

Henri Verbeet : ddraw/tests: Get rid of struct sVertex.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: ee5e469fd82e57eeba408edd204c929e42d4981a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5e469fd82e57eeba408edd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:54 2014 +0200 ddraw/tests: Get rid of struct sVertex. --- dlls/ddraw/tests/visual.c | 64 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e517d64..58c7d7d 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -446,12 +446,6 @@ static void clear_test(IDirect3DDevice7 *device) ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); } -struct sVertex { - float x, y, z; - DWORD diffuse; - DWORD specular; -}; - struct sVertexT { float x, y, z, rhw; DWORD diffuse; @@ -465,19 +459,41 @@ static void fog_test(IDirect3DDevice7 *device) float start = 0.0, end = 1.0; D3DDEVICEDESC7 caps; + struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex untransformed_1[] = { - {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - }; + untransformed_1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000, 0xff000000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000, 0xff000000}, + }, /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex untransformed_2[] = { - {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, - {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, + untransformed_2[] = + { + {{-1.0f, 0.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{-1.0f, 1.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 1.0f, 1.0f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 1.0f}, 0xffff0000, 0xff000000}, + }, + far_quad1[] = + { + {{-1.0f, -1.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{-1.0f, 0.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 0.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, -1.0f, 0.5f}, 0xffff0000, 0xff000000}, + }, + far_quad2[] = + { + {{-1.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{-1.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, + {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; /* Untransformed ones. Give them a different diffuse color to make the test look * nicer. It also makes making sure that they are drawn correctly easier. @@ -523,20 +539,6 @@ static void fog_test(IDirect3DDevice7 *device) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, }; - struct sVertex far_quad1[] = - { - {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - }; - struct sVertex far_quad2[] = - { - {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - }; memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice7_GetCaps(device, &caps);

1 0

Henri Verbeet : ddraw/tests: Get rid of struct sVertexT.
by Alexandre Julliard 15 Jul '14

15 Jul '14

Module: wine Branch: master Commit: ce60e4ec711826cd33a4f4d93eae03d0d11d03bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce60e4ec711826cd33a4f4d93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:55 2014 +0200 ddraw/tests: Get rid of struct sVertexT. --- dlls/ddraw/tests/visual.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 58c7d7d..097e8be 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -446,12 +446,6 @@ static void clear_test(IDirect3DDevice7 *device) ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); } -struct sVertexT { - float x, y, z, rhw; - DWORD diffuse; - DWORD specular; -}; - static void fog_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -495,20 +489,28 @@ static void fog_test(IDirect3DDevice7 *device) {{ 0.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; - /* Untransformed ones. Give them a different diffuse color to make the test look - * nicer. It also makes making sure that they are drawn correctly easier. - */ - struct sVertexT transformed_1[] = { - {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - }; - struct sVertexT transformed_2[] = { - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + /* Untransformed ones. Give them a different diffuse color to make the + * test look nicer. It also makes making sure that they are drawn + * correctly easier. */ + struct + { + struct vec4 position; + DWORD diffuse; + DWORD specular; + } + transformed_1[] = + { + {{320.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{320.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + }, + transformed_2[] = + { + {{320.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 480.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{320.0f, 480.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; D3DMATRIX ident_mat =

1 0