wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Detlef Riekenberg : krnl386: The 16bit system directory is <windir>\SYSTEM.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 220af426b3f55fa2297fdc969f416ed701f3461c URL: http://source.winehq.org/git/wine.git/?a=commit;h=220af426b3f55fa2297fdc969… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 6 14:37:52 2010 +0100 krnl386: The 16bit system directory is <windir>\SYSTEM. --- dlls/krnl386.exe16/file.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index e4f703d..507b28d 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -190,14 +190,14 @@ static char *get_search_path(void) } len = (2 + /* search order: first current dir */ - GetSystemDirectoryA( NULL, 0 ) + 1 + /* then system dir */ + GetSystemDirectory16( NULL, 0 ) + 1 + /* then system dir */ GetWindowsDirectoryA( NULL, 0 ) + 1 + /* then windows dir */ strlen( module ) + 1 + /* then module path */ GetEnvironmentVariableA( "PATH", NULL, 0 ) + 1); /* then look in PATH */ if (!(ret = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; strcpy( ret, ".;" ); p = ret + 2; - GetSystemDirectoryA( p, ret + len - p ); + GetSystemDirectory16( p, ret + len - p ); p += strlen( p ); *p++ = ';'; GetWindowsDirectoryA( p, ret + len - p ); @@ -629,7 +629,18 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) */ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) { - return GetSystemDirectoryA( path, count ); + static const char * system16 = "\\SYSTEM"; + char windir[MAX_PATH]; + UINT16 len; + + len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16)) + sizeof(system16); + if (count >= len) + { + lstrcpyA(path, windir); + lstrcatA(path, system16); + len--; /* space for the terminating zero is not included on success */ + } + return len; }

1 0

Marcus Meissner : user32: EM_REPLACESEL - handle OOM error.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 69bf18567f666d9568d68c5379a08451311e161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bf18567f666d9568d68c537… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 16:52:46 2010 +0100 user32: EM_REPLACESEL - handle OOM error. --- dlls/user32/edit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 20a853e..5bdef8a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4525,8 +4525,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B { LPSTR textA = (LPSTR)lParam; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); - if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + if (!(textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) break; + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE);

1 0

Marcus Meissner : user32: Remove useless NULL check (Coverity).
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 4d96ffb52b57ffbe6fd6a1229fbd40201bed2c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d96ffb52b57ffbe6fd6a1229… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 16:47:00 2010 +0100 user32: Remove useless NULL check (Coverity). --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5e934a..631d477 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -282,7 +282,7 @@ void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT del if (total < 0) /* we are called from CreateWindow */ { MDICLIENTINFO *ci = get_client_info(hwndClient); - total = ci ? ci->nTotalCreated : 0; + total = ci->nTotalCreated; *id = ci->idFirstChild + ci->nActiveChildren; TRACE("MDI child id %04x\n", *id); }

1 0

Paul Vriens : mshtml/tests: Fix timeouts on Win9x/ WinMe by using more A-functions.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 051fc3458cde8e9f51a27418dbe8751119460bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=051fc3458cde8e9f51a27418d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 6 11:37:28 2010 +0100 mshtml/tests: Fix timeouts on Win9x/WinMe by using more A-functions. --- dlls/mshtml/tests/script.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5cf1d28..fae49c8 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2221,14 +2221,14 @@ static void test_simple_script(void) static void run_js_script(const char *test_name) { WCHAR url[INTERNET_MAX_URL_LENGTH]; + char urlA[INTERNET_MAX_URL_LENGTH]; IPersistMoniker *persist; IHTMLDocument2 *doc; IMoniker *mon; - WCHAR *ptr; MSG msg; HRESULT hres; - static const WCHAR resW[] = {'r','e','s',':','/','/'}; + static const char res[] = "res://"; trace("running %s...\n", test_name); @@ -2239,12 +2239,11 @@ static void run_js_script(const char *test_name) set_client_site(doc, TRUE); do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - memcpy(url, resW, sizeof(resW)); - ptr = url + sizeof(resW)/sizeof(WCHAR); - GetModuleFileNameW(NULL, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url)); - ptr += lstrlenW(ptr); - *ptr++ = '/'; - MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url)); + lstrcpyA(urlA, res); + GetModuleFileNameA(NULL, urlA + lstrlenA(res), sizeof(urlA) - lstrlenA(res)); + lstrcatA(urlA, "/"); + lstrcatA(urlA, test_name); + MultiByteToWideChar(CP_ACP, 0, urlA, -1, url, sizeof(url)/sizeof(WCHAR)); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);

1 0

Reece Dunn : Don't generate FIXME warnings for DllCanUnloadNow.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: a2c41b72f849d4bd79cf7326e933f59bd7688eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c41b72f849d4bd79cf7326e… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Wed Jan 6 08:28:32 2010 +0000 Don't generate FIXME warnings for DllCanUnloadNow. --- dlls/ddrawex/main.c | 1 - dlls/dinput/dinput_main.c | 2 -- dlls/dpnhpast/main.c | 1 - dlls/dsound/dsound_main.c | 5 ++--- dlls/hlink/hlink_main.c | 1 - dlls/hnetcfg/hnetcfg.c | 1 - dlls/inetcomm/inetcomm_main.c | 1 - dlls/infosoft/infosoft_main.c | 1 - dlls/inseng/inseng_main.c | 1 - dlls/itircl/itircl_main.c | 1 - dlls/mmdevapi/main.c | 1 - dlls/mpr/mpr_main.c | 1 - dlls/mscoree/mscoree_main.c | 1 - dlls/msimtf/main.c | 1 - dlls/msxml3/main.c | 1 - dlls/oledb32/main.c | 1 - dlls/olepro32/olepro32stubs.c | 1 - dlls/pstorec/pstorec.c | 1 - dlls/query/query_main.c | 1 - dlls/shell32/shell32_main.c | 1 - dlls/sti/sti_main.c | 1 - dlls/wbemprox/main.c | 1 - dlls/winhttp/main.c | 1 - dlls/wmiutils/main.c | 1 - dlls/wuapi/main.c | 1 - 25 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index f8a1162..534b44f 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -258,7 +258,6 @@ CreateDirectDrawFactory(IUnknown* UnkOuter, REFIID iid, void **obj) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("(void): stub\n"); return S_FALSE; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 27a0e05..513d2c0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -859,8 +859,6 @@ static IClassFactoryImpl DINPUT_CF = {&DICF_Vtbl, 1 }; */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("(void): stub\n"); - return S_FALSE; } diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 74427ba..9a94a33 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -81,7 +81,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME(":stub\n"); return S_OK; } diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 490d0ef..ee1d43b 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -628,12 +628,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) * Determines whether the DLL is in use. * * RETURNS - * Success: S_OK - * Failure: S_FALSE + * Can unload now: S_OK + * Cannot unload now (the DLL is still active): S_FALSE */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("(void): stub\n"); return S_FALSE; } diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1a15c08..d07901a 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -55,7 +55,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_OK; } diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 72336f9..3ecc8c2 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -147,6 +147,5 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 22f1919..dac1a5c 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -197,6 +197,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index e095ab4..78c097e 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -147,7 +147,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 8ceb252..f1f148b 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -61,7 +61,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index b8d5751..e2f1ed3 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -71,6 +71,5 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_FALSE; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index df5f9e7..36a844f 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -53,7 +53,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_FALSE; } diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c index 3f9ea4a..5ec6b22 100644 --- a/dlls/mpr/mpr_main.c +++ b/dlls/mpr/mpr_main.c @@ -78,7 +78,6 @@ BOOL WINAPI _MPR_25( LPBYTE lpMem, INT len ) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("Stub\n"); return S_OK; } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 5b45adb..3071e7a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -347,7 +347,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) HRESULT WINAPI DllCanUnloadNow(VOID) { - FIXME("stub\n"); return S_OK; } diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 8e24a4c..6b8957b 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -151,7 +151,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); return S_FALSE; } diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index c31a53a..9b1eb82 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -104,7 +104,6 @@ static int wineXmlFileCloseCallback (void * context) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 6e22f71..3236244 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -140,6 +140,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("(): stub\n"); return S_FALSE; } diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index 04b1868..a93c24c 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -53,7 +53,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_OK; } diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index debb222..493501f 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -390,6 +390,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_OK; } diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index cdf0966..2d4e4ae 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -64,7 +64,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 5f6a81d..969dfad 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1192,7 +1192,6 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_FALSE; } diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 7568589..711c17f 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -162,6 +162,5 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) */ HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index c22f57f..3dd2122 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -145,6 +145,5 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 945123a..b1ce75d 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -62,7 +62,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); return S_FALSE; } diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index 6dda4bc..ce9bd25 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -142,6 +142,5 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; } diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index d8d6fcb..d46ad38 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -149,6 +149,5 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; }

1 0

Tillmann Werner : winedump: Fix null pointer dereference in spec mode.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 29e58e30f14cbb6aadb1b99851718f36b014916d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e58e30f14cbb6aadb1b9985… Author: Tillmann Werner <tillmann.werner(a)gmx.de> Date: Tue Jan 5 22:20:44 2010 +0100 winedump: Fix null pointer dereference in spec mode. --- tools/winedump/pe.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index a2c2f0a..d00d2ea 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1631,11 +1631,9 @@ int dll_open (const char *dll_name) */ int dll_next_symbol (parsed_symbol * sym) { - if (!dll_current_symbol->symbol) - return 1; - - assert (dll_symbols); - + if (!dll_current_symbol || !dll_current_symbol->symbol) + return 1; + assert (dll_symbols); sym->symbol = strdup (dll_current_symbol->symbol); sym->ordinal = dll_current_symbol->ordinal; dll_current_symbol++;

1 0

David Adam : dmloader: Fix a possible null dereference.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 5e39af2683978d97781b850f4259b5ba3d2ab2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e39af2683978d97781b850f4… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jan 6 04:49:39 2010 +0100 dmloader: Fix a possible null dereference. --- configure | 9 ++++++ configure.ac | 1 + dlls/dmloader/loader.c | 2 + dlls/dmloader/tests/Makefile.in | 13 +++++++++ dlls/dmloader/tests/loader.c | 57 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4680051..b81612d 100755 --- a/configure +++ b/configure @@ -14505,6 +14505,14 @@ dlls/dmloader/Makefile: dlls/dmloader/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dmloader/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/dmloader/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dmloader/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dmloader/tests/Makefile: dlls/dmloader/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/dmloader/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmscript/Makefile" test "x$enable_dmscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ dmscript" @@ -18839,6 +18847,7 @@ do "dlls/dmcompos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmcompos/Makefile" ;; "dlls/dmime/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmime/Makefile" ;; "dlls/dmloader/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmloader/Makefile" ;; + "dlls/dmloader/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmloader/tests/Makefile" ;; "dlls/dmscript/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmscript/Makefile" ;; "dlls/dmstyle/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmstyle/Makefile" ;; "dlls/dmsynth/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmsynth/Makefile" ;; diff --git a/configure.ac b/configure.ac index 417e245..6cae9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -2224,6 +2224,7 @@ WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmloader/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dmloader/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dmscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmstyle/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmsynth/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 393b6b9..0e9748d 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -644,6 +644,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (L ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); TRACE("(%p, %p)\n", This, pObject); + if(!pObject) return E_POINTER; + /* get descriptor */ DM_STRUCT_INIT(&Desc); IDirectMusicObject_GetDescriptor (pObject, &Desc); diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in new file mode 100644 index 0000000..48a08f4 --- /dev/null +++ b/dlls/dmloader/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dmloader.dll +IMPORTS = ole32 kernel32 + +CTESTS = \ + loader.c + +@MAKE_TEST_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c new file mode 100644 index 0000000..dc1ff7a --- /dev/null +++ b/dlls/dmloader/tests/loader.c @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2010 David Adam + * + * 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 + */ + +#include <assert.h> + +#define COBJMACROS + +#include "initguid.h" +#include "dmusici.h" +#include "wine/test.h" + +static void test_release_object(void) +{ + HRESULT hr; + IDirectMusicLoader8* loader = NULL; + + hr = CoInitialize(NULL); + if ( FAILED(hr) ) + { + skip("CoInitialize failed.\n"); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + if ( FAILED(hr) ) + { + skip("CoCreateInstance failed.\n"); + CoUninitialize(); + return; + } + + hr = IDirectMusicLoader_ReleaseObject(loader, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); + + IDirectMusicLoader_Release(loader); + CoUninitialize(); +} + +START_TEST(loader) +{ + test_release_object(); +}

1 0

Alexandre Julliard : user32: Remove a useless comment.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 993de4d82f910258fd2a36b4b7bef4af741e1012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993de4d82f910258fd2a36b4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 6 09:54:35 2010 +0100 user32: Remove a useless comment. --- dlls/user32/painting.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 883b0c1..cde642c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1110,16 +1110,6 @@ BOOL WINAPI LockWindowUpdate( HWND hwnd ) { static HWND lockedWnd; - /* This function is fully implemented by the following patch: - * - * http://www.winehq.org/hypermail/wine-patches/2004/01/0142.html - * - * but in order to work properly, it needs the ability to invalidate - * DCEs in other processes when the lock window is changed, which - * isn't possible yet. - * -mike - */ - FIXME("(%p), partial stub!\n",hwnd); USER_Lock();

1 0

Maarten Lankhorst : mmdevapi: Fix reference leak in tests.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 7615ec070055951a4bda237e54d59c8b28b0d627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7615ec070055951a4bda237e5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 5 22:35:18 2010 +0100 mmdevapi: Fix reference leak in tests. Reported by Dan Kegel --- dlls/mmdevapi/tests/mmdevenum.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 9e8e55c..35e0152 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -82,14 +82,18 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); ok(dev == NULL, "Returned non-null device\n"); - if (!numdev) return; - hr = IMMDeviceCollection_Item(col, 0, NULL); - ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); - - hr = IMMDeviceCollection_Item(col, 0, &dev); - ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); - ok(dev != NULL, "Device is null!\n"); - if (dev) IUnknown_Release(dev); + if (numdev) + { + hr = IMMDeviceCollection_Item(col, 0, NULL); + ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); + + hr = IMMDeviceCollection_Item(col, 0, &dev); + ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); + ok(dev != NULL, "Device is null!\n"); + if (dev) + IUnknown_Release(dev); + } + IUnknown_Release(col); } /* Only do parameter tests here, the actual MMDevice testing should be a separate test */

1 0

Maarten Lankhorst : Revert "dsound: Only initialize one guid for capture and renderer."
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: ef0a0d8b86b42962d5b8a114097943168f53c251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0a0d8b86b42962d5b8a1140… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 5 22:20:52 2010 +0100 Revert "dsound: Only initialize one guid for capture and renderer." Reverts b474649e0e9491f938f1daec74cdca01343dd97e. Some games use pointers to the guid rather than copying the guid even after the enumeration function returns. Allocating on the stack breaks those games. --- dlls/dsound/capture.c | 11 ++++-- dlls/dsound/dsound.c | 10 +++-- dlls/dsound/dsound_main.c | 76 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 5 ++- dlls/dsound/propset.c | 14 +++---- 5 files changed, 60 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef0a0d8b86b42962d5b8a…

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
62
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 January 2010