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

Jacek Caban : crypt32: Moved chain engine handle handling to separated function and improved error handling.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 786c0c2d58284d51cc67443e27c88a0737be060c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786c0c2d58284d51cc67443e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 4 13:18:21 2014 +0100 crypt32: Moved chain engine handle handling to separated function and improved error handling. --- dlls/crypt32/chain.c | 173 ++++++++++++++++++++-------------------- dlls/crypt32/crypt32_private.h | 3 +- 2 files changed, 89 insertions(+), 87 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 427db63..ffca677 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -33,8 +33,6 @@ WINE_DECLARE_DEBUG_CHANNEL(chain); #define DEFAULT_CYCLE_MODULUS 7 -static HCERTCHAINENGINE CRYPT_defaultChainEngine; - /* This represents a subset of a certificate chain engine: it doesn't include * the "hOther" store described by MSDN, because I'm not sure how that's used. * It also doesn't include the "hTrust" store, because I don't yet implement @@ -114,45 +112,88 @@ static BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) return ret; } -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, - PCERT_CHAIN_ENGINE_CONFIG pConfig) +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGINE_CONFIG *config) { + CertificateChainEngine *engine; + HCERTSTORE worldStores[4]; + static const WCHAR caW[] = { 'C','A',0 }; static const WCHAR myW[] = { 'M','y',0 }; static const WCHAR trustW[] = { 'T','r','u','s','t',0 }; - CertificateChainEngine *engine = - CryptMemAlloc(sizeof(CertificateChainEngine)); - - if (engine) - { - HCERTSTORE worldStores[4]; - - engine->ref = 1; - engine->hRoot = root; - engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); - worldStores[0] = CertDuplicateStore(engine->hRoot); - worldStores[1] = CertOpenSystemStoreW(0, caW); - worldStores[2] = CertOpenSystemStoreW(0, myW); - worldStores[3] = CertOpenSystemStoreW(0, trustW); - CRYPT_AddStoresToCollection(engine->hWorld, - sizeof(worldStores) / sizeof(worldStores[0]), worldStores); - CRYPT_AddStoresToCollection(engine->hWorld, - pConfig->cAdditionalStore, pConfig->rghAdditionalStore); - CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), - worldStores); - engine->dwFlags = pConfig->dwFlags; - engine->dwUrlRetrievalTimeout = pConfig->dwUrlRetrievalTimeout; - engine->MaximumCachedCertificates = - pConfig->MaximumCachedCertificates; - if (pConfig->CycleDetectionModulus) - engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; + + if(!root) { + if(config->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && config->hExclusiveRoot) + root = CertDuplicateStore(config->hExclusiveRoot); + else if (config->hRestrictedRoot) + root = CertDuplicateStore(config->hRestrictedRoot); else - engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; + root = CertOpenSystemStoreW(0, rootW); + if(!root) + return NULL; + } + + engine = CryptMemAlloc(sizeof(CertificateChainEngine)); + if(!engine) { + CertCloseStore(root, 0); + return NULL; } + + engine->ref = 1; + engine->hRoot = root; + engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + worldStores[0] = CertDuplicateStore(engine->hRoot); + worldStores[1] = CertOpenSystemStoreW(0, caW); + worldStores[2] = CertOpenSystemStoreW(0, myW); + worldStores[3] = CertOpenSystemStoreW(0, trustW); + + CRYPT_AddStoresToCollection(engine->hWorld, sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + CRYPT_AddStoresToCollection(engine->hWorld, config->cAdditionalStore, config->rghAdditionalStore); + CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + + engine->dwFlags = config->dwFlags; + engine->dwUrlRetrievalTimeout = config->dwUrlRetrievalTimeout; + engine->MaximumCachedCertificates = config->MaximumCachedCertificates; + if(config->CycleDetectionModulus) + engine->CycleDetectionModulus = config->CycleDetectionModulus; + else + engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; + return engine; } +static CertificateChainEngine *default_cu_engine; + +static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL allow_default) +{ + const CERT_CHAIN_ENGINE_CONFIG config = { sizeof(config) }; + + if(handle == HCCE_CURRENT_USER) { + if(!allow_default) + return NULL; + + if(!default_cu_engine) { + handle = CRYPT_CreateChainEngine(NULL, &config); + InterlockedCompareExchangePointer((void**)&default_cu_engine, handle, NULL); + if(default_cu_engine != handle) + CertFreeCertificateChainEngine(handle); + } + + return default_cu_engine; + } + + return (CertificateChainEngine*)handle; +} + +static void free_chain_engine(CertificateChainEngine *engine) +{ + if(!engine || InterlockedDecrement(&engine->ref)) + return; + + CertCloseStore(engine->hWorld, 0); + CertCloseStore(engine->hRoot, 0); + CryptMemFree(engine); +} + typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT { DWORD cbSize; @@ -180,66 +221,26 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, SetLastError(E_INVALIDARG); return FALSE; } - *phChainEngine = NULL; ret = CRYPT_CheckRestrictedRoot(pConfig->hRestrictedRoot); - if (ret) + if (!ret) { - HCERTSTORE root; - HCERTCHAINENGINE engine; - - if (pConfig->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && - pConfig->hExclusiveRoot) - root = CertDuplicateStore(pConfig->hExclusiveRoot); - else if (pConfig->hRestrictedRoot) - root = CertDuplicateStore(pConfig->hRestrictedRoot); - else - root = CertOpenSystemStoreW(0, rootW); - engine = CRYPT_CreateChainEngine(root, pConfig); - if (engine) - { - *phChainEngine = engine; - ret = TRUE; - } - else - ret = FALSE; + *phChainEngine = NULL; + return FALSE; } - return ret; -} - -VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) -{ - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; - - TRACE("(%p)\n", hChainEngine); - if (engine && InterlockedDecrement(&engine->ref) == 0) - { - CertCloseStore(engine->hWorld, 0); - CertCloseStore(engine->hRoot, 0); - CryptMemFree(engine); - } + *phChainEngine = CRYPT_CreateChainEngine(NULL, pConfig); + return *phChainEngine != NULL; } -static HCERTCHAINENGINE CRYPT_GetDefaultChainEngine(void) +void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { - if (!CRYPT_defaultChainEngine) - { - CERT_CHAIN_ENGINE_CONFIG config = { 0 }; - HCERTCHAINENGINE engine; - - config.cbSize = sizeof(config); - CertCreateCertificateChainEngine(&config, &engine); - InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, - NULL); - if (CRYPT_defaultChainEngine != engine) - CertFreeCertificateChainEngine(engine); - } - return CRYPT_defaultChainEngine; + TRACE("(%p)\n", hChainEngine); + free_chain_engine(get_chain_engine(hChainEngine, FALSE)); } void default_chain_engine_free(void) { - CertFreeCertificateChainEngine(CRYPT_defaultChainEngine); + free_chain_engine(default_cu_engine); } typedef struct _CertificateChain @@ -2867,14 +2868,18 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, PCCERT_CHAIN_CONTEXT* ppChainContext) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; + CertificateChainEngine *engine; BOOL ret; CertificateChain *chain = NULL; - TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", engine, pCertContext, + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + engine = get_chain_engine(hChainEngine, TRUE); + if (!engine) + return FALSE; + if (ppChainContext) *ppChainContext = NULL; if (!pChainPara) @@ -2888,8 +2893,6 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, return FALSE; } - if (!engine) - engine = CRYPT_GetDefaultChainEngine(); if (TRACE_ON(chain)) dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 53e0834..b582a78 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -342,8 +342,7 @@ WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) D * the root store. Instead, it uses root, and assumes the caller has done any * checking necessary. */ -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, - PCERT_CHAIN_ENGINE_CONFIG pConfig) DECLSPEC_HIDDEN; +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE, const CERT_CHAIN_ENGINE_CONFIG*) DECLSPEC_HIDDEN; /* Helper function for store reading functions and * CertAddSerializedElementToStore. Returns a context of the appropriate type

1 0

Jacek Caban : crypt32: Added support for HCCE_LOCAL_MACHINE.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: ca2e1c164fcd892dfbeaa865914f97ce3ae3c1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2e1c164fcd892dfbeaa8659… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 4 13:18:53 2014 +0100 crypt32: Added support for HCCE_LOCAL_MACHINE. --- dlls/crypt32/chain.c | 31 +++++++++++++++++++++++-------- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/rootstore.c | 2 +- dlls/crypt32/tests/chain.c | 7 +++++++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ffca677..9e319d3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -112,7 +112,7 @@ static BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) return ret; } -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGINE_CONFIG *config) +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, DWORD system_store, const CERT_CHAIN_ENGINE_CONFIG *config) { CertificateChainEngine *engine; HCERTSTORE worldStores[4]; @@ -127,7 +127,7 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGIN else if (config->hRestrictedRoot) root = CertDuplicateStore(config->hRestrictedRoot); else - root = CertOpenSystemStoreW(0, rootW); + root = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, rootW); if(!root) return NULL; } @@ -142,9 +142,9 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGIN engine->hRoot = root; engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); worldStores[0] = CertDuplicateStore(engine->hRoot); - worldStores[1] = CertOpenSystemStoreW(0, caW); - worldStores[2] = CertOpenSystemStoreW(0, myW); - worldStores[3] = CertOpenSystemStoreW(0, trustW); + worldStores[1] = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, caW); + worldStores[2] = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, myW); + worldStores[3] = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, trustW); CRYPT_AddStoresToCollection(engine->hWorld, sizeof(worldStores) / sizeof(worldStores[0]), worldStores); CRYPT_AddStoresToCollection(engine->hWorld, config->cAdditionalStore, config->rghAdditionalStore); @@ -161,7 +161,7 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGIN return engine; } -static CertificateChainEngine *default_cu_engine; +static CertificateChainEngine *default_cu_engine, *default_lm_engine; static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL allow_default) { @@ -172,7 +172,7 @@ static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL al return NULL; if(!default_cu_engine) { - handle = CRYPT_CreateChainEngine(NULL, &config); + handle = CRYPT_CreateChainEngine(NULL, CERT_SYSTEM_STORE_CURRENT_USER, &config); InterlockedCompareExchangePointer((void**)&default_cu_engine, handle, NULL); if(default_cu_engine != handle) CertFreeCertificateChainEngine(handle); @@ -181,6 +181,20 @@ static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL al return default_cu_engine; } + if(handle == HCCE_LOCAL_MACHINE) { + if(!allow_default) + return NULL; + + if(!default_cu_engine) { + handle = CRYPT_CreateChainEngine(NULL, CERT_SYSTEM_STORE_LOCAL_MACHINE, &config); + InterlockedCompareExchangePointer((void**)&default_lm_engine, handle, NULL); + if(default_lm_engine != handle) + CertFreeCertificateChainEngine(handle); + } + + return default_cu_engine; + } + return (CertificateChainEngine*)handle; } @@ -228,7 +242,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, return FALSE; } - *phChainEngine = CRYPT_CreateChainEngine(NULL, pConfig); + *phChainEngine = CRYPT_CreateChainEngine(NULL, CERT_SYSTEM_STORE_CURRENT_USER, pConfig); return *phChainEngine != NULL; } @@ -241,6 +255,7 @@ void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) void default_chain_engine_free(void) { free_chain_engine(default_cu_engine); + free_chain_engine(default_lm_engine); } typedef struct _CertificateChain diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index b582a78..02bd902 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -342,7 +342,7 @@ WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) D * the root store. Instead, it uses root, and assumes the caller has done any * checking necessary. */ -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE, const CERT_CHAIN_ENGINE_CONFIG*) DECLSPEC_HIDDEN; +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE, DWORD, const CERT_CHAIN_ENGINE_CONFIG*) DECLSPEC_HIDDEN; /* Helper function for store reading functions and * CertAddSerializedElementToStore. Returns a context of the appropriate type diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 2c8af68..641a2b7 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -245,7 +245,7 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) TRACE("\n"); CertDuplicateStore(to); - engine = CRYPT_CreateChainEngine(to, &chainEngineConfig); + engine = CRYPT_CreateChainEngine(to, CERT_SYSTEM_STORE_CURRENT_USER, &chainEngineConfig); if (engine) { PCCERT_CONTEXT cert = NULL; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ec53539..f69fbdc 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4041,6 +4041,13 @@ static void testGetCertChain(void) test_name_blob(&simple_chain->rgpElement[2]->pCertContext->pCertInfo->Subject, "US, GeoTrust Inc., GeoTrust Global CA"); pCertFreeCertificateChain(chain); + + /* Test HCCE_LOCAL_MACHINE */ + ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + pCertFreeCertificateChain(chain); + + CertFreeCertificateContext(cert); CertCloseStore(store, 0); }

1 0

Francois Gouget : msi/tests: Check that we have enough privileges to run the automation tests.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: badff7c43a53d49132db5a5a2fd64dca4589d04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=badff7c43a53d49132db5a5a2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 4 19:04:03 2014 +0100 msi/tests: Check that we have enough privileges to run the automation tests. Note that we could have enough privileges to do the InstallProduct tests, but not enough to clean up the registry after them, thus causing later runs to fail. In that case we skip the tests. --- dlls/msi/tests/automation.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c7cc411..242ec63 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -35,6 +35,8 @@ static BOOL is_wow64; +static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -217,12 +219,50 @@ static void init_functionpointers(void) if(!p ## func) \ trace("GetProcAddress(%s) failed\n", #func); + GET_PROC(hadvapi32, CheckTokenMembership); + GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) #undef GET_PROC } +static BOOL is_process_limited(void) +{ + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + PSID Group; + BOOL IsInGroup; + HANDLE token; + + 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; +} + static LONG delete_key_portable( HKEY key, LPCSTR subkey, REGSAM access ) { if (pRegDeleteKeyExA) @@ -2387,6 +2427,15 @@ static void test_Installer_InstallProduct(void) IDispatch *pStringList = NULL; REGSAM access = KEY_ALL_ACCESS; + if (is_process_limited()) + { + /* In fact InstallProduct would succeed but then Windows XP + * would not allow us to clean up the registry! + */ + skip("Installer_InstallProduct (insufficient privileges)\n"); + return; + } + if (is_wow64) access |= KEY_WOW64_64KEY;

1 0

Jacek Caban : mshtml: Don' t use fragment navigation for SuperNavigate calls.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 595fb40efcfe1d49747ef63e823f9e6171e2d193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595fb40efcfe1d49747ef63e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 4 16:48:31 2014 +0100 mshtml: Don't use fragment navigation for SuperNavigate calls. --- dlls/ieframe/tests/webbrowser.c | 4 ++++ dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/olecmd.c | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 776e2bc..ce96edf 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3424,6 +3424,10 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) trace("GoForward...\n"); test_go_forward(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_GOFORWARD|DWL_HTTP); + }else { + trace("Navigate2 repeated with the same URL...\n"); + test_Navigate2(webbrowser, "about:blank"); + test_download(DWL_EXPECT_BEFORE_NAVIGATE); } test_EnumVerbs(webbrowser); diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index d990750..63ac882 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -107,6 +107,7 @@ typedef struct { #define BINDING_FROMHIST 0x0004 #define BINDING_REFRESH 0x0008 #define BINDING_SUBMIT 0x0010 +#define BINDING_NOFRAG 0x0020 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 65161fd..45bcd43 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2184,7 +2184,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, headers = V_BSTR(headers_var); } - hres = super_navigate(window, uri, BINDING_NAVIGATED, headers, post_data, post_data_size); + hres = super_navigate(window, uri, BINDING_NAVIGATED|BINDING_NOFRAG, headers, post_data, post_data_size); IUri_Release(uri); if(post_data) SafeArrayUnaccessData(V_ARRAY(post_data_var)); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3ef255a..b8cdf6c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2210,7 +2210,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC } } - if(!(flags & BINDING_REFRESH) && window->uri_nofrag && !post_data_size) { + if(!(flags & BINDING_NOFRAG) && window->uri_nofrag && !post_data_size) { BOOL eq; hres = IUri_IsEqual(uri_nofrag, window->uri_nofrag, &eq); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8d94209..082777c 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -407,7 +407,7 @@ static void refresh_proc(task_t *_task) IOleCommandTarget_Exec(window->doc_obj->client_cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); } - load_uri(task->window, task->window->uri, BINDING_REFRESH); + load_uri(task->window, task->window->uri, BINDING_REFRESH|BINDING_NOFRAG); } static void refresh_destr(task_t *_task)

1 0

Francois Gouget : kernel32/tests: Skip some profile tests if not allowed to create files in the Windows directory.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: f1087d865b8aa0c4dde43060def21d2d09dc1f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1087d865b8aa0c4dde43060d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 4 15:21:56 2014 +0100 kernel32/tests: Skip some profile tests if not allowed to create files in the Windows directory. --- dlls/kernel32/tests/profile.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index ca3a07e..2eb90a8 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1019,18 +1019,22 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_PATH_NOT_FOUND), /* Win9x and WinME */ "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - /* The resulting file will be X:\\%WINDIR%\\win1.tmp */ + /* Relative paths are relative to X:\\%WINDIR% */ GetWindowsDirectoryA(temp, MAX_PATH); GetTempFileNameA(temp, "win", 1, path); - DeleteFileA(path); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) + skip("Not allowed to create a file in the Windows directory\n"); + else + { + DeleteFileA(path); - /* relative path in lpFileName */ - data = "[App]\r\n" - "key=string\r\n"; - ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(check_file_data(path, data), "File doesn't match\n"); - DeleteFileA(path); + data = "[App]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); + ok(ret == TRUE, "Expected TRUE, got %d, le=%u\n", ret, GetLastError()); + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + } GetTempPathA(MAX_PATH, temp); GetTempFileNameA(temp, "wine", 0, path);

1 0

Alexandre Julliard : configure: Avoid printing empty warning lines.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 237d7891ef17d417b70e096d2d9f0eaebdb19ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237d7891ef17d417b70e096d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 14:40:39 2014 +0100 configure: Avoid printing empty warning lines. --- aclocal.m4 | 4 ++-- configure | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8274b89..3d43721 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -782,13 +782,13 @@ if test "x$wine_notices != "x; then IFS="|" for msg in $wine_notices; do IFS="$ac_save_IFS" - AS_VAR_SET_IF([msg],[AC_MSG_NOTICE([$msg])]) + AS_VAR_IF([msg],[],,[AC_MSG_NOTICE([$msg])]) done fi IFS="|" for msg in $wine_warnings; do IFS="$ac_save_IFS" - AS_VAR_SET_IF([msg],[echo >&2 + AS_VAR_IF([msg],[],,[echo >&2 AC_MSG_WARN([$msg])]) done IFS="$ac_save_IFS"]) diff --git a/configure b/configure index dcd8581..56ddd71 100755 --- a/configure +++ b/configure @@ -18907,7 +18907,9 @@ if test "x$wine_notices != "x; then IFS="|" for msg in $wine_notices; do IFS="$ac_save_IFS" - if ${msg+:} false; then : + if ${msg:+false} :; then : + +else { $as_echo "$as_me:${as_lineno-$LINENO}: $msg" >&5 $as_echo "$as_me: $msg" >&6;} fi @@ -18916,7 +18918,9 @@ fi IFS="|" for msg in $wine_warnings; do IFS="$ac_save_IFS" - if ${msg+:} false; then : + if ${msg:+false} :; then : + +else echo >&2 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $msg" >&5 $as_echo "$as_me: WARNING: $msg" >&2;}

1 0

Henri Verbeet : ddraw: Validate the surface pitch for user memory surfaces in ddraw_surface_init ().
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 9c138d772c692d44103a6641c32f3b74dc83303e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c138d772c692d44103a6641c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:37 2014 +0100 ddraw: Validate the surface pitch for user memory surfaces in ddraw_surface_init(). --- dlls/ddraw/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8cfba29..4a1b112 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6067,6 +6067,12 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s if (desc->dwFlags & DDSD_LPSURFACE) { + if (desc->u1.lPitch < wined3d_surface_get_pitch(wined3d_surface) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); + return DDERR_INVALIDPARAMS; + } + if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, desc->u1.lPitch)))

1 0

Piotr Caban : ole32/tests: Fix DoDragDrop tests.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 9f9fb6b7f1542f33f6ed18d882cfe088780e08d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9fb6b7f1542f33f6ed18d88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 4 10:23:16 2014 +0100 ole32/tests: Fix DoDragDrop tests. --- dlls/ole32/tests/dragdrop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 36328df..8051f58 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -485,7 +485,7 @@ static void test_DoDragDrop(void) HWND hwnd; RECT rect; - hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + hwnd = CreateWindowExA(WS_EX_TOPMOST, "WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, NULL, NULL); ok(IsWindow(hwnd), "failed to create window\n");

1 0

Henri Verbeet : ddraw: User memory surfaces should be in the system memory pool.
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: da2fafca8d504e8794c1d603f5feec1cfbf474f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2fafca8d504e8794c1d603f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:34 2014 +0100 ddraw: User memory surfaces should be in the system memory pool. --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c503992..e49454a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5531,11 +5531,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Ensure DDSD_CAPS is always set. */ desc->dwFlags |= DDSD_CAPS; - /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE - * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ - if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) - desc->dwFlags &= ~DDSD_LPSURFACE; - if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { DWORD flippable = desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_COMPLEX); @@ -5813,6 +5808,17 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } + /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE + * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ + if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) + desc->dwFlags &= ~DDSD_LPSURFACE; + if ((desc->dwFlags & DDSD_LPSURFACE) && wined3d_desc.pool != WINED3D_POOL_SYSTEM_MEM) + { + WARN("User memory surfaces should be in the system memory pool.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) wined3d_desc.usage |= WINED3DUSAGE_OVERLAY;

1 0

Henri Verbeet : ddraw: Don' t overwrite the caller specified pitch in ddraw_surface_init().
by Alexandre Julliard March 4, 2014

March 4, 2014

Module: wine Branch: master Commit: 10db40cecc7455542f13abb097b8167359e05f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db40cecc7455542f13abb09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:36 2014 +0100 ddraw: Don't overwrite the caller specified pitch in ddraw_surface_init(). --- dlls/ddraw/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index af578b3..8cfba29 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6059,10 +6059,10 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); } - else + else if (!(desc->dwFlags & DDSD_LPSURFACE)) { - surface->surface_desc.dwFlags |= DDSD_PITCH; - surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); + desc->dwFlags |= DDSD_PITCH; + desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } if (desc->dwFlags & DDSD_LPSURFACE)

1 0