December 2012 - Wine-Commits

Jacek Caban : jscript: Fixed deleting properties by name from IDispatchEx interface.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 2d7a3bb4827533ee102497de12c61b850be59c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7a3bb4827533ee102497de1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:44 2012 +0100 jscript: Fixed deleting properties by name from IDispatchEx interface. --- dlls/jscript/dispex.c | 3 ++- dlls/jscript/tests/run.c | 29 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 78809ee..0ecd20a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1535,7 +1535,8 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL if(bstr) { hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); SysFreeString(bstr); - *ret = TRUE; + if(SUCCEEDED(hres)) + *ret = hres == S_OK; }else { hres = E_OUTOFMEMORY; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 46f519a..52fee57 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -89,7 +89,8 @@ DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_testargtypes_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); -DEFINE_EXPECT(testobj_delete); +DEFINE_EXPECT(testobj_delete_test); +DEFINE_EXPECT(testobj_delete_nodelete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_withprop_d); @@ -402,11 +403,19 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static HRESULT WINAPI testObj_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - CHECK_EXPECT(testobj_delete); + if(!strcmp_wa(bstrName, "deleteTest")) { + CHECK_EXPECT(testobj_delete_test); + test_grfdex(grfdex, fdexNameCaseSensitive); + return S_OK; + } + if(!strcmp_wa(bstrName, "noDeleteTest")) { + CHECK_EXPECT(testobj_delete_nodelete); + test_grfdex(grfdex, fdexNameCaseSensitive); + return S_FALSE; + } - ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", wine_dbgstr_w(bstrName)); - test_grfdex(grfdex, fdexNameCaseSensitive); - return S_OK; + ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); + return E_FAIL; } static IDispatchExVtbl testObjVtbl = { @@ -1836,9 +1845,13 @@ static BOOL run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); - SET_EXPECT(testobj_delete); - parse_script_a("delete testObj.deleteTest;"); - CHECK_CALLED(testobj_delete); + SET_EXPECT(testobj_delete_test); + parse_script_a("ok((delete testObj.deleteTest) === true, 'delete testObj.deleteTest did not return true');"); + CHECK_CALLED(testobj_delete_test); + + SET_EXPECT(testobj_delete_nodelete); + parse_script_a("ok((delete testObj.noDeleteTest) === false, 'delete testObj.noDeleteTest did not return false');"); + CHECK_CALLED(testobj_delete_nodelete); SET_EXPECT(global_propdelete_d); SET_EXPECT(DeleteMemberByDispID);

1 0

Jacek Caban : jscript: Fixed deleting nonexistent identifiers.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 4dbd777de289ee58a11b2c9919e9b2765b81941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbd777de289ee58a11b2c991… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:18 2012 +0100 jscript: Fixed deleting nonexistent identifiers. --- dlls/jscript/engine.c | 16 +++++++++++----- dlls/jscript/tests/lang.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbfa460..489aef6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1631,16 +1631,22 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - if(exprval.type != EXPRVAL_IDREF) { + switch(exprval.type) { + case EXPRVAL_IDREF: + hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); + IDispatch_Release(exprval.u.idref.disp); + if(FAILED(hres)) + return ret; + break; + case EXPRVAL_INVALID: + ret = TRUE; + break; + default: FIXME("Unsupported exprval\n"); exprval_release(&exprval); return E_NOTIMPL; } - hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); - IDispatch_Release(exprval.u.idref.disp); - if(FAILED(hres)) - return ret; return stack_push(ctx, jsval_bool(ret)); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f9c05bd..bac2deb 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1123,6 +1123,7 @@ for(iter in tmp) ok(false, "tmp has prop " + iter); ok((delete tmp.test) === true, "deleting test didn't return true"); ok((delete tmp.nonexistent) === true, "deleting nonexistent didn't return true"); +ok((delete nonexistent) === true, "deleting nonexistent didn't return true"); tmp = new Object(); tmp.test = false;

1 0

Ken Thomases : winequartz.drv: Rename to winemac.drv ("the Mac driver").
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 35033025aa9358961053b9d755ca33f93f218b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35033025aa9358961053b9d75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:06:52 2012 -0600 winequartz.drv: Rename to winemac.drv ("the Mac driver"). --- configure | 6 +++--- configure.ac | 8 ++++---- dlls/{winequartz.drv => winemac.drv}/Makefile.in | 4 ++-- .../quartzdrv_main.c => winemac.drv/macdrv_main.c} | 4 ++-- .../winemac.drv.spec} | 0 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index e96750d..7b3b31d 100755 --- a/configure +++ b/configure @@ -6673,7 +6673,7 @@ done then CARBONLIB="-framework Carbon" - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi if test "x$enable_win16" = "xyes" then @@ -7129,7 +7129,7 @@ $as_echo "$ac_cv_c_dll_hpux" >&6; } esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then as_fn_error $? "could not find a way to build shared libraries. @@ -15866,13 +15866,13 @@ wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winejoystick.drv enable_winejoystick_drv +wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder -wine_fn_config_dll winequartz.drv enable_winequartz_drv wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 2a4ea4e..3a07cbf 100644 --- a/configure.ac +++ b/configure.ac @@ -796,11 +796,11 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable quartz driver on Mac OS X + dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" @@ -899,7 +899,7 @@ case $host_os in esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then AC_MSG_ERROR( @@ -3045,13 +3045,13 @@ WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winejoystick.drv) +WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) -WINE_CONFIG_DLL(winequartz.drv) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winequartz.drv/Makefile.in b/dlls/winemac.drv/Makefile.in similarity index 58% rename from dlls/winequartz.drv/Makefile.in rename to dlls/winemac.drv/Makefile.in index 18801f5..4145dff 100644 --- a/dlls/winequartz.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ -MODULE = winequartz.drv +MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 C_SRCS = \ - quartzdrv_main.c + macdrv_main.c @MAKE_DLL_RULES@ diff --git a/dlls/winequartz.drv/quartzdrv_main.c b/dlls/winemac.drv/macdrv_main.c similarity index 94% rename from dlls/winequartz.drv/quartzdrv_main.c rename to dlls/winemac.drv/macdrv_main.c index 88bc6ac..17aebf6 100644 --- a/dlls/winequartz.drv/quartzdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -1,5 +1,5 @@ /* - * QUARTZDRV initialization code + * MACDRV initialization code * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard @@ -27,7 +27,7 @@ #include "winreg.h" /*********************************************************************** - * QUARTZDRV initialisation routine + * MACDRV initialisation routine */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { diff --git a/dlls/winequartz.drv/winequartz.drv.spec b/dlls/winemac.drv/winemac.drv.spec similarity index 100% rename from dlls/winequartz.drv/winequartz.drv.spec rename to dlls/winemac.drv/winemac.drv.spec

1 0

Alexandre Julliard : fonts: Make Tahoma start at character 32.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 9d71d29f26a6f89d4e603c60e355d2ed39153b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d71d29f26a6f89d4e603c60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:04:28 2012 +0100 fonts: Make Tahoma start at character 32. --- fonts/tahoma.sfd | 2244 ++++++++++++++++++++++++++-------------------------- fonts/tahoma.ttf | Bin 101052 -> 100420 bytes fonts/tahomabd.sfd | 1720 ++++++++++++++++++++-------------------- fonts/tahomabd.ttf | Bin 92804 -> 92268 bytes 4 files changed, 1960 insertions(+), 2004 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d71d29f26a6f89d4e603…

1 0

Andrew Talbot : krnl386.exe16: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 10fb1eac9c499d3a017729da4d167d12c0425087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fb1eac9c499d3a017729da4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:37 2012 +0000 krnl386.exe16: Indentation fix. --- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/vga.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 3535ec3..85b9011 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -278,7 +278,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D && DX_reg(context) == 0x3432) TRACE("Check for QEMM v5.0+ (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; @@ -302,7 +302,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49 && DX_reg(context) == 0x8f4f) TRACE("Check for QDPMI.SYS (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index 98edcef..f1b632e 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -1007,12 +1007,12 @@ void VGA_SetPalette(PALETTEENTRY*pal,int start,int len) /* set a single [char wide] color in 16 color mode. */ void VGA_SetColor16(int reg,int color) { - PALETTEENTRY *pal; + PALETTEENTRY *pal; if (!lpddraw) return; - pal= &vga_def64_palette[color]; - IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); - vga_16_palette[reg]=(char)color; + pal= &vga_def64_palette[color]; + IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); + vga_16_palette[reg]=(char)color; } /* Get a single [char wide] color in 16 color mode. */ @@ -1020,7 +1020,7 @@ char VGA_GetColor16(int reg) { if (!lpddraw) return 0; - return vga_16_palette[reg]; + return vga_16_palette[reg]; } /* set all 17 [char wide] colors at once in 16 color mode. */

1 0

Andrew Eikum : mmdevapi: Send notifications to clients when the user-selected default device changes .
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: d4e9b26cbb757f0d12d4585acf5277e2dd2d2347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e9b26cbb757f0d12d4585ac… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:56 2012 -0600 mmdevapi: Send notifications to clients when the user-selected default device changes. --- dlls/mmdevapi/devenum.c | 159 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f9b9172..21a3530 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,6 +59,11 @@ static const WCHAR reg_devicestate[] = { 'D','e','v','i','c','e','S','t','a','t','e',0 }; static const WCHAR reg_properties[] = { 'P','r','o','p','e','r','t','i','e','s',0 }; +static const WCHAR slashW[] = {'\\',0}; +static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; +static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; +static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; +static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; static HKEY key_render; static HKEY key_capture; @@ -916,12 +921,6 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa HKEY key; HRESULT hr; - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; - static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; - static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; - static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; - TRACE("(%p)->(%u,%u,%p)\n", This, flow, role, device); if (!device) @@ -1042,6 +1041,7 @@ struct NotificationClientWrapper { }; static struct list g_notif_clients = LIST_INIT(g_notif_clients); +static HANDLE g_notif_thread; static CRITICAL_SECTION g_notif_lock; static CRITICAL_SECTION_DEBUG g_notif_lock_debug = @@ -1052,6 +1052,147 @@ static CRITICAL_SECTION_DEBUG g_notif_lock_debug = }; static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; +static void notify_clients(EDataFlow flow, ERole role, const WCHAR *id) +{ + struct NotificationClientWrapper *wrapper; + LIST_FOR_EACH_ENTRY(wrapper, &g_notif_clients, + struct NotificationClientWrapper, entry) + IMMNotificationClient_OnDefaultDeviceChanged(wrapper->client, flow, + role, id); + + /* Windows 7 treats changes to eConsole as changes to eMultimedia */ + if(role == eConsole) + notify_clients(flow, eMultimedia, id); +} + +static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +{ + WCHAR new_val[64], *id; + DWORD size; + HRESULT hr; + + size = sizeof(new_val); + if(RegQueryValueExW(key, val_name, 0, NULL, + (BYTE*)new_val, &size) != ERROR_SUCCESS){ + if(old_val[0] != 0){ + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; + } + + /* system default -> system default, noop */ + return 0; + } + + if(!lstrcmpW(old_val, new_val)){ + /* set by user -> same value */ + return 0; + } + + if(new_val[0] != 0){ + /* set by user -> different value */ + notify_clients(flow, role, new_val); + memcpy(old_val, new_val, sizeof(new_val)); + return 1; + } + + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; +} + +static DWORD WINAPI notif_thread_proc(void *user) +{ + HKEY key; + WCHAR reg_key[256]; + WCHAR out_name[64], vout_name[64], in_name[64], vin_name[64]; + DWORD size; + + lstrcpyW(reg_key, drv_keyW); + lstrcatW(reg_key, slashW); + lstrcatW(reg_key, drvs.module_name); + + if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, + MAXIMUM_ALLOWED, NULL, &key, NULL) != ERROR_SUCCESS){ + ERR("RegCreateKeyEx failed: %u\n", GetLastError()); + return 1; + } + + size = sizeof(out_name); + if(RegQueryValueExW(key, reg_out_nameW, 0, NULL, + (BYTE*)out_name, &size) != ERROR_SUCCESS) + out_name[0] = 0; + + size = sizeof(vout_name); + if(RegQueryValueExW(key, reg_vout_nameW, 0, NULL, + (BYTE*)vout_name, &size) != ERROR_SUCCESS) + vout_name[0] = 0; + + size = sizeof(in_name); + if(RegQueryValueExW(key, reg_in_nameW, 0, NULL, + (BYTE*)in_name, &size) != ERROR_SUCCESS) + in_name[0] = 0; + + size = sizeof(vin_name); + if(RegQueryValueExW(key, reg_vin_nameW, 0, NULL, + (BYTE*)vin_name, &size) != ERROR_SUCCESS) + vin_name[0] = 0; + + while(1){ + if(RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, + NULL, FALSE) != ERROR_SUCCESS){ + ERR("RegNotifyChangeKeyValue failed: %u\n", GetLastError()); + RegCloseKey(key); + g_notif_thread = NULL; + return 1; + } + + EnterCriticalSection(&g_notif_lock); + + notify_if_changed(eRender, eConsole, key, reg_out_nameW, + out_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eRender, eCommunications, key, reg_vout_nameW, + vout_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eCapture, eConsole, key, reg_in_nameW, + in_name, &MMDevice_def_rec->IMMDevice_iface); + notify_if_changed(eCapture, eCommunications, key, reg_vin_nameW, + vin_name, &MMDevice_def_rec->IMMDevice_iface); + + LeaveCriticalSection(&g_notif_lock); + } + + RegCloseKey(key); + + g_notif_thread = NULL; + + return 0; +} + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); @@ -1072,6 +1213,12 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn list_add_tail(&g_notif_clients, &wrapper->entry); + if(!g_notif_thread){ + g_notif_thread = CreateThread(NULL, 0, notif_thread_proc, NULL, 0, NULL); + if(!g_notif_thread) + ERR("CreateThread failed: %u\n", GetLastError()); + } + LeaveCriticalSection(&g_notif_lock); return S_OK;

1 0

Andrew Eikum : mmdevapi: Implement (Un)RegisterEndpointNotificationCallback .
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 8d775ec09b80bcc729743ed869fcee896dd399f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d775ec09b80bcc729743ed86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:53 2012 -0600 mmdevapi: Implement (Un)RegisterEndpointNotificationCallback. --- dlls/mmdevapi/devenum.c | 59 ++++++++++++++++++++++++- dlls/mmdevapi/tests/mmdevenum.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d7c5a44..f9b9172 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" #include "initguid.h" @@ -1035,20 +1036,72 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA return E_INVALIDARG; } +struct NotificationClientWrapper { + IMMNotificationClient *client; + struct list entry; +}; + +static struct list g_notif_clients = LIST_INIT(g_notif_clients); + +static CRITICAL_SECTION g_notif_lock; +static CRITICAL_SECTION_DEBUG g_notif_lock_debug = +{ + 0, 0, &g_notif_lock, + { &g_notif_lock_debug.ProcessLocksList, &g_notif_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_notif_lock") } +}; +static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); + + if(!client) + return E_POINTER; + + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + if(!wrapper) + return E_OUTOFMEMORY; + + wrapper->client = client; + + EnterCriticalSection(&g_notif_lock); + + list_add_tail(&g_notif_clients, &wrapper->entry); + + LeaveCriticalSection(&g_notif_lock); + return S_OK; } static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper, *wrapper2; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); - return S_OK; + + if(!client) + return E_POINTER; + + EnterCriticalSection(&g_notif_lock); + + LIST_FOR_EACH_ENTRY_SAFE(wrapper, wrapper2, &g_notif_clients, + struct NotificationClientWrapper, entry){ + if(wrapper->client == client){ + list_remove(&wrapper->entry); + HeapFree(GetProcessHeap(), 0, wrapper); + LeaveCriticalSection(&g_notif_lock); + return S_OK; + } + } + + LeaveCriticalSection(&g_notif_lock); + + return E_NOTFOUND; } static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 82dda40..12e2156 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -118,6 +118,73 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ok(0, "Unexpected QueryInterface call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + ok(0, "Unexpected AddRef call\n"); + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + ok(0, "Unexpected Release call\n"); + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + ok(0, "Unexpected OnDeviceStateChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceAdded call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceRemoved call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + ok(0, "Unexpected OnDefaultDeviceChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + ok(0, "Unexpected OnPropertyValueChanged call\n"); + return E_NOTIMPL; +} + +static IMMNotificationClientVtbl notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient notif = { &notif_vtbl }; + /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { @@ -192,5 +259,29 @@ START_TEST(mmdevenum) test_collection(mme, col); } + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, (IMMNotificationClient*)0xdeadbeef); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + IMMDeviceEnumerator_Release(mme); }

1 0

Alexandre Julliard : include: Force stack alignment also on Linux to work around the ABI breakage.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 4adfb787f4e8c36a37ce1d53a7e6df16d03ecd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adfb787f4e8c36a37ce1d53a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 16:49:47 2012 +0100 include: Force stack alignment also on Linux to work around the ABI breakage. --- include/windef.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 9cf98e7..eb59353 100644 --- a/include/windef.h +++ b/include/windef.h @@ -53,7 +53,7 @@ extern "C" { #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) # else # define __stdcall __attribute__((__stdcall__)) @@ -72,7 +72,7 @@ extern "C" { #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__))

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 85ebbadcb09993b0a91415c2a8447c5bb64969d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ebbadcb09993b0a91415c2a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:16 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/datetime.c | 20 ++++++++++---------- dlls/comctl32/toolbar.c | 6 +++--- dlls/comctl32/treeview.c | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 748e0fc..faecba0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -205,16 +205,16 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy systime->wHour, systime->wMinute, systime->wSecond); if (flag == GDT_VALID) { - if (systime->wYear == 0 || - systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDay < 1 || - systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || - systime->wHour > 23 || - systime->wMinute > 59 || - systime->wSecond > 59 || - systime->wMilliseconds > 999 - ) - return FALSE; + if (systime->wYear == 0 || + systime->wMonth < 1 || systime->wMonth > 12 || + systime->wDay < 1 || + systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || + systime->wHour > 23 || + systime->wMinute > 59 || + systime->wSecond > 59 || + systime->wMilliseconds > 999 + ) + return FALSE; /* Windows returns true if the date is valid but outside the limits set */ if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c26d70e..2a98b6b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5212,9 +5212,9 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) if (infoPtr->himlInt) ImageList_Destroy (infoPtr->himlInt); - TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); - TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); - TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); + TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); + TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); + TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); /* delete default font */ DeleteObject (infoPtr->hDefaultFont); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 22d7180..b0cbc7a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3164,10 +3164,10 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent, { int visOrder = infoPtr->firstVisible->visibleOrder; - if (parent == infoPtr->root) - TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); - else - TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); + if (parent == infoPtr->root) + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); + else + TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); if (TREEVIEW_IsChildOf(parent, infoPtr->firstVisible)) {

1 0

Andrew Talbot : mapi32: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: c8e952c9397d8e998a4506d18cd98cb3241017ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e952c9397d8e998a4506d18… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:41 2012 +0000 mapi32: Indentation fix. --- dlls/mapi32/prop.c | 74 ++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index a623424..ce122a3 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -736,44 +736,44 @@ SCODE WINAPI ScCountProps(INT iCount, LPSPropValue lpProps, ULONG *pcBytes) lpProps[i].ulPropTag == PROP_ID_INVALID) return MAPI_E_INVALID_PARAMETER; - if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) - { - ulPropSize = UlPropSize(&lpProps[i]); - if (!ulPropSize) - return MAPI_E_INVALID_PARAMETER; - } + if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) + { + ulPropSize = UlPropSize(&lpProps[i]); + if (!ulPropSize) + return MAPI_E_INVALID_PARAMETER; + } - switch (PROP_TYPE(lpProps[i].ulPropTag)) - { - case PT_STRING8: - case PT_UNICODE: - case PT_CLSID: - case PT_BINARY: - case PT_MV_I2: - case PT_MV_I4: - case PT_MV_I8: - case PT_MV_R4: - case PT_MV_R8: - case PT_MV_CURRENCY: - case PT_MV_SYSTIME: - case PT_MV_APPTIME: - ulPropSize += sizeof(SPropValue); - break; - case PT_MV_CLSID: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_STRING8: - case PT_MV_UNICODE: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_BINARY: - ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); - break; - default: - ulPropSize = sizeof(SPropValue); - break; - } - ulBytes += ulPropSize; + switch (PROP_TYPE(lpProps[i].ulPropTag)) + { + case PT_STRING8: + case PT_UNICODE: + case PT_CLSID: + case PT_BINARY: + case PT_MV_I2: + case PT_MV_I4: + case PT_MV_I8: + case PT_MV_R4: + case PT_MV_R8: + case PT_MV_CURRENCY: + case PT_MV_SYSTIME: + case PT_MV_APPTIME: + ulPropSize += sizeof(SPropValue); + break; + case PT_MV_CLSID: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_STRING8: + case PT_MV_UNICODE: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_BINARY: + ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); + break; + default: + ulPropSize = sizeof(SPropValue); + break; + } + ulBytes += ulPropSize; } if (pcBytes) *pcBytes = ulBytes;

1 0