September 2011 - Wine-commits

Piotr Caban : urlmon/tests: Added CoInternetIsFeatureZoneElevationEnabled tests.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 860df26c4a19d6ee9bed6702c7da64ec0e6189cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=860df26c4a19d6ee9bed6702c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:55:46 2011 +0200 urlmon/tests: Added CoInternetIsFeatureZoneElevationEnabled tests. --- dlls/urlmon/tests/sec_mgr.c | 175 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index fd74fbd..fca17e8 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -70,6 +70,7 @@ DEFINE_EXPECT(ParseUrl_SECURITY_URL_input2); DEFINE_EXPECT(ParseUrl_SECURITY_URL_expected); DEFINE_EXPECT(ParseUrl_SECURITY_URL_http); DEFINE_EXPECT(ParseUrl_SECURITY_DOMAIN_expected); +DEFINE_EXPECT(ProcessUrlAction); static HRESULT (WINAPI *pCoInternetCreateSecurityManager)(IServiceProvider *, IInternetSecurityManager**, DWORD); static HRESULT (WINAPI *pCoInternetCreateZoneManager)(IServiceProvider *, IInternetZoneManager**, DWORD); @@ -77,6 +78,9 @@ static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, static HRESULT (WINAPI *pCoInternetGetSecurityUrlEx)(IUri*, IUri**, PSUACTION, DWORD_PTR); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession**, DWORD); +static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST, DWORD); +static HRESULT (WINAPI *pCoInternetIsFeatureEnabledForUrl)(INTERNETFEATURELIST, DWORD, LPCWSTR, IInternetSecurityManager*); +static HRESULT (WINAPI *pCoInternetIsFeatureZoneElevationEnabled)(LPCWSTR, LPCWSTR, IInternetSecurityManager*, DWORD); static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; @@ -128,6 +132,7 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; static int called_securl_http; +static DWORD ProcessUrlAction_policy; static struct secmgr_test { LPCWSTR url; @@ -248,6 +253,103 @@ cleanup: return ret; } +static HRESULT WINAPI SecurityManager_QueryInterface(IInternetSecurityManager* This, + REFIID riid, void **ppvObject) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI SecurityManager_AddRef(IInternetSecurityManager* This) +{ + return 2; +} + +static ULONG WINAPI SecurityManager_Release(IInternetSecurityManager* This) +{ + return 1; +} + +static HRESULT WINAPI SecurityManager_SetSecuritySite(IInternetSecurityManager* This, + IInternetSecurityMgrSite *pSite) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_GetSecuritySite(IInternetSecurityManager* This, + IInternetSecurityMgrSite **ppSite) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_MapUrlToZone(IInternetSecurityManager* This, + LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_GetSecurityId(IInternetSecurityManager* This, + LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_ProcessUrlAction(IInternetSecurityManager* This, + LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, DWORD cbPolicy, + BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) +{ + CHECK_EXPECT(ProcessUrlAction); + ok(dwAction == URLACTION_FEATURE_ZONE_ELEVATION, "dwAction = %x\n", dwAction); + ok(cbPolicy == sizeof(DWORD), "cbPolicy = %d\n", cbPolicy); + ok(!pContext, "pContext != NULL\n"); + ok(dwFlags == PUAF_NOUI, "dwFlags = %x\n", dwFlags); + ok(dwReserved == 0, "dwReserved = %x\n", dwReserved); + + *pPolicy = ProcessUrlAction_policy; + return ProcessUrlAction_policy==URLPOLICY_ALLOW ? S_OK : S_FALSE; +} + +static HRESULT WINAPI SecurityManager_QueryCustomPolicy(IInternetSecurityManager* This, + LPCWSTR pwszUrl, REFGUID guidKey, BYTE **ppPolicy, DWORD *pcbPolicy, + BYTE *pContext, DWORD cbContext, DWORD dwReserved) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_SetZoneMapping(IInternetSecurityManager* This, + DWORD dwZone, LPCWSTR lpszPattern, DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SecurityManager_GetZoneMappings(IInternetSecurityManager* This, + DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IInternetSecurityManagerVtbl SecurityManagerVtbl = { + SecurityManager_QueryInterface, + SecurityManager_AddRef, + SecurityManager_Release, + SecurityManager_SetSecuritySite, + SecurityManager_GetSecuritySite, + SecurityManager_MapUrlToZone, + SecurityManager_GetSecurityId, + SecurityManager_ProcessUrlAction, + SecurityManager_QueryCustomPolicy, + SecurityManager_SetZoneMapping, + SecurityManager_GetZoneMappings +}; + +static IInternetSecurityManager security_manager = { &SecurityManagerVtbl }; static void test_SecurityManager(void) { @@ -1702,6 +1804,75 @@ static void test_SecurityManagerEx2(void) IInternetSecurityManager_Release(sec_mgr); } +static void test_CoInternetIsFeatureZoneElevationEnabled(void) +{ + struct { + const char *url_from; + const char *url_to; + DWORD flags; + HRESULT hres; + DWORD policy_flags; + } testcases[] = { + /* 0 */ { "http://www.winehq.org", "http://www.winehq.org", 0, S_FALSE, URLPOLICY_ALLOW }, + /* 1 */ { "http://www.winehq.org", "http://www.winehq.org", 0, S_OK, URLPOLICY_DISALLOW }, + /* 2 */ { "http://www.winehq.org", "http://www.codeweavers.com", 0, S_FALSE, URLPOLICY_ALLOW }, + /* 3 */ { "http://www.winehq.org", "http://www.codeweavers.com", 0, S_OK, URLPOLICY_DISALLOW }, + /* 4 */ { "http://www.winehq.org", "http://www.winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 5 */ { "http://www.winehq.org", "http://www.winehq.org/dir", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 6 */ { "http://www.winehq.org", "http://www.codeweavers.com", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 7 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_PROCESS, S_FALSE, -1 }, + /* 8 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_PROCESS|0x100, S_FALSE, URLPOLICY_ALLOW }, + /* 9 */ { "http://www.winehq.org", "ftp://winehq.org", GET_FEATURE_FROM_REGISTRY, S_FALSE, URLPOLICY_ALLOW }, + }; + + WCHAR *url_from, *url_to; + int i; + HRESULT hres; + + if(!pCoInternetIsFeatureZoneElevationEnabled || !pCoInternetIsFeatureEnabled + || !pCoInternetIsFeatureEnabledForUrl) { + win_skip("Skipping CoInternetIsFeatureZoneElevationEnabled tests\n"); + return; + } + + + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + ok(SUCCEEDED(hres), "CoInternetIsFeatureEnabled returned %x\n", hres); + + trace("Testing CoInternetIsFeatureZoneElevationEnabled... (%x)\n", hres); + + for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + if(hres==S_OK && testcases[i].flags == GET_FEATURE_FROM_PROCESS) + testcases[i].policy_flags = URLPOLICY_ALLOW; + } + + for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + url_from = a2w(testcases[i].url_from); + url_to = a2w(testcases[i].url_to); + + if(testcases[i].policy_flags != -1) { + ProcessUrlAction_policy = testcases[i].policy_flags; + SET_EXPECT(ProcessUrlAction); + } + hres = pCoInternetIsFeatureZoneElevationEnabled(url_from, url_to, + &security_manager, testcases[i].flags); + ok(hres == testcases[i].hres, "%d) CoInternetIsFeatureZoneElevationEnabled returned %x\n", i, hres); + if(testcases[i].policy_flags != -1) + CHECK_CALLED(ProcessUrlAction); + + if(testcases[i].policy_flags != -1) + SET_EXPECT(ProcessUrlAction); + hres = pCoInternetIsFeatureEnabledForUrl(FEATURE_ZONE_ELEVATION, + testcases[i].flags, url_to, &security_manager); + ok(hres == testcases[i].hres, "%d) CoInternetIsFeatureEnabledForUrl returned %x\n", i, hres); + if(testcases[i].policy_flags != -1) + CHECK_CALLED(ProcessUrlAction); + + heap_free(url_from); + heap_free(url_to); + } +} + START_TEST(sec_mgr) { HMODULE hurlmon; @@ -1715,6 +1886,9 @@ START_TEST(sec_mgr) pCoInternetGetSecurityUrlEx = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrlEx"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); + pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); + pCoInternetIsFeatureEnabledForUrl = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabledForUrl"); + pCoInternetIsFeatureZoneElevationEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureZoneElevationEnabled"); if (!pCoInternetCreateSecurityManager || !pCoInternetCreateZoneManager || !pCoInternetGetSecurityUrl) { @@ -1751,6 +1925,7 @@ START_TEST(sec_mgr) test_GetZoneAttributes(); test_SetZoneAttributes(); test_InternetSecurityMarshalling(); + test_CoInternetIsFeatureZoneElevationEnabled(); unregister_protocols(); OleUninitialize();

1 0

Piotr Caban : propsys: Added partial PropVariantToGUID implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 4646ed19aec15fffb9c690ca3376e945a8bfb9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4646ed19aec15fffb9c690ca3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:56:05 2011 +0200 propsys: Added partial PropVariantToGUID implementation. --- dlls/propsys/propsys.spec | 4 +- dlls/propsys/propvar.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 + 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 5bcb483..4b617ea 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -119,7 +119,7 @@ @ stub PropVariantToFileTime @ stub PropVariantToFileTimeVector @ stub PropVariantToFileTimeVectorAlloc -@ stub PropVariantToGUID +@ stdcall PropVariantToGUID(ptr ptr) @ stub PropVariantToInt16 @ stub PropVariantToInt16Vector @ stub PropVariantToInt16VectorAlloc @@ -175,7 +175,7 @@ @ stub VariantToDoubleArrayAlloc @ stub VariantToDoubleWithDefault @ stub VariantToFileTime -@ stub VariantToGUID +@ stdcall VariantToGUID(ptr ptr) @ stub VariantToInt16 @ stub VariantToInt16Array @ stub VariantToInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 01a1d5f..4ea01d9 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -177,3 +177,109 @@ HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) V_ARRAY(pvar) = arr; return S_OK; } + +static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) +{ + DWORD ret; + + if(hex[0]>='0' && hex[0]<='9') + ret = hex[0]-'0'; + else if(hex[0]>='a' && hex[0]<='f') + ret = hex[0]-'a'+10; + else if(hex[0]>='A' && hex[0]<='F') + ret = hex[0]-'A'+10; + else + return -1; + + ret <<= 4; + if(hex[1]>='0' && hex[1]<='9') + return ret + hex[1]-'0'; + else if(hex[1]>='a' && hex[1]<='f') + return ret + hex[1]-'a'+10; + else if(hex[1]>='A' && hex[1]<='F') + return ret + hex[1]-'A'+10; + else + return -1; +} + +static inline HRESULT PROPVAR_WCHARToGUID(const WCHAR *str, int len, GUID *guid) +{ + DWORD i, val=0; + const WCHAR *p; + + memset(guid, 0, sizeof(GUID)); + + if(len!=38 || str[0]!='{' || str[9]!='-' || str[14]!='-' + || str[19]!='-' || str[24]!='-' || str[37]!='}') { + WARN("Error parsing %s\n", debugstr_w(str)); + return E_INVALIDARG; + } + + p = str+1; + for(i=0; i<4 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data1 = (guid->Data1<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data2 = (guid->Data2<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data3 = (guid->Data3<<8) + val; + p += 2; + } + p++; + for(i=0; i<8 && val!=-1; i++) { + if(i == 2) + p++; + + val = guid->Data4[i] = PROPVAR_HexToNum(p); + p += 2; + } + + if(val == -1) { + WARN("Error parsing %s\n", debugstr_w(str)); + memset(guid, 0, sizeof(GUID)); + return E_INVALIDARG; + } + return S_OK; +} + +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) +{ + TRACE("%p %p)\n", ppropvar, guid); + + switch(ppropvar->vt) { + case VT_BSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); + case VT_LPWSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + + default: + FIXME("unsupported vt: %d\n", ppropvar->vt); + return E_NOTIMPL; + } +} + +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) +{ + TRACE("(%p %p)\n", pvar, guid); + + switch(V_VT(pvar)) { + case VT_BSTR: { + HRESULT hres = PROPVAR_WCHARToGUID(V_BSTR(pvar), SysStringLen(V_BSTR(pvar)), guid); + if(hres == E_INVALIDARG) + return E_FAIL; + return hres; + } + + default: + FIXME("unsupported vt: %d\n", V_VT(pvar)); + return E_NOTIMPL; + } +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 76bf718..d3867e1 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -96,8 +96,10 @@ @ stub ZonesReInit 111 stdcall @(wstr) IsProtectedModeURL +329 stdcall @(ptr ptr) propsys.VariantToGUID 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer +350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString 410 stdcall @(long long) URLMON_410 423 stdcall @(long long long long) URLMON_423

1 0

Piotr Caban : propsys/tests: Added PropVariantToGUID tests.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 208de163affef0b79e10df796147424e5a5ab760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208de163affef0b79e10df796… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:56:15 2011 +0200 propsys/tests: Added PropVariantToGUID tests. --- dlls/propsys/tests/propsys.c | 72 ++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 2 + 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index caff25e..850d3d2 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -40,6 +40,11 @@ DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x5 static char *show_guid(const GUID *guid, char *buf) { + static char static_buf[40]; + + if(!buf) + buf = static_buf; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, @@ -562,6 +567,72 @@ static void test_InitPropVariantFromBuffer(void) VariantClear(&var); } +static void test_PropVariantToGUID(void) +{ + PROPVARIANT propvar; + VARIANT var; + GUID guid; + HRESULT hres; + + hres = InitPropVariantFromGUIDAsString(&IID_NULL, &propvar); + ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres); + + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + PropVariantClear(&propvar); + + hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); + ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres); + + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); + propvar.u.pwszVal[1] = 'd'; + propvar.u.pwszVal[2] = 'E'; + propvar.u.pwszVal[3] = 'a'; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + propvar.u.pwszVal[1] = 'z'; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == E_INVALIDARG, "PropVariantToGUID returned %x\n", hres); + PropVariantClear(&propvar); + + + hres = InitVariantFromGUIDAsString(&IID_NULL, &var); + ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres); + + hres = VariantToGUID(&var, &guid); + ok(hres == S_OK, "VariantToGUID failed %x\n", hres); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + VariantClear(&var); + + hres = InitVariantFromGUIDAsString(&dummy_guid, &var); + ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres); + + hres = VariantToGUID(&var, &guid); + ok(hres == S_OK, "VariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); + V_BSTR(&var)[1] = 'z'; + hres = VariantToGUID(&var, &guid); + ok(hres == E_FAIL, "VariantToGUID returned %x\n", hres); + + V_BSTR(&var)[1] = 'd'; + propvar.vt = V_VT(&var); + propvar.u.bstrVal = V_BSTR(&var); + V_VT(&var) = VT_EMPTY; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -569,4 +640,5 @@ START_TEST(propsys) test_PSRefreshPropertySchema(); test_InitPropVariantFromGUIDAsString(); test_InitPropVariantFromBuffer(); + test_PropVariantToGUID(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index f7d2e82..fe7ab94 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -41,6 +41,8 @@ HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropv HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); #ifdef __cplusplus

1 0

Alexandre Julliard : widl: Include string formats in the element description for complex arrays.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 05ff9dfeb1a72cd1bab4b01e86e2a938141e4777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ff9dfeb1a72cd1bab4b01e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 21:08:54 2011 +0200 widl: Include string formats in the element description for complex arrays. --- tools/widl/typegen.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5a22525..a3c12f2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2336,6 +2336,11 @@ static void write_array_element_type(FILE *file, const type_t *type, ref->typestring_offset, tfsoff); return; } + if (cont_is_complex && is_string_type(NULL, elem)) + { + write_string_tfs(file, NULL, elem, TYPE_CONTEXT_CONTAINER, NULL, tfsoff); + return; + } if (!is_string_type(NULL, elem) && (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM)) {

1 0

Alexandre Julliard : widl: Make the function return value a variable.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: c31948a775ecaaf3b761585cabecfd0491dc049a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31948a775ecaaf3b761585ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 13:38:15 2011 +0200 widl: Make the function return value a variable. --- tools/widl/client.c | 29 ++++++++++++++--------------- tools/widl/parser.y | 3 ++- tools/widl/proxy.c | 25 ++++++++++++------------- tools/widl/typegen.c | 33 +++++++++++++++------------------ tools/widl/typetree.h | 9 +++++++-- tools/widl/widltypes.h | 2 +- 6 files changed, 51 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c31948a775ecaaf3b7615…

1 0

Alexandre Julliard : widl: Pass variables around instead of types for function parameters.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: e2a92702edc3844f722e9227d5c53d832efd36b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a92702edc3844f722e9227d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 11:54:42 2011 +0200 widl: Pass variables around instead of types for function parameters. --- tools/widl/typegen.c | 106 +++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2a92702edc3844f722e9…

1 0

Alexandre Julliard : widl: Store the type format offset for function parameters in the variable object .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 977e15b76259929490ef2d4f3a3cda84f8886129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977e15b76259929490ef2d4f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 12:23:01 2011 +0200 widl: Store the type format offset for function parameters in the variable object. --- tools/widl/proxy.c | 2 +- tools/widl/typegen.c | 31 +++++++++++++++++-------------- tools/widl/widltypes.h | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5d6b669..e0690e4 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -148,7 +148,7 @@ static int need_delegation_indirect(const type_t *iface) static void free_variable( const var_t *arg, const char *local_var_prefix ) { - unsigned int type_offset = arg->type->typestring_offset; + unsigned int type_offset = arg->typestring_offset; type_t *type = arg->type; write_parameter_conf_or_var_exprs(proxy, indent, local_var_prefix, PHASE_FREE, arg, FALSE); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14734cf..cadbef2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -966,7 +966,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned *flags = 0; *stack_size = get_stack_size( var, &is_byval ); - *typestring_offset = var->type->typestring_offset; + *typestring_offset = var->typestring_offset; if (is_in) *flags |= IsIn; if (is_out) *flags |= IsOut; @@ -1005,7 +1005,10 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned *flags |= MustFree; if (type_array_is_decl_as_ptr(var->type) && var->type->details.array.ptr_tfsoff && get_pointer_fc( var->type, var->attrs, !is_return ) == RPC_FC_RP) + { + *typestring_offset = var->type->typestring_offset; *flags |= IsSimpleRef; + } break; case TGT_STRING: *flags |= MustFree; @@ -1207,12 +1210,12 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons } else { - unsigned short offset = var->type->typestring_offset; + unsigned short offset = var->typestring_offset; - if (is_interpreted && is_array(var->type) && + if (!is_interpreted && is_array(var->type) && type_array_is_decl_as_ptr(var->type) && var->type->details.array.ptr_tfsoff) - offset = var->type->details.array.ptr_tfsoff; + offset = var->type->typestring_offset; if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); @@ -3611,7 +3614,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, type_pred_t pred, unsigned int *typeformat_offset) { - const var_t *var; + var_t *var; const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) @@ -3633,16 +3636,16 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, current_func = func; if (is_local(func->attrs)) continue; - if (!is_void(type_function_get_rettype(func->type))) - { - write_type_tfs( file, 2, func->attrs, type_function_get_rettype(func->type), - func->name, TYPE_CONTEXT_PARAM, typeformat_offset); - } + var = type_function_get_retval(func->type); + if (!is_void(var->type)) + var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, + TYPE_CONTEXT_PARAM, typeformat_offset); if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - write_type_tfs( file, 2, var->attrs, var->type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, typeformat_offset ); + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, + typeformat_offset ); } } @@ -4606,7 +4609,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char fprintf(file, " = NdrContextHandleInitialize(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", - var->type->typestring_offset); + var->typestring_offset); break; case TGT_ARRAY: if (type_array_has_conformance(var->type)) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 0e8bfeb..84e4467 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -436,6 +436,7 @@ struct _var_t { expr_t *eval; enum storage_class stgclass; unsigned int procstring_offset; + unsigned int typestring_offset; struct _loc_info_t loc_info;

1 0

Alexandre Julliard : rpcrt4/tests: Add more tests for integer ranges to show that ranges are independent.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: cb5beede167260c1ccd5d5588fbf6103217c293b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5beede167260c1ccd5d5588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 13:17:41 2011 +0200 rpcrt4/tests: Add more tests for integer ranges to show that ranges are independent. Reported by Jérôme Gardou. --- dlls/rpcrt4/tests/server.c | 15 +++++++++++---- dlls/rpcrt4/tests/server.idl | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index eb8f061..d66c22c 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -599,9 +599,14 @@ str_t __cdecl s_get_filename(void) return (char *)__FILE__; } -int __cdecl s_echo_ranged_int(int n) +int __cdecl s_echo_ranged_int(int i, int j, int k) { - return n; + return min( 100, i + j + k ); +} + +int __cdecl s_echo_ranged_int2(int i) +{ + return i; } void __cdecl s_get_ranged_enum(renum_t *re) @@ -934,10 +939,12 @@ basic_tests(void) ok(!strcmp(str, __FILE__), "get_filename() returned %s instead of %s\n", str, __FILE__); midl_user_free(str); - x = echo_ranged_int(0); + x = echo_ranged_int(0,0,0); ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); - x = echo_ranged_int(100); + x = echo_ranged_int(10,20,100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); + x = echo_ranged_int2(40); + ok(x == 40, "echo_ranged_int() returned %d instead of 40\n", x); if (!old_windows_version) { diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index c7c7237..2e305c1 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -363,7 +363,8 @@ cpp_quote("#endif") const int RE_MAX = RE3; typedef [range(RE_MIN, RE_MAX)] enum renum renum_t; typedef [range(0, 100)] int rint_t; - rint_t echo_ranged_int([range(0, 100)] int n); + rint_t echo_ranged_int([range(0, 10)] int i, [range(0, 20)] int j, [range(0, 100)] int k); + rint_t echo_ranged_int2([range(0, 40)] int i); void get_ranged_enum([out] renum_t *re); void context_handle_test(void);

1 0

Francois Gouget : ole32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 54c74dc4a2dbbaac8e171592ec14821c4f93b2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c74dc4a2dbbaac8e171592e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 17 11:33:29 2011 +0200 ole32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b8c6ada..b465269 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2984,7 +2984,7 @@ static void test_hglobal_storage_creation(void) r = ILockBytes_Stat(ilb, &stat, STATFLAG_NONAME); ok(r == S_OK, "ILockBytes_Stat failed, hr=%x\n", r); - ok(stat.cbSize.LowPart < 2512, "expected truncated size, got %d\n", stat.cbSize.LowPart); + ok(stat.cbSize.u.LowPart < 2512, "expected truncated size, got %d\n", stat.cbSize.u.LowPart); ILockBytes_Release(ilb); }

1 0

Octavian Voicu : vbscript: Add explicit cast to int for pointer difference type.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 0a4bedde4329db217d70de281eebb1b1c1d22200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4bedde4329db217d70de281… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sun Sep 18 14:40:33 2011 +0300 vbscript: Add explicit cast to int for pointer difference type. --- dlls/vbscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1ff3c40..60e4935 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -95,7 +95,7 @@ static void dump_code(compile_ctx_t *ctx) instr_t *instr; for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { - TRACE_(vbscript_disas)("%d:\t%s", instr-ctx->code->instrs, instr_info[instr->op].op_str); + TRACE_(vbscript_disas)("%d:\t%s", (int)(instr-ctx->code->instrs), instr_info[instr->op].op_str); dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); TRACE_(vbscript_disas)("\n");

1 0