wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Juan Lang : cryptui/tests: Fix typos.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 8d72b37dace3ff57d1ff2d302db8b4f7bc5aaaed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d72b37dace3ff57d1ff2d302… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:52:47 2009 -0800 cryptui/tests: Fix typos. --- dlls/cryptui/tests/cryptui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 8d15b7f..996df0e 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -559,7 +559,7 @@ static void test_crypt_ui_wiz_import(void) crl = CertEnumCRLsInStore(store, crl); if (crl) count++; - } while (cert); + } while (crl); ok(count == 1, "expected 1 CRL, got %d\n", count); } CertCloseStore(store, 0); @@ -595,7 +595,7 @@ static void test_crypt_ui_wiz_import(void) crl = CertEnumCRLsInStore(store, crl); if (crl) count++; - } while (cert); + } while (crl); ok(count == 0, "expected 0 CRLs, got %d\n", count); } SetLastError(0xdeadbeef); @@ -635,7 +635,7 @@ static void test_crypt_ui_wiz_import(void) crl = CertEnumCRLsInStore(store, crl); if (crl) count++; - } while (cert); + } while (crl); ok(count == 1, "expected 1 CRL, got %d\n", count); } SetLastError(0xdeadbeef);

1 0

Juan Lang : cryptui/tests: Remove a double free.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 73c41f1ef63b84a4b85cd98664fdaaa587225bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c41f1ef63b84a4b85cd9866… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:50:26 2009 -0800 cryptui/tests: Remove a double free. --- dlls/cryptui/tests/cryptui.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 534d0e7..8d15b7f 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -317,7 +317,6 @@ static BOOL find_and_delete_cert_in_store(HCERTSTORE store, PCCERT_CONTEXT cert) return FALSE; CertDeleteCertificateFromStore(found); - CertFreeCertificateContext(found); return TRUE; }

1 0

Juan Lang : crypt32: Don't free a file store's mem store, it' s already freed by the provider store.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: c52d110de18d77995c35bd238fa83ba28416245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52d110de18d77995c35bd238… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:46:13 2009 -0800 crypt32: Don't free a file store's mem store, it's already freed by the provider store. --- dlls/crypt32/filestore.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index f27b3b7..52e5752 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -43,7 +43,6 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) if (store->dirty) CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, store->type, CERT_STORE_SAVE_TO_FILE, store->file, 0); - CertCloseStore(store->memStore, dwFlags); CloseHandle(store->file); CryptMemFree(store); }

1 0

Juan Lang : crypt32: Add a warning if a store's ref count is invalid.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: a16ca1d0395a079418c5bc163a3b8440d125fb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16ca1d0395a079418c5bc163… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:45:52 2009 -0800 crypt32: Add a warning if a store's ref count is invalid. --- dlls/crypt32/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 69578f2..3a786b0 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1175,6 +1175,8 @@ BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) if ( hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC ) return FALSE; + if (hcs->ref <= 0) + ERR("%p's ref count is %d\n", hcs, hcs->ref); if (InterlockedDecrement(&hcs->ref) == 0) { TRACE("%p's ref count is 0, freeing\n", hcs);

1 0

Juan Lang : crypt32: Don' t copy past end of buffer when removing the last string in a multistring.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 88e599c4cf118d323b4566e7f456dcaf5ba309be URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e599c4cf118d323b4566e7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:29:33 2009 -0800 crypt32: Don't copy past end of buffer when removing the last string in a multistring. --- dlls/crypt32/oid.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index ddc6efc..0a3889d 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -873,9 +873,18 @@ static BOOL CRYPT_RemoveStringFromMultiString(LPWSTR multi, LPCWSTR toRemove) { DWORD len = CRYPT_GetMultiStringCharacterLen(multi); - /* Copy remainder of string "left" */ - memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, - (len - (spotToRemove - multi)) * sizeof(WCHAR)); + if (spotToRemove + lstrlenW(toRemove) + 2 >= multi + len) + { + /* Removing last string in list, terminate multi string directly */ + *spotToRemove = 0; + *(spotToRemove + 1) = 0; + } + else + { + /* Copy remainder of string "left" */ + memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, + (len - (spotToRemove - multi)) * sizeof(WCHAR)); + } ret = TRUE; } else

1 0

Juan Lang : wintrust: Fix a test failure on Win2008.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 2768710c363b200a17d83b453bfd303aa4a1d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2768710c363b200a17d83b453… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 13:41:19 2009 -0800 wintrust: Fix a test failure on Win2008. --- dlls/wintrust/tests/softpub.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 31a51a2..c60ccb3 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -326,8 +326,10 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == - TRUST_E_SUBJECT_FORM_UNKNOWN, - "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + TRUST_E_SUBJECT_FORM_UNKNOWN || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_PROVIDER_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN or TRUST_E_PROVIDER_UNKNOWN, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE)

1 0

Jacek Caban : jscript: Don't return function value it' s unless explicitly returned.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 56b04194fcfd4e31c09226eddfe3c57e1972378f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b04194fcfd4e31c09226edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 4 23:19:11 2009 +0100 jscript: Don't return function value it's unless explicitly returned. --- dlls/jscript/engine.c | 5 +++-- dlls/jscript/engine.h | 8 +++++++- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/lang.js | 5 +++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index afb5489..15ef905 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -414,7 +414,8 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, exec_type_t exec_type, + jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; function_declaration_t *func; @@ -493,7 +494,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so return hres; } - if(retv) + if(retv && (exec_type == EXECT_EVAL || rt.type == RT_RETURN)) *retv = val; else VariantClear(&val); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7dcfc13..83096db 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -109,9 +109,15 @@ static inline void exec_addref(exec_ctx_t *ctx) ctx->ref++; } +typedef enum { + EXECT_PROGRAM, + EXECT_FUNCTION, + EXECT_EVAL +} exec_type_t; + void exec_release(exec_ctx_t*); HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,DispatchEx*,scope_chain_t*,exec_ctx_t**); -HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,jsexcept_t*,VARIANT*); +HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,exec_type_t,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; typedef struct _expression_t expression_t; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 60f2e43..346f8e0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -216,7 +216,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis if(FAILED(hres)) return hres; - hres = exec_source(exec_ctx, function->parser, function->source, ei, retv); + hres = exec_source(exec_ctx, function->parser, function->source, EXECT_FUNCTION, ei, retv); exec_release(exec_ctx); return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 9670949..18bff55 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -408,7 +408,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return throw_syntax_error(ctx, ei, hres, NULL); } - hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, ei, retv); + hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, EXECT_EVAL, ei, retv); parser_release(parser_ctx); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index f93962c..602ffae 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -104,7 +104,7 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) IActiveScriptSite_OnEnterScript(This->site); memset(&jsexcept, 0, sizeof(jsexcept)); - hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, &jsexcept, &var); + hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, EXECT_PROGRAM, &jsexcept, &var); VariantClear(&jsexcept.var); exec_release(exec_ctx); if(SUCCEEDED(hres)) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9bb0944..bd22c52 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -109,6 +109,11 @@ ok(typeof(this) === "object", "typeof(this) is not object"); ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); +tmp = (function() {1;})(); +ok(tmp === undefined, "tmp = " + tmp); +tmp = eval("1;"); +ok(tmp === 1, "tmp = " + tmp); + var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); obj1.test = true;

1 0

Detlef Riekenberg : msi/tests: MsiSetExternalUIRecord not present before Installer 3.1.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 0839ae88ca3444cb261e80227311208ebbf0b241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0839ae88ca3444cb261e80227… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 4 21:00:59 2009 +0100 msi/tests: MsiSetExternalUIRecord not present before Installer 3.1. --- dlls/msi/tests/install.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 51e37e8..ccadc63 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -35,6 +35,8 @@ static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); +static UINT (WINAPI *pMsiSetExternalUIRecord) + (INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static UINT (WINAPI *pMsiSourceListEnumSourcesA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); static UINT (WINAPI *pMsiSourceListGetInfoA) @@ -1684,6 +1686,7 @@ static void init_functionpointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(hmsi, MsiQueryComponentStateA); + GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiSourceListGetInfoA); @@ -6888,12 +6891,18 @@ static void test_MsiSetExternalUI(void) ret_a = MsiSetExternalUIA(NULL, 0, NULL); ok(ret_a == handler_a, "expected %p, got %p\n", handler_a, ret_a); - error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); + /* Not present before Installer 3.1 */ + if (!pMsiSetExternalUIRecord) { + win_skip("MsiSetExternalUIRecord is not available\n"); + return; + } + + error = pMsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); ok(prev == NULL, "expected NULL, got %p\n", prev); prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; - error = MsiSetExternalUIRecord(NULL, INSTALLLOGMODE_ERROR, NULL, &prev); + error = pMsiSetExternalUIRecord(NULL, INSTALLLOGMODE_ERROR, NULL, &prev); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); ok(prev == handler_record, "expected %p, got %p\n", handler_record, prev); @@ -6910,7 +6919,7 @@ static void test_MsiSetExternalUI(void) ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; - error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); + error = pMsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); ok(prev == NULL, "expected NULL, got %p\n", prev); @@ -6921,14 +6930,14 @@ static void test_MsiSetExternalUI(void) ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; - error = MsiSetExternalUIRecord(NULL, 0, NULL, &prev); + error = pMsiSetExternalUIRecord(NULL, 0, NULL, &prev); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); ok(prev == handler_record, "expected %p, got %p\n", handler_record, prev); - error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, NULL); + error = pMsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, NULL); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); - error = MsiSetExternalUIRecord(NULL, 0, NULL, NULL); + error = pMsiSetExternalUIRecord(NULL, 0, NULL, NULL); ok(!error, "MsiSetExternalUIRecord failed %u\n", error); }

1 0

Juan Lang : crypt32: Fix a test failure on NT 4.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: e1b2eb3485c897c612e90d0de670fbaec1a719d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b2eb3485c897c612e90d0de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 11:58:28 2009 -0800 crypt32: Fix a test failure on NT 4. --- dlls/crypt32/tests/chain.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 3f36afb..581219a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2201,9 +2201,13 @@ static const ChainPolicyCheck sslPolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, NULL, 0 }; +/* Windows NT 4 has a different error code when the name doesn't match. */ +static const CERT_CHAIN_POLICY_STATUS noMatchingNameBrokenStatus = + { 0, CERT_E_ROLE, 0, 0, NULL }; + static const ChainPolicyCheck sslPolicyCheckWithoutMatchingName = { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &noMatchingNameBrokenStatus, 0 }; static const ChainPolicyCheck authenticodePolicyCheck[] = {

1 0

Alexandre Julliard : ntdll: Reject VirtualAlloc blocks in NtUnmapViewOfSection.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 1a3777e2dc9378961fd44d58a10ead826a3c63d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3777e2dc9378961fd44d58a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 19:53:00 2009 +0100 ntdll: Reject VirtualAlloc blocks in NtUnmapViewOfSection. --- dlls/kernel32/tests/virtual.c | 18 ++++++++++++++++++ dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b7e97db..5187a97 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -748,6 +748,24 @@ static void test_MapViewOfFile(void) ret = UnmapViewOfFile(ptr); ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); CloseHandle(mapping); + + addr = VirtualAlloc(NULL, 0x10000, MEM_COMMIT, PAGE_READONLY ); + ok( addr != NULL, "VirtualAlloc failed with error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ok( !UnmapViewOfFile(addr), "UnmapViewOfFile should fail on VirtualAlloc mem\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, + "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + SetLastError(0xdeadbeef); + ok( !UnmapViewOfFile((char *)addr + 0x3000), "UnmapViewOfFile should fail on VirtualAlloc mem\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, + "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + SetLastError(0xdeadbeef); + ok( !UnmapViewOfFile((void *)0xdeadbeef), "UnmapViewOfFile should fail on VirtualAlloc mem\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, + "got %u, expected ERROR_INVALID_ADDRESS\n", GetLastError()); + + ok( VirtualFree(addr, 0, MEM_RELEASE), "VirtualFree failed\n" ); } static DWORD (WINAPI *pNtMapViewOfSection)( HANDLE handle, HANDLE process, PVOID *addr_ptr, diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fe2ef26..f568eee 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2533,7 +2533,7 @@ done: NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) { FILE_VIEW *view; - NTSTATUS status = STATUS_INVALID_PARAMETER; + NTSTATUS status = STATUS_NOT_MAPPED_VIEW; sigset_t sigset; void *base = ROUND_ADDR( addr, page_mask ); @@ -2552,7 +2552,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, 0 )) && (base == view->base)) + if ((view = VIRTUAL_FindView( base, 0 )) && (base == view->base) && !(view->protect & VPROT_VALLOC)) { delete_view( view ); status = STATUS_SUCCESS;

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009