September 2011 - Wine-Commits

Francois Gouget : ntdll: Don' t trace potentially uninitialized structures if we are not going to use them .
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: bee334003b85ba3c2d4cd57160ca08cc4a533023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee334003b85ba3c2d4cd5716… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 20:09:12 2011 +0200 ntdll: Don't trace potentially uninitialized structures if we are not going to use them. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c103ddd..18da18d 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -404,10 +404,10 @@ NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Desir POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; if (!ObjectAttributes) return STATUS_INVALID_PARAMETER; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); /* Have to test it here because server won't know difference between * ObjectName == NULL and ObjectName == "" */ if (!ObjectAttributes->ObjectName) @@ -452,9 +452,9 @@ NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Des POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); SERVER_START_REQ(create_directory) {

1 0

Nikolay Sivov : comctl32/monthcal: Fix MCM_SETSELRANGE for multiple calendars case.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: ca533fca8c6a513814445b44cbd9b4bdcbc319e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca533fca8c6a513814445b44c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 11:16:43 2011 +0400 comctl32/monthcal: Fix MCM_SETSELRANGE for multiple calendars case. --- dlls/comctl32/monthcal.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d757c31..8fcdf28 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1564,6 +1564,7 @@ static LRESULT MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { SYSTEMTIME old_range[2]; + INT diff; TRACE("%p\n", range); @@ -1590,7 +1591,21 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) infoPtr->minSel = range[1]; infoPtr->maxSel = range[0]; } - infoPtr->calendars[0].month = infoPtr->minSel; + + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month, &infoPtr->maxSel); + if (diff < 0) + { + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[0].month, &infoPtr->maxSel); + if (diff > 0) diff = 0; + } + + if (diff != 0) + { + INT i; + + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); + } /* update day of week */ MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE);

1 0

Piotr Caban : urlmon/tests: Added CoInternetIsFeatureZoneElevationEnabled tests.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

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

Francois Gouget : inetcomm: Fix printing NULL strings.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 54ae7787debda283f9853fe14683eec80f2428d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ae7787debda283f9853fe14… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:27 2011 +0200 inetcomm: Fix printing NULL strings. --- dlls/inetcomm/mimeole.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f297c29..8a1e3d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2134,7 +2134,8 @@ static HRESULT WINAPI MimeMessage_IsContentType( { HRESULT hr; IMimeBody *mime_body; - TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType); + TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, debugstr_a(pszPriType), + debugstr_a(pszSubType)); hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); if(FAILED(hr)) return hr;

1 0

Francois Gouget : msi: Fix printing NULL strings.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: ff98afc450a1a881ab951a29662c8f1313dcc425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff98afc450a1a881ab951a296… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:49:55 2011 +0200 msi: Fix printing NULL strings. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d281098..de9c0ce 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -489,7 +489,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, awstring str; UINT r; - TRACE("%s %p %p\n", szFolder, debugstr_a(szPathBuf), pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(szFolder), debugstr_a(szPathBuf), pcchPathBuf); str.unicode = FALSE; str.str.a = szPathBuf;

1 0

Francois Gouget : dinput: Fix printing NULL strings.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: ca8c1103af3ef4520893c69b9cb5e24bb853bfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8c1103af3ef4520893c69b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:44:01 2011 +0200 dinput: Fix printing NULL strings. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 028d901..373b990 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -883,7 +883,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( int i, j; - FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); X(DIEDBSFL_ATTACHEDONLY)

1 0

Francois Gouget : shdocvw: Make get_ieframe_instance() static.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 4c7e83f9d933b53308587b470ad2edfbe9b2538f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e83f9d933b53308587b470… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:36:45 2011 +0200 shdocvw: Make get_ieframe_instance() static. --- dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shdocvw_main.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 792c9bd..e741482 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -52,7 +52,6 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; -HINSTANCE get_ieframe_instance(void) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 2bfe3c9..88fe5ed 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -45,7 +45,7 @@ HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; -HINSTANCE get_ieframe_instance(void) +static HINSTANCE get_ieframe_instance(void) { static const WCHAR ieframe_dllW[] = {'i','e','f','r','a','m','e','.','d','l','l',0};

1 0

Francois Gouget : jscript/tests: Some tests require that the user interface be in English.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 405c3ef483f9661a2983c0c1bad76012c342f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=405c3ef483f9661a2983c0c1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:38:18 2011 +0200 jscript/tests: Some tests require that the user interface be in English. --- dlls/jscript/tests/run.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fbbff96..3ad9600 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,6 +108,29 @@ static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -1145,8 +1168,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ok(excep.wCode == 0, "IActiveScriptError_GetExceptionInfo -- excep.wCode: expected 0, got 0x%08x\n", excep.wCode); ok(excep.wReserved == 0, "IActiveScriptError_GetExceptionInfo -- excep.wReserved: expected 0, got %d\n", excep.wReserved); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) - skip("Non-english locale (test with hardcoded strings)\n"); + if (!is_lang_english()) + skip("Non-english UI (test with hardcoded strings)\n"); else { ok(excep.bstrSource != NULL && !lstrcmpW(excep.bstrSource, script_source), "IActiveScriptError_GetExceptionInfo -- excep.bstrSource is not valid: expected %s, got %s\n",

1 0

Alexandre Julliard : rpcrt4/tests: Add more tests for integer ranges to show that ranges are independent.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

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 Sept. 19, 2011

Sept. 19, 2011

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