wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Stefan Dösinger : dinput: Make the creation functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 024dcba89a834004264910b079d33177a279ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024dcba89a834004264910b07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:18:32 2009 +0200 dinput: Make the creation functions hookable. --- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput8/dinput8_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9769d74..78a5e26 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -162,7 +162,7 @@ HRESULT WINAPI DirectInputCreateEx( /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); } @@ -170,7 +170,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU /****************************************************************************** * DirectInputCreateW (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index c855caf..77f7f64 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -50,7 +50,7 @@ static void UnlockModule(void) /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { HRESULT hr; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);

1 0

Stefan Dösinger : ddraw: Make directdraw create functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 64367542d0dfb143ec5076b2f2d6f53d4d040dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64367542d0dfb143ec5076b2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:15:31 2009 +0200 ddraw: Make directdraw create functions hookable. --- dlls/ddraw/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2a0d8f0..24de0a2 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -303,7 +303,7 @@ err_out: * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreate(GUID *GUID, LPDIRECTDRAW *DD, IUnknown *UnkOuter) @@ -326,7 +326,7 @@ DirectDrawCreate(GUID *GUID, * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreateEx(GUID *GUID, LPVOID *DD, REFIID iid,

1 0

Stefan Dösinger : d3d9: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: dcacd83a82019b117cf628cb338231822961aa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcacd83a82019b117cf628cb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:19:25 2009 +0200 d3d9: Make some functions hookable. --- dlls/d3d9/d3d9_main.c | 4 ++-- dlls/d3d9/device.c | 10 +++++----- dlls/d3d9/directx.c | 10 +++++----- dlls/d3d9/swapchain.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index f59fc46..e8b4a97 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -33,7 +33,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { +IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl)); object->lpVtbl = &Direct3D9_Vtbl; @@ -53,7 +53,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { return (IDirect3D9*) object; } -HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { +HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { IDirect3D9 *ret; IDirect3D9Impl* object; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a37f81..7899a19 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -235,7 +235,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9EX iface) { return ref; } -static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { +static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; ULONG ref; @@ -490,7 +490,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data return ret; } -static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; @@ -568,7 +568,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; @@ -1288,7 +1288,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9EX if return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -1451,7 +1451,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(IDirect3DDevice9Ex *i return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 301f901..b1c5459 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -394,10 +394,10 @@ ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); } -static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, - HWND hFocusWindow, DWORD BehaviourFlags, - D3DPRESENT_PARAMETERS* pPresentationParameters, - IDirect3DDevice9** ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + IDirect3DDevice9** ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; IDirect3DDevice9Impl *object = NULL; @@ -524,7 +524,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *ifa return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p)->(%d, %d, %p, 0x%08x, %p, %p, %p): Stub!\n", This, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, pFullscreenDisplayMode, ppReturnedDeviceInterface); *ppReturnedDeviceInterface = NULL; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 461db37..5a7e4a2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -77,7 +77,7 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) } /* IDirect3DSwapChain9 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; @@ -211,7 +211,7 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = /* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSwapChain9Impl* object; HRESULT hrc = D3D_OK; @@ -282,7 +282,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE return hrc; } -HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hrc = D3D_OK; IWineD3DSwapChain *swapchain = NULL;

1 0

Stefan Dösinger : d3d8: Make Direct3DCreate8 hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: f54d6c366d1e84255b5948d67ed14c063e2543bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54d6c366d1e84255b5948d67… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:58 2009 +0200 d3d8: Make Direct3DCreate8 hookable. --- dlls/d3d8/d3d8_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 6300371..e5f44e7 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -35,7 +35,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) { +IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { IDirect3D8Impl* object; TRACE("SDKVersion = %x\n", SDKVersion);

1 0

Stefan Dösinger : shell32: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 29d72a53abcc95860a04b5ff733f7895fa560d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d72a53abcc95860a04b5ff7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:47 2009 +0200 shell32: Make some functions hookable. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1a12e51..20e2888 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1875,7 +1875,7 @@ HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, * ShellExecuteExA [SHELL32.292] * */ -BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExA (LPSHELLEXECUTEINFOA sei) { SHELLEXECUTEINFOW seiW; BOOL ret; @@ -1922,7 +1922,7 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) * ShellExecuteExW [SHELL32.293] * */ -BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { return SHELL_execute( sei, SHELL_ExecuteW ); }

1 0

Stefan Dösinger : user32: Make some functions hookable .
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: acebc001b724870629db681cbd5e19d98ab4b9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=acebc001b724870629db681cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:56 2009 +0200 user32: Make some functions hookable. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/input.c | 18 +++++++++--------- dlls/user32/message.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2ed1138..1ae33aa 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1803,7 +1803,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, * RETURNS * A handle to the previous cursor shape. */ -HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) +HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { struct user_thread_info *thread_info = get_user_thread_info(); HCURSOR hOldCursor; @@ -1824,7 +1824,7 @@ HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) /*********************************************************************** * ShowCursor (USER32.@) */ -INT WINAPI ShowCursor( BOOL bShow ) +INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -1858,7 +1858,7 @@ HCURSOR WINAPI GetCursor(void) /*********************************************************************** * ClipCursor (USER32.@) */ -BOOL WINAPI ClipCursor( const RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) { RECT virt; @@ -1881,7 +1881,7 @@ BOOL WINAPI ClipCursor( const RECT *rect ) /*********************************************************************** * GetClipCursor (USER32.@) */ -BOOL WINAPI GetClipCursor( RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { /* If this is first time - initialize the rect */ if (IsRectEmpty( &CURSOR_ClipRect )) ClipCursor( NULL ); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dc0ce56..bfe80c4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -192,7 +192,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, /*********************************************************************** * GetCursorPos (USER32.@) */ -BOOL WINAPI GetCursorPos( POINT *pt ) +BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { if (!pt) return FALSE; return USER_Driver->pGetCursorPos( pt ); @@ -215,7 +215,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** * SetCursorPos (USER32.@) */ -BOOL WINAPI SetCursorPos( INT x, INT y ) +BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { return USER_Driver->pSetCursorPos( x, y ); } @@ -224,7 +224,7 @@ BOOL WINAPI SetCursorPos( INT x, INT y ) /********************************************************************** * SetCapture (USER32.@) */ -HWND WINAPI SetCapture( HWND hwnd ) +HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { HWND previous; @@ -236,7 +236,7 @@ HWND WINAPI SetCapture( HWND hwnd ) /********************************************************************** * ReleaseCapture (USER32.@) */ -BOOL WINAPI ReleaseCapture(void) +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) { BOOL ret = set_capture_window( 0, 0, NULL ); @@ -271,7 +271,7 @@ HWND WINAPI GetCapture(void) * bit set to 1 if currently pressed, low-order bit set to 1 if key has * been pressed. */ -SHORT WINAPI GetAsyncKeyState(INT nKey) +SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState(INT nKey) { if (nKey < 0 || nKey > 256) return 0; @@ -370,7 +370,7 @@ UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); @@ -393,7 +393,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, P /****************************************************************** * GetRawInputBuffer (USER32.@) */ -UINT WINAPI GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) +UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) { FIXME("(pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n", pData, pcbSize, cbSizeHeader); @@ -474,7 +474,7 @@ BOOL WINAPI AttachThreadInput( DWORD from, DWORD to, BOOL attach ) * keyboard-input message. This function retrieves the state of the key * at the time the input message was generated. */ -SHORT WINAPI GetKeyState(INT vkey) +SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { SHORT retval = 0; @@ -493,7 +493,7 @@ SHORT WINAPI GetKeyState(INT vkey) /********************************************************************** * GetKeyboardState (USER32.@) */ -BOOL WINAPI GetKeyboardState( LPBYTE state ) +BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4e9a62c..80eadec 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3059,7 +3059,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) * * See DispatchMessageW. */ -LRESULT WINAPI DispatchMessageA( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) { LRESULT retval; @@ -3130,7 +3130,7 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) * ECMA-234, Win32 * */ -LRESULT WINAPI DispatchMessageW( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) { LRESULT retval;

1 0

Stefan Dösinger : kernel32: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 282cc71aedaa8feb5207e73bd748fd422f147b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282cc71aedaa8feb5207e73bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:20 2009 +0200 kernel32: Make some functions hookable. --- dlls/kernel32/module.c | 10 +++++----- dlls/kernel32/process.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index fc75475..05d5add 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -919,7 +919,7 @@ done: * ignore the parameter because it would be extremely difficult to * integrate this with different types of module representations. */ -HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) { WCHAR *libnameW; @@ -932,7 +932,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) * * Unicode version of LoadLibraryExA. */ -HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) { UNICODE_STRING wstr; HMODULE res; @@ -974,7 +974,7 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) * NOTES * See LoadLibraryExA(). */ -HMODULE WINAPI LoadLibraryA(LPCSTR libname) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryA(LPCSTR libname) { return LoadLibraryExA(libname, 0, 0); } @@ -984,7 +984,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR libname) * * Unicode version of LoadLibraryA. */ -HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryW(LPCWSTR libnameW) { return LoadLibraryExW(libnameW, 0, 0); } @@ -1001,7 +1001,7 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) * Success: TRUE. The dll is removed if it is not still in use. * Failure: FALSE. Use GetLastError() to determine the cause. */ -BOOL WINAPI FreeLibrary(HINSTANCE hLibModule) +BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) { BOOL retv = FALSE; NTSTATUS nts; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df09558..eca9e38 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1895,10 +1895,10 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, /********************************************************************** * CreateProcessA (KERNEL32.@) */ -BOOL WINAPI CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) { BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; @@ -1937,10 +1937,10 @@ done: /********************************************************************** * CreateProcessW (KERNEL32.@) */ -BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) { BOOL retv = FALSE; HANDLE hFile = 0;

1 0

Stefan Dösinger : configure: Check for ms_hook_prologue attribute support.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: fdac5e57d3fd8ebe5044a076ff27566d6122e93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdac5e57d3fd8ebe5044a076f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:08:53 2009 +0200 configure: Check for ms_hook_prologue attribute support. --- configure | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 15 +++++++++++++++ include/config.h.in | 3 +++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 72251ba..dae14db 100755 --- a/configure +++ b/configure @@ -11702,6 +11702,44 @@ if test $ac_cv_cflags__Werror = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Werror" fi fi + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_hook_prologue attribute" >&5 +$as_echo_n "checking for ms_hook_prologue attribute... " >&6; } +if test "${ac_cv_have_ms_hook_prologue+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __attribute__((__ms_hook_prologue__)) test(void) { return 0; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_ms_hook_prologue="yes" +else + ac_cv_have_ms_hook_prologue="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ms_hook_prologue" >&5 +$as_echo "$ac_cv_have_ms_hook_prologue" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + +$as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>confdefs.h + + else + $as_echo "#define DECLSPEC_HOTPATCH /* */" >>confdefs.h + + fi fi diff --git a/configure.ac b/configure.ac index 813b198..5210c35 100644 --- a/configure.ac +++ b/configure.ac @@ -1505,6 +1505,21 @@ then then WINE_TRY_CFLAGS([-Werror]) fi + + dnl Check for ms_hook_prologue support + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_CACHE_CHECK([for ms_hook_prologue attribute], ac_cv_have_ms_hook_prologue, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])], + [ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + AC_DEFINE(DECLSPEC_HOTPATCH, [__attribute__((__ms_hook_prologue__))], + [Define to a function attribute for Microsoft hotpatch assembly prefix.]) + else + AC_DEFINE(DECLSPEC_HOTPATCH, [/* */]) + fi fi dnl **** Check for underscore on external symbols **** diff --git a/include/config.h.in b/include/config.h.in index 0be8f4d..16b2e90 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,6 +2,9 @@ #define __WINE_CONFIG_H +/* Define to a function attribute for Microsoft hotpatch assembly prefix. */ +#undef DECLSPEC_HOTPATCH + /* Define to the file extension for executables. */ #undef EXEEXT

1 0

Paul Vriens : winmm/tests: Fix some test failures in Win9x and WinMe.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 55b3a9c906b01544b0bbb35c1dfa14aed0932944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b3a9c906b01544b0bbb35c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 14 10:56:36 2009 +0200 winmm/tests: Fix some test failures in Win9x and WinMe. --- dlls/winmm/tests/wave.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8a9caf2..3e3afbd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -791,9 +791,11 @@ static void wave_out_test_deviceOut(int device, double duration, } for (i = 0; i < headers; i++) { - ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), - "WHDR_DONE WHDR_PREPARED expected, got %s\n", - wave_header_flags(frags[i].dwFlags)); + ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED) || + broken((flags & CALLBACK_TYPEMASK)==CALLBACK_EVENT && + frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED|0x1000)), /* < NT4 */ + "(%02d) WHDR_DONE WHDR_PREPARED expected, got %s\n", + i, wave_header_flags(frags[i].dwFlags)); } check_position(device, wout, length * (loops + 1), pwfx); }

1 0

Alexander Kochetkov : oleaut32: Fix null terminator in SysReAllocStringLen.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: ae4de9d6956a18b2e8bff0cfd2a3122e30e05fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4de9d6956a18b2e8bff0cfd… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:37:20 2009 +0400 oleaut32: Fix null terminator in SysReAllocStringLen. --- dlls/oleaut32/oleaut.c | 15 ++++++--------- dlls/oleaut32/tests/vartype.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 896d6d4..72b70e2 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -298,15 +298,12 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); *old = (BSTR)(ptr+1); *ptr = newbytelen; - if (str) { - memmove(*old, str, newbytelen); - (*old)[len] = 0; - } else { - /* Subtle hidden feature: The old string data is still there - * when 'in' is NULL! - * Some Microsoft program needs it. - */ - } + /* Subtle hidden feature: The old string data is still there + * when 'in' is NULL! + * Some Microsoft program needs it. + */ + if (str) memmove(*old, str, newbytelen); + (*old)[len] = 0; } else { /* * Allocate the new string diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b50a673..87f2901 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5422,7 +5422,7 @@ static void test_SysReAllocStringLen(void) if (str) { ok (str == oldstr, "Expected reuse of the old string memory\n"); - todo_wine ok (str[STRING_SIZE] == 0, + ok (str[STRING_SIZE] == 0, "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); SysFreeString(str); }

1 0

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 October 2009