December 2012 - Wine-Commits

Henri Verbeet : ddraw: Avoid LPD3DFINDDEVICESEARCH.
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

Module: wine Branch: master Commit: 04decc795ae1a317033d09446f3a8a00aa3ed8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04decc795ae1a317033d09446… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:39 2012 +0100 ddraw: Avoid LPD3DFINDDEVICESEARCH. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f74cd19..5b55274 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -216,7 +216,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; }; #undef INTERFACE @@ -262,7 +262,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface, struct IDirect3DDevice2 **device) PURE; }; @@ -310,7 +310,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, struct IDirect3DDevice3 **device, IUnknown *outer) PURE; STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, struct IDirect3DVertexBuffer **buffer,

1 0

Henri Verbeet : d3d10core: Implement d3d10_blend_state_GetDesc().
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

Module: wine Branch: master Commit: 9d86c8b07c4082785ca3677bf7a6786ec8612595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d86c8b07c4082785ca3677bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:41 2012 +0100 d3d10core: Implement d3d10_blend_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b32825e..8164e2f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -216,9 +216,11 @@ struct d3d10_blend_state { ID3D10BlendState ID3D10BlendState_iface; LONG refcount; + + D3D10_BLEND_DESC desc; }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 29f1648..1025b42 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1390,6 +1390,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1397,8 +1400,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa return E_OUTOFMEMORY; } - hr = d3d10_blend_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_blend_state_init(object, desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 387d561..4092acc 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -114,7 +114,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, D3D10_BLEND_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = @@ -132,10 +136,11 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc, }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Jacek Caban : atl80: Fixed some spec file entries.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 9abb9ffe91f034eb53f5788d915d5551a1b38eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abb9ffe91f034eb53f5788d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:26 2012 +0100 atl80: Fixed some spec file entries. --- dlls/atl80/atl80.spec | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 6756776..67f001e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -3,15 +3,13 @@ 12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject -16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit -17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects -18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer -19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib -20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects -21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm -22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer -23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +15 stub AtlComModuleGetClassObject +17 stub AtlComModuleRegisterClassObjects +18 stub AtlComModuleRegisterServer(ptr long ptr) +19 stub AtlRegisterTypeLib(ptr wstr) +20 stub AtlComModuleRevokeClassObjects +22 stub AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC @@ -30,10 +28,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll -44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stub AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper @@ -42,9 +40,8 @@ 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib -56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib -57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +55 stub AtlUnRegisterTypeLib +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx

1 0

Austin English : d3d11: Add a stub dll.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 1d1cb5236e6aa5ee215b1f6e653f2e92830c0427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1cb5236e6aa5ee215b1f6e6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 11 14:11:49 2012 -0800 d3d11: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3d11/Makefile.in | 3 +++ dlls/d3d11/d3d11.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6ddb15f..e96750d 100755 --- a/configure +++ b/configure @@ -15401,6 +15401,7 @@ wine_fn_config_dll d3d10 enable_d3d10 implib wine_fn_config_test dlls/d3d10/tests d3d10_test wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test +wine_fn_config_dll d3d11 enable_d3d11 wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 01d84cd..2a4ea4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2580,6 +2580,7 @@ WINE_CONFIG_DLL(d3d10,,[implib]) WINE_CONFIG_TEST(dlls/d3d10/tests) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) +WINE_CONFIG_DLL(d3d11) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in new file mode 100644 index 0000000..ef3c5a0 --- /dev/null +++ b/dlls/d3d11/Makefile.in @@ -0,0 +1,3 @@ +MODULE = d3d11.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec new file mode 100644 index 0000000..0ff00d2 --- /dev/null +++ b/dlls/d3d11/d3d11.spec @@ -0,0 +1,42 @@ +@ stub D3D11CoreCreateDevice +@ stub D3D11CoreCreateLayeredDevice +@ stub D3D11CoreGetLayeredDeviceSize +@ stub D3D11CoreRegisterLayers +@ stub D3D11CreateDevice +@ stub D3D11CreateDeviceAndSwapChain +@ stub D3DKMTCloseAdapter +@ stub D3DKMTCreateAllocation +@ stub D3DKMTCreateContext +@ stub D3DKMTCreateDevice +@ stub D3DKMTCreateSynchronizationObject +@ stub D3DKMTDestroyAllocation +@ stub D3DKMTDestroyContext +@ stub D3DKMTDestroyDevice +@ stub D3DKMTDestroySynchronizationObject +@ stub D3DKMTEscape +@ stub D3DKMTGetContextSchedulingPriority +@ stub D3DKMTGetDeviceState +@ stub D3DKMTGetDisplayModeList +@ stub D3DKMTGetMultisampleMethodList +@ stub D3DKMTGetRuntimeData +@ stub D3DKMTGetSharedPrimaryHandle +@ stub D3DKMTLock +@ stub D3DKMTOpenAdapterFromHdc +@ stub D3DKMTOpenResource +@ stub D3DKMTPresent +@ stub D3DKMTQueryAdapterInfo +@ stub D3DKMTQueryAllocationResidency +@ stub D3DKMTQueryResourceInfo +@ stub D3DKMTRender +@ stub D3DKMTSetAllocationPriority +@ stub D3DKMTSetContextSchedulingPriority +@ stub D3DKMTSetDisplayMode +@ stub D3DKMTSetDisplayPrivateDriverFormat +@ stub D3DKMTSetGammaRamp +@ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTSignalSynchronizationObject +@ stub D3DKMTUnlock +@ stub D3DKMTWaitForSynchronizationObject +@ stub D3DKMTWaitForVerticalBlankEvent +@ stub OpenAdapter10 +@ stub OpenAdapter10_2

1 0

André Hentschel : winemapi: List ignored attachments.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: d2cf09083de20e1521b6877496d2782f83fe2206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cf09083de20e1521b687749… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 20:14:36 2012 +0100 winemapi: List ignored attachments. --- dlls/winemapi/sendmail.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index e017e2c..03a29ba 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -155,7 +155,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, } if (message->nFileCount) - FIXME("Ignoring attachments\n"); + { + FIXME("Ignoring %u attachments:\n", message->nFileCount); + for (i = 0; i < message->nFileCount; i++) + FIXME("\t%s (%s)\n", debugstr_a(message->lpFiles[i].lpszPathName), + debugstr_a(message->lpFiles[i].lpszFileName)); + } /* Escape subject and body */ subject = escape_string(message->lpszSubject, empty_string);

1 0

André Hentschel : mmdevapi/test: Fix tests on win8.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 20128a923a7385475208c76ad9e65239d97e19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20128a923a7385475208c76ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 16:51:13 2012 +0100 mmdevapi/test: Fix tests on win8. --- dlls/mmdevapi/tests/capture.c | 2 +- include/audioclient.idl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index d64b6a3..feedfde 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -559,7 +559,7 @@ static void test_audioclient(void) ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. diff --git a/include/audioclient.idl b/include/audioclient.idl index 8050ea6..a755604 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -315,6 +315,12 @@ cpp_quote("#define AUDCLNT_E_BUFFER_ERROR AUDCLNT_ERR(0x18)") cpp_quote("#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x19)") /* Hex fail */ cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") +cpp_quote("#define AUDCLNT_E_INVALID_STREAM_FLAG AUDCLNT_ERR(0x021)") +cpp_quote("#define AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE AUDCLNT_ERR(0x022)") +cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") +cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") +cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") +cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)")

1 0

Alexandre Julliard : user32: Start checking for driver events more often when the app doesn' t consume messages properly.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: bd5d5e97767eaa9827a464195be50fdd036d72d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5d5e97767eaa9827a464195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 20:17:21 2012 +0100 user32: Start checking for driver events more often when the app doesn't consume messages properly. --- dlls/user32/message.c | 12 ++++++++++++ dlls/user32/user_private.h | 3 ++- dlls/user32/winproc.c | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3f0312a..79066a8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3671,6 +3671,16 @@ void WINAPI PostQuitMessage( INT exit_code ) SERVER_END_REQ; } +/* check for driver events if we detect that the app is not properly consuming messages */ +static inline void check_for_driver_events(void) +{ + if (get_user_thread_info()->message_count > 200) + { + flush_window_surfaces( FALSE ); + USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + } + else get_user_thread_info()->message_count++; +} /*********************************************************************** * PeekMessageW (USER32.@) @@ -3680,6 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, MSG msg; USER_CheckNotLock(); + check_for_driver_events(); if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { @@ -3726,6 +3737,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); + check_for_driver_events(); if (first || last) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3dc68c3..d743062 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -172,7 +172,8 @@ struct wm_char_mapping_data struct user_thread_info { HANDLE server_queue; /* Handle to server-side queue */ - DWORD recursion_count; /* SendMessage recursion counter */ + WORD recursion_count; /* SendMessage recursion counter */ + WORD message_count; /* Get/PeekMessage loop counter */ BOOL hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ struct received_message_info *receive_info; /* Message being currently received */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3b13b82..e6b5194 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1126,6 +1126,7 @@ static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DW { DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); + if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; return ret; }

1 0

Alexandre Julliard : ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects .
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: a283b986c768d386b4e0937632059f61e0a256be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a283b986c768d386b4e093763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 14:06:46 2012 +0100 ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index af5b0fe..460ed4e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3871,6 +3871,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; + int count = 0; /* call message filter */ @@ -3900,7 +3901,9 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - while (COM_PeekMessage(apt, &msg)) + /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, + * so after processing 100 messages we go back to checking the wait handles */ + while (count++ < 100 && COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg);

1 0

Jacek Caban : atl100: Added AtlWinModuleAddCreateWndData implementation ( based on AtlModuleAddCreateWndData).
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 147dbf63cdf9f3731ba1c0d30efc57a300bb559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=147dbf63cdf9f3731ba1c0d30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:11 2012 +0100 atl100: Added AtlWinModuleAddCreateWndData implementation (based on AtlModuleAddCreateWndData). --- dlls/atl100/atl.c | 16 ++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 7e273b7..bbea756 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -288,6 +288,22 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } /*********************************************************************** + * AtlWinModuleAddCreateWndData [atl100.43] + */ +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData *pData, void *pvObject) +{ + TRACE("(%p, %p, %p)\n", pM, pData, pvObject); + + pData->m_pThis = pvObject; + pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); + pData->m_pNext = pM->m_pCreateWndList; + pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index ec8a858..2204187 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -26,7 +26,7 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stub AtlWinModuleAddCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) 44 stub AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA diff --git a/include/atlbase.h b/include/atlbase.h index ce62474..140a227 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -160,6 +160,13 @@ typedef struct _ATL_MODULEW_TAG _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct +{ + void *m_aT; + int m_nSize; + int m_nAllocSize; +} CSimpleArray; + typedef struct _ATL_MODULE70 { UINT cbSize; @@ -168,10 +175,20 @@ typedef struct _ATL_MODULE70 CComCriticalSection m_csStaticDataInitAndTypeInfo; } _ATL_MODULE70; +typedef struct _ATL_WIN_MODULE70 +{ + UINT cbSize; + CComCriticalSection m_csWindowCreate; + _AtlCreateWndData *m_pCreateWndList; + CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; +} _ATL_WIN_MODULE70; + #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE; +typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; #else typedef _ATL_MODULEW _ATL_MODULE; +typedef _ATL_MODULEW _ATL_WIN_MODULE; #endif typedef struct _ATL_INTMAP_ENTRY_TAG @@ -195,6 +212,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Jacek Caban : atl: Added locking to AtlModuleAddCreateWndData.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 55b0de217321fd3baab12156a19fe035a1c926a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b0de217321fd3baab12156a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:55:58 2012 +0100 atl: Added locking to AtlModuleAddCreateWndData. --- dlls/atl/atl_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 8f8cd76..d7c4dae 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -428,8 +428,11 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData pData->m_pThis = pvObject; pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); pData->m_pNext = pM->m_pCreateWndList; pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); } /***********************************************************************

1 0