January 2011 - Wine-commits

Nikolay Sivov : oleaut32: Fix default parameter variant leak (Valgrind).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d902249e54836aa1f7836a74d172ce5b75585a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d902249e54836aa1f7836a74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 02:12:56 2011 +0300 oleaut32: Fix default parameter variant leak (Valgrind). --- dlls/oleaut32/typelib2.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8260ef2..f87ed9f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3313,6 +3313,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( } (*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->cBytes = sizeof(PARAMDESCEX); + VariantInit(&(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); hres = ctl2_decode_variant(This->typelib, typedata[hdr_len + i], &(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); if (FAILED(hres)) { @@ -3749,7 +3750,11 @@ static void WINAPI ITypeInfo2_fnReleaseFuncDesc( if (pFuncDesc->lprgelemdescParam[i].tdesc.vt != VT_USERDEFINED) release_typedesc(pFuncDesc->lprgelemdescParam[i].tdesc.u.lptdesc); - heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + if (pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex) + { + VariantClear(&pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + } } heap_free(pFuncDesc->lprgelemdescParam); }

1 0

Nikolay Sivov : comctl32/tests: Initialize item mask on item insert ( Valgrind).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 0edfb1b4a07b468309da85587d967f6afb0cc611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edfb1b4a07b468309da85587… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:02:43 2011 +0300 comctl32/tests: Initialize item mask on item insert (Valgrind). --- dlls/comctl32/tests/treeview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 457dd70..5ef277c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1425,12 +1425,14 @@ static void test_htreeitem_layout(void) ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; + ins.item.mask = 0; item1 = TreeView_InsertItem(hTree, &ins); check_item(item1, hChild, 0, 0); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; + ins.item.mask = 0; item2 = TreeView_InsertItem(hTree, &ins); check_item(item2, hRoot, hChild, 0);

1 0

Nikolay Sivov : explorerframe/tests: Initialize hit test point before first use (Valgrind).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 5f26248a39a9c61f4dcafd53fcf410083dbcfeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f26248a39a9c61f4dcafd53f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:26:59 2011 +0300 explorerframe/tests: Initialize hit test point before first use (Valgrind). --- dlls/explorerframe/tests/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 2022828..df69a1a 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1611,6 +1611,7 @@ static void test_basics(void) ok(hr == E_POINTER, "Got 0x%08x\n", hr); psi = (void*)0xdeadbeef; + pt.x = pt.y = 0; hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); ok(hr == S_FALSE, "Got 0x%08x\n", hr); ok(psi == NULL, "Got psi %p\n", psi); @@ -1621,7 +1622,6 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); process_msgs(); - pt.x = pt.y = 0; hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr))

1 0

Nikolay Sivov : shlwapi/tests: Reset cookie after service revoked (Valgrind ).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 219f477a050a0a1d0a8861a104e420ef4f9ed3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219f477a050a0a1d0a8861a10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:54:51 2011 +0300 shlwapi/tests: Reset cookie after service revoked (Valgrind). --- dlls/shlwapi/ordinal.c | 3 +++ dlls/shlwapi/tests/ordinal.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3c00b8e..fbfed99 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1571,7 +1571,10 @@ HRESULT WINAPI IUnknown_ProfferService(IUnknown *lpUnknown, REFGUID service, ISe if (pService) hr = IProfferService_ProfferService(proffer, service, pService, pCookie); else + { hr = IProfferService_RevokeService(proffer, *pCookie); + *pCookie = 0; + } IProfferService_Release(proffer); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0125ce4..fc788b7 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2362,6 +2362,7 @@ static ULONG WINAPI IProfferServiceImpl_Release(IProfferService *iface) static HRESULT WINAPI IProfferServiceImpl_ProfferService(IProfferService *iface, REFGUID service, IServiceProvider *pService, DWORD *pCookie) { + *pCookie = 0xdeadbeef; add_call(&trace_got, 3, service, pService, pCookie, 0, 0); return S_OK; } @@ -2419,8 +2420,10 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 3, &dummy_serviceid, provider, &cookie, 0, 0); init_call_trace(&trace_got); + cookie = 0; hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, provider, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie == 0xdeadbeef, "got %x\n", cookie); ok_trace(&trace_expected, &trace_got); free_call_trace(&trace_got); @@ -2434,8 +2437,10 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 4, (void*)(DWORD_PTR)cookie, 0, 0, 0, 0); init_call_trace(&trace_got); + ok(cookie != 0, "got %x\n", cookie); hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, 0, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie == 0, "got %x\n", cookie); ok_trace(&trace_expected, &trace_got); free_call_trace(&trace_got); free_call_trace(&trace_expected);

1 0

Nikolay Sivov : shell32/tests: Fix a dependency on unimplemented function call (Valgrind).
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 4ca01b3475608246a1d71b4194988f4d8099e5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca01b3475608246a1d71b419… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 13:55:47 2011 +0300 shell32/tests: Fix a dependency on unimplemented function call (Valgrind). --- dlls/shell32/tests/progman_dde.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index d7bf432..1e3239d 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -200,14 +200,22 @@ static void init_strings(void) WCHAR module[MAX_PATH]; WCHAR module_expanded[MAX_PATH]; WCHAR localized[MAX_PATH]; + HRESULT hr; int id; MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR)); - pSHGetLocalizedName(startupW, module, MAX_PATH, &id); - ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); - LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); + hr = pSHGetLocalizedName(startupW, module, MAX_PATH, &id); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + /* check to be removed when SHGetLocalizedName is implemented */ + if (hr == S_OK) + { + ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); + LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); - WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + } + else + lstrcpyA(StartupTitle, (strrchr(startup, '\\') + 1)); } else {

1 0

Charles Davis : ntdll: Check for case-insensitive volumes.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 4e44e153c5c78339f17baeabe22f2015cfc8737c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e44e153c5c78339f17baeabe… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Jan 18 13:09:44 2011 -0700 ntdll: Check for case-insensitive volumes. --- configure | 2 + configure.ac | 2 + dlls/ntdll/directory.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 + 4 files changed, 255 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e44e153c5c78339f17ba…

1 0

Alexandre Julliard : server: Create anonymous file mappings in the config directory if the server directory is mounted noexec .
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 8dbd06a1f8ab3f89e46be62e05a51f4b15f20b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dbd06a1f8ab3f89e46be62e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 17:23:45 2011 +0100 server: Create anonymous file mappings in the config directory if the server directory is mounted noexec. --- server/mapping.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c8b8edf..5c77989 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -26,6 +26,9 @@ #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif #include <unistd.h> #include "ntstatus.h" @@ -161,13 +164,47 @@ static int grow_file( int unix_fd, file_pos_t new_size ) return 0; } +/* check if the current directory allows exec mappings */ +static int check_current_dir_for_exec(void) +{ + int fd; + char tmpfn[] = "anonmap.XXXXXX"; + void *ret = MAP_FAILED; + + fd = mkstemps( tmpfn, 0 ); + if (fd == -1) return 0; + if (grow_file( fd, 1 )) + { + ret = mmap( NULL, get_page_size(), PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0 ); + if (ret != MAP_FAILED) munmap( ret, get_page_size() ); + } + close( fd ); + unlink( tmpfn ); + return (ret != MAP_FAILED); +} + /* create a temp file for anonymous mappings */ static int create_temp_file( file_pos_t size ) { - char tmpfn[16]; + static int temp_dir_fd = -1; + char tmpfn[] = "anonmap.XXXXXX"; int fd; - sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ + if (temp_dir_fd == -1) + { + temp_dir_fd = server_dir_fd; + if (!check_current_dir_for_exec()) + { + /* the server dir is noexec, try the config dir instead */ + fchdir( config_dir_fd ); + if (check_current_dir_for_exec()) + temp_dir_fd = config_dir_fd; + else /* neither works, fall back to server dir */ + fchdir( server_dir_fd ); + } + } + else if (temp_dir_fd != server_dir_fd) fchdir( temp_dir_fd ); + fd = mkstemps( tmpfn, 0 ); if (fd != -1) { @@ -179,6 +216,8 @@ static int create_temp_file( file_pos_t size ) unlink( tmpfn ); } else file_set_error(); + + if (temp_dir_fd != server_dir_fd) fchdir( server_dir_fd ); return fd; }

1 0

Alexander Morozov : shell32: Implement IShellDispatch::NameSpace.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 287009875324024f2b4fedea05b4542801a94330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287009875324024f2b4fedea0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:37:20 2011 +0300 shell32: Implement IShellDispatch::NameSpace. --- dlls/shell32/shelldispatch.c | 326 +++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 5 - 2 files changed, 322 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287009875324024f2b4fe…

1 0

Alexander Morozov : shell32: Partially implement Folder::get_Title.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 6fb10a6e9196d6f9025f5391cab577336d78c79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb10a6e9196d6f9025f5391c… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jan 18 21:37:39 2011 +0300 shell32: Partially implement Folder::get_Title. --- dlls/shell32/shelldispatch.c | 17 +++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 4 ---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3ec5347..67501ae 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -180,10 +180,23 @@ static HRESULT WINAPI FolderImpl_Invoke(Folder3 *iface, DISPID dispIdMember, static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *pbs) { - FIXME("(%p,%p)\n", iface, pbs); + FolderImpl *This = impl_from_Folder(iface); + WCHAR *p; + int len; + + TRACE("(%p,%p)\n", iface, pbs); *pbs = NULL; - return E_NOTIMPL; + + if (V_VT(&This->dir) == VT_I4) + { + FIXME("special folder constants are not supported\n"); + return E_NOTIMPL; + } + p = PathFindFileNameW(V_BSTR(&This->dir)); + len = lstrlenW(p); + *pbs = SysAllocStringLen(p, p[len - 1] == '\\' ? len - 1 : len); + return *pbs ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index a34ec39..f253627 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -148,11 +148,9 @@ static void test_namespace(void) if (r == S_OK) { r = Folder_get_Title(folder, &title); - todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); if (r == S_OK) { - todo_wine ok(!lstrcmpW(title, winetestW), "bad title: %s\n", wine_dbgstr_w(title)); SysFreeString(title); @@ -172,11 +170,9 @@ static void test_namespace(void) if (r == S_OK) { r = Folder_get_Title(folder, &title); - todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); if (r == S_OK) { - todo_wine ok(!lstrcmpW(title, winetestW), "bad title: %s\n", wine_dbgstr_w(title)); SysFreeString(title);

1 0

Greg Geldorp : winmm/tests: Skip some tests on VMware.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: e45caf5d6b89599fb13e906492c50aa9d1ed945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45caf5d6b89599fb13e90649… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 28 13:30:21 2011 +0100 winmm/tests: Skip some tests on VMware. --- dlls/winmm/tests/Makefile.in | 2 +- dlls/winmm/tests/midi.c | 82 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 4a74bdf..fcd8ece 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winmm.dll -IMPORTS = winmm user32 +IMPORTS = winmm user32 advapi32 C_SRCS = \ capture.c \ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 01055e3..e40e1d7 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -625,6 +625,72 @@ static void test_midiStream(UINT udev, HWND hwnd) } } +static BOOL scan_subkeys(HKEY parent, const LPCSTR *sub_keys) +{ + char name[64]; + DWORD index = 0; + DWORD name_len = sizeof(name); + BOOL found_vmware = FALSE; + + if (sub_keys[0] == NULL) + { + /* We're at the deepest level, check "Identifier" value now */ + char *test; + if (RegQueryValueExA(parent, "Identifier", NULL, NULL, (LPBYTE) name, &name_len) != ERROR_SUCCESS) + return FALSE; + for (test = name; test < name + lstrlenA(name) - 6 && ! found_vmware; test++) + { + char c = test[6]; + test[6] = '\0'; + found_vmware = (lstrcmpiA(test, "VMware") == 0); + test[6] = c; + } + return found_vmware; + } + + while (RegEnumKeyExA(parent, index, name, &name_len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS && + ! found_vmware) { + char c = name[lstrlenA(sub_keys[0])]; + name[lstrlenA(sub_keys[0])] = '\0'; + if (lstrcmpiA(name, sub_keys[0]) == 0) { + HKEY sub_key; + name[lstrlenA(sub_keys[0])] = c; + if (RegOpenKeyExA(parent, name, 0, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &sub_key) == ERROR_SUCCESS) { + found_vmware = scan_subkeys(sub_key, sub_keys + 1); + RegCloseKey(sub_key); + } + } + + name_len = sizeof(name); + index++; + } + + return found_vmware; +} + +/* + * Usual method to detect whether running inside a VMware virtual machine involves direct port I/O requiring + * some assembly and an exception handler. Can't do that in Wine tests. Alternative method of querying WMI + * is not available on NT4. So instead we look at the device map and check the Identifier value in the + * registry keys HKLM\HARDWARE\DEVICEMAP\SCSI\Scsi Port x\Scsi Bus x\Target Id x\Logical Unit Id x (where + * x is some number). If the Identifier value contains the string "VMware" we assume running in a VMware VM. + */ +static BOOL on_vmware(void) +{ + static const LPCSTR sub_keys[] = { "Scsi Port ", "Scsi Bus ", "Target Id ", "Logical Unit Id ", NULL }; + HKEY scsi; + BOOL found_vmware = FALSE; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\Scsi", 0, KEY_ENUMERATE_SUB_KEYS, &scsi) != ERROR_SUCCESS) + return FALSE; + + found_vmware = scan_subkeys(scsi, sub_keys); + + RegCloseKey(scsi); + + return found_vmware; +} + static void test_midi_outfns(HWND hwnd) { HMIDIOUT hm; @@ -662,11 +728,17 @@ static void test_midi_outfns(HWND hwnd) test_midi_mci(hwnd); for (udev=0; udev < ndevs; udev++) { - trace("** Testing device %d\n", udev); - test_midiOut_device(udev, hwnd); - Sleep(800); /* Let the synth rest */ - test_midiStream(udev, hwnd); - Sleep(800); + MIDIOUTCAPSA capsA; + rc = midiOutGetDevCapsA(udev, &capsA, sizeof(capsA)); + if (rc || strcmp(capsA.szPname, "Creative Sound Blaster MPU-401") != 0 || ! on_vmware()) { + trace("** Testing device %d\n", udev); + test_midiOut_device(udev, hwnd); + Sleep(800); /* Let the synth rest */ + test_midiStream(udev, hwnd); + Sleep(800); + } + else + win_skip("Skipping this device on VMware, driver problem\n"); } trace("** Testing MIDI mapper\n"); test_midiOut_device(MIDIMAPPER, hwnd);

1 0