November 2009 - Wine-commits

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 : 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 : 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

Paul Vriens : advapi32/tests: Fix a test failure on Vista+.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 6a5f67167871ce0f72f7471d4aaf993b8599abee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5f67167871ce0f72f7471d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 5 11:33:43 2009 +0100 advapi32/tests: Fix a test failure on Vista+. --- dlls/advapi32/tests/eventlog.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3c932ea..702fc43 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -44,6 +44,9 @@ static void create_backup(const char *filename) handle = OpenEventLogA(NULL, "Application"); BackupEventLogA(handle, filename); CloseEventLog(handle); + + todo_wine + ok(GetFileAttributesA(filename) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); } static void test_open_close(void) @@ -561,6 +564,7 @@ static void test_clear(void) HANDLE handle; BOOL ret; const char backup[] = "backup.evt"; + const char backup2[] = "backup2.evt"; SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, NULL); @@ -583,16 +587,28 @@ static void test_clear(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, backup); ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + /* The eventlog service runs under an account that doesn't have the necessary + * permissions on the users home directory on a default Vista+ system. + */ + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_ACCESS_DENIED, /* Vista+ */ + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* Show that ClearEventLog only works for real eventlogs. */ SetLastError(0xdeadbeef); + ret = ClearEventLogA(handle, backup2); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetFileAttributesA(backup2) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); + + SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); CloseEventLog(handle); - DeleteFileA(backup); + todo_wine + ok(DeleteFileA(backup), "Could not delete the backup file\n"); } START_TEST(eventlog)

1 0

Damjan Jovanovic : wiaservc: Add self registration.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 3ec06f8082bcb987dff588a6e9758c140721886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec06f8082bcb987dff588a6e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 4 20:51:19 2009 +0200 wiaservc: Add self registration. --- dlls/wiaservc/Makefile.in | 2 + dlls/wiaservc/rsrc.rc | 20 +++++++ dlls/wiaservc/wiaservc.inf | 28 +++++++++ dlls/wiaservc/wiaservc.spec | 4 +- dlls/wiaservc/wiaservc_main.c | 117 ++++++++++++++++++++++++++++++++++++++ dlls/wiaservc/wiaservc_private.h | 9 +++ tools/wine.inf.in | 1 + 7 files changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 67db949..f73e8dd 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -11,6 +11,8 @@ C_SRCS = \ wiadevmgr.c \ wiaservc_main.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wiaservc/rsrc.rc b/dlls/wiaservc/rsrc.rc new file mode 100644 index 0000000..d54734b --- /dev/null +++ b/dlls/wiaservc/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wiaservc.inf */ +REGINST REGINST wiaservc.inf diff --git a/dlls/wiaservc/wiaservc.inf b/dlls/wiaservc/wiaservc.inf new file mode 100644 index 0000000..c181a60 --- /dev/null +++ b/dlls/wiaservc/wiaservc.inf @@ -0,0 +1,28 @@ +[version] +Signature="$CHICAGO$" + +[RegisterDll] +AddReg = WiaServc.Reg + +[UnregisterDll] +DelReg = WiaServc.Reg + +[WiaServc.Reg] +HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" +HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc" + +HKCR,"CLSID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" +HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%" +HKCR,"CLSID\%CLSID_WiaDevMgr%\ProgID",,,"WiaDevMgr.1" +HKCR,"CLSID\%CLSID_WiaDevMgr%\VersionIndependentProgID",,,"WiaDevMgr" + +HKCR,"WiaDevMgr.1",,,"WIA Device Manager" +HKCR,"WiaDevMgr.1\CLSID",,,"%CLSID_WiaDevMgr%" + +HKCR,"WiaDevMgr",,,"WIA Device Manager" +HKCR,"WiaDevMgr\CLSID",,,"%CLSID_WiaDevMgr%" +HKCR,"WiaDevMgr\CurVer",,,"WiaDevMgr.1" + +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","imgsvc",0x00010000,"StiSvc" + +HKLM,"System\CurrentControlSet\Services\stisvc\Parameters","ServiceDll",0x00020000,"wiaservc.dll" diff --git a/dlls/wiaservc/wiaservc.spec b/dlls/wiaservc/wiaservc.spec index afd2426..510e3e9 100644 --- a/dlls/wiaservc/wiaservc.spec +++ b/dlls/wiaservc/wiaservc.spec @@ -1,6 +1,6 @@ @ stdcall -private ServiceMain(long ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub wiasCreateChildAppItem @ stub wiasCreateDrvItem @ stub wiasCreateLogInstance diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index 2d30f9d..ce979a2 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #include "objbase.h" #include "winuser.h" #include "winreg.h" @@ -28,6 +30,8 @@ #include "wia_lh.h" #include "initguid.h" +#include "wiaservc_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wia); @@ -54,3 +58,116 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +static HRESULT init_register_strtable(STRTABLEA *strtable) +{ +#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } + static const struct { + const char *name; + const CLSID *clsid; + } expns[] = { + CLSID_EXPANSION_ENTRY(WiaDevMgr) + }; +#undef CLSID_EXPANSION_ENTRY + static STRENTRYA pse[sizeof expns / sizeof expns[0]]; + DWORD i; + + strtable->cEntries = sizeof pse / sizeof pse[0]; + strtable->pse = pse; + for (i = 0; i < strtable->cEntries; i++) { + static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; + const CLSID *clsid = expns[i].clsid; + pse[i].pszName = wiaservc_strdup(expns[i].name); + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); + if (!pse[i].pszName || !pse[i].pszValue) + return E_OUTOFMEMORY; + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], + clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); + } + + return S_OK; +} + +static void cleanup_register_strtable(STRTABLEA *strtable) +{ + DWORD i; + for (i = 0; i < strtable->cEntries; i++) { + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); + if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) + return; + } +} + +static HRESULT register_service(BOOL do_register) +{ + static const WCHAR name[] = { 's','t','i','s','v','c', 0 }; + static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', + ' ','-','k',' ','i','m','g','s','v','c', 0 }; + SC_HANDLE scm, service; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!scm) + return SELFREG_E_CLASS; + + if (do_register) + service = CreateServiceW(scm, name, name, SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + path, NULL, NULL, NULL, NULL, NULL); + else + service = OpenServiceW(scm, name, DELETE); + + + CloseServiceHandle(scm); + if (service) + { + if (!do_register) DeleteService(service); + CloseServiceHandle(service); + } + return S_OK; +} + +/* Use an INF file to register or unregister the DLL */ +static HRESULT register_server(BOOL do_register) +{ + HRESULT hr; + STRTABLEA strtable; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + TRACE("(%x)\n", do_register); + + hr = register_service(do_register); + if (FAILED(hr)) { + ERR("register_service failed: %d\n", GetLastError()); + return hr; + } + + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + + hr = init_register_strtable(&strtable); + if (SUCCEEDED(hr)) + hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", + &strtable); + cleanup_register_strtable(&strtable); + + if (FAILED(hr)) + ERR("RegInstall failed: %08x\n", hr); + + return hr; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return register_server(TRUE); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return register_server(FALSE); +} diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index d822958..1032819 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -36,4 +36,13 @@ typedef struct HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj); +/* Little helper functions */ +static inline char * +wiaservc_strdup(const char *s) +{ + size_t n = strlen(s) + 1; + char *d = HeapAlloc(GetProcessHeap(), 0, n); + return d ? memcpy(d, s, n) : NULL; +} + #endif /* __WIASERVC_PRIVATE__ */ diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ac8742b..1550919 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2425,6 +2425,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,sti.dll,1 11,,urlmon.dll,1 11,,wbemprox.dll,1 +11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,wintrust.dll,1 11,,wmiutils.dll,1

1 0

Ilya Shpigor : user32: Fix switching focus to parent after child hiding.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: e6f040407647a3047ca4d1fa3afa137271c658cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f040407647a3047ca4d1fa3… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Wed Nov 4 15:49:11 2009 +0300 user32: Fix switching focus to parent after child hiding. --- dlls/user32/tests/win.c | 11 ++++++++++- dlls/user32/winpos.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0bd6fbf..24e6ac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2298,7 +2298,7 @@ static LRESULT WINAPI set_focus_on_activate_proc(HWND hwnd, UINT msg, WPARAM wp, static void test_SetFocus(HWND hwnd) { - HWND child; + HWND child, child2; WNDPROC old_wnd_proc; /* check if we can set focus to non-visible windows */ @@ -2325,6 +2325,14 @@ static void test_SetFocus(HWND hwnd) ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); ok( GetFocus() == hwnd, "Focus should be on parent %p, not %p\n", hwnd, GetFocus() ); ShowWindow(child, SW_SHOW); + child2 = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 0, 0, child, 0, 0, NULL); + assert(child2); + ShowWindow(child2, SW_SHOW); + SetFocus(child2); + ShowWindow(child, SW_HIDE); + ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); + ok( GetFocus() == child2, "Focus should be on %p, not %p\n", child2, GetFocus() ); + ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); SetWindowPos(child,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_HIDEWINDOW); @@ -2368,6 +2376,7 @@ todo_wine SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); + DestroyWindow( child2 ); DestroyWindow( child ); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c62fdaa..915cb59 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1056,7 +1056,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* Revert focus to parent */ hFocus = GetFocus(); - if (hwnd == hFocus || IsChild(hwnd, hFocus)) + if (hwnd == hFocus) { HWND parent = GetAncestor(hwnd, GA_PARENT); if (parent == GetDesktopWindow()) parent = 0;

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

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

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

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