December 2006 - Wine-commits

Pierre d'Herbemont : user32: Factorize graphics driver SetParent into user32.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 221b044740e97c1af710b4222fdeafb8e8d6bf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=221b044740e97c1af710b4222… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Sun Dec 10 23:21:28 2006 +0100 user32: Factorize graphics driver SetParent into user32. --- dlls/user32/driver.c | 7 ++-- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 39 +++++++++++++++++++- dlls/winex11.drv/window.c | 73 +++++++++---------------------------- dlls/winex11.drv/winex11.drv.spec | 2 +- 5 files changed, 60 insertions(+), 63 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index b5bf7a8..0c93a67 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -365,9 +365,8 @@ static void nulldrv_SetFocus( HWND hwnd { } -static HWND nulldrv_SetParent( HWND hwnd, HWND parent ) +static void nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { - return 0; } static BOOL nulldrv_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, @@ -684,9 +683,9 @@ static void loaderdrv_SetFocus( HWND hwn load_driver()->pSetFocus( hwnd ); } -static HWND loaderdrv_SetParent( HWND hwnd, HWND parent ) +static void loaderdrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { - return load_driver()->pSetParent( hwnd, parent ); + load_driver()->pSetParent( hwnd, parent, old_parent ); } static BOOL loaderdrv_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5fad289..ae27884 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -148,7 +148,7 @@ typedef struct tagUSER_DRIVER { INT (*pReleaseDC)(HWND,HDC,BOOL); BOOL (*pScrollDC)(HDC, INT, INT, const RECT *, const RECT *, HRGN, LPRECT); void (*pSetFocus)(HWND); - HWND (*pSetParent)(HWND,HWND); + void (*pSetParent)(HWND,HWND,HWND); BOOL (*pSetWindowPos)(HWND,HWND,const RECT *,const RECT *,UINT,const RECT *); int (*pSetWindowRgn)(HWND,HRGN,BOOL); void (*pSetWindowIcon)(HWND,UINT,HICON); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9ee1c00..42b7696 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2531,6 +2531,10 @@ HWND WINAPI GetAncestor( HWND hwnd, UINT HWND WINAPI SetParent( HWND hwnd, HWND parent ) { HWND full_handle; + HWND old_parent = 0; + BOOL was_visible; + WND *wndPtr; + BOOL ret; if (is_broadcast(hwnd) || is_broadcast(parent)) { @@ -2557,7 +2561,40 @@ HWND WINAPI SetParent( HWND hwnd, HWND p if (!(full_handle = WIN_IsCurrentThread( hwnd ))) return (HWND)SendMessageW( hwnd, WM_WINE_SETPARENT, (WPARAM)parent, 0 ); - return USER_Driver->pSetParent( full_handle, parent ); + /* Windows hides the window first, then shows it again + * including the WM_SHOWWINDOW messages and all */ + was_visible = ShowWindow( hwnd, SW_HIDE ); + + wndPtr = WIN_GetPtr( hwnd ); + if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; + + SERVER_START_REQ( set_parent ) + { + req->handle = hwnd; + req->parent = parent; + if ((ret = !wine_server_call( req ))) + { + old_parent = reply->old_parent; + wndPtr->parent = parent = reply->full_parent; + } + + } + SERVER_END_REQ; + WIN_ReleasePtr( wndPtr ); + if (!ret) return 0; + + USER_Driver->pSetParent( full_handle, parent, old_parent ); + + /* SetParent additionally needs to make hwnd the topmost window + in the x-order and send the expected WM_WINDOWPOSCHANGING and + WM_WINDOWPOSCHANGED notification messages. + */ + SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) ); + /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler + * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ + + return old_parent; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 58b0c9c..26bd8e1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1230,72 +1230,33 @@ XIC X11DRV_get_ic( HWND hwnd ) /***************************************************************** * SetParent (X11DRV.@) */ -HWND X11DRV_SetParent( HWND hwnd, HWND parent ) +void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { Display *display = thread_display(); - WND *wndPtr; - BOOL ret; - HWND old_parent = 0; - - /* Windows hides the window first, then shows it again - * including the WM_SHOWWINDOW messages and all */ - BOOL was_visible = ShowWindow( hwnd, SW_HIDE ); - - wndPtr = WIN_GetPtr( hwnd ); - if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; - - SERVER_START_REQ( set_parent ) - { - req->handle = hwnd; - req->parent = parent; - if ((ret = !wine_server_call( req ))) - { - old_parent = reply->old_parent; - wndPtr->parent = parent = reply->full_parent; - } + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - } - SERVER_END_REQ; - WIN_ReleasePtr( wndPtr ); - if (!ret) return 0; + if (!data) return; + if (parent == old_parent) return; - if (parent != old_parent) + if (parent != GetDesktopWindow()) /* a child window */ { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - - if (!data) return 0; - - if (parent != GetDesktopWindow()) /* a child window */ + if (old_parent == GetDesktopWindow()) { - if (old_parent == GetDesktopWindow()) + /* destroy the old X windows */ + destroy_whole_window( display, data ); + destroy_icon_window( display, data ); + if (data->managed) { - /* destroy the old X windows */ - destroy_whole_window( display, data ); - destroy_icon_window( display, data ); - if (data->managed) - { - data->managed = FALSE; - RemovePropA( data->hwnd, managed_prop ); - } + data->managed = FALSE; + RemovePropA( data->hwnd, managed_prop ); } } - else /* new top level window */ - { - /* FIXME: we ignore errors since we can't really recover anyway */ - create_whole_window( display, data, GetWindowLongW( hwnd, GWL_STYLE ) ); - } } - - /* SetParent additionally needs to make hwnd the topmost window - in the x-order and send the expected WM_WINDOWPOSCHANGING and - WM_WINDOWPOSCHANGED notification messages. - */ - SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) ); - /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler - * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ - - return old_parent; + else /* new top level window */ + { + /* FIXME: we ignore errors since we can't really recover anyway */ + create_whole_window( display, data, GetWindowLongW( hwnd, GWL_STYLE ) ); + } } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 1387979..95b3d94 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -103,7 +103,7 @@ @ cdecl ScrollDC(long long long ptr ptr long ptr) X11DRV_ScrollDC @ cdecl SetClipboardData(long long long long) X11DRV_SetClipboardData @ cdecl SetFocus(long) X11DRV_SetFocus -@ cdecl SetParent(long long) X11DRV_SetParent +@ cdecl SetParent(long long long) X11DRV_SetParent @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon @ cdecl SetWindowPos(long long ptr ptr long ptr) X11DRV_SetWindowPos @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn

1 0

Alexandre Julliard : winex11.drv: Fixed computation of viewport and scissor position.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: aa25e2938cb709075e2c2b6bd5f047adb68e381b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa25e2938cb709075e2c2b6bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 21:07:39 2006 +0100 winex11.drv: Fixed computation of viewport and scissor position. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 25d9570..95ca135 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1457,7 +1457,8 @@ static void sync_current_drawable(void) { GetClipBox(ctx->physDev->hdc, &rc); /* Make sure physDev is up to date */ - dy = ctx->physDev->drawable_rect.bottom - ctx->physDev->dc_rect.bottom; + dy = ctx->physDev->drawable_rect.bottom - ctx->physDev->drawable_rect.top - + ctx->physDev->dc_rect.bottom; width = ctx->physDev->dc_rect.right - ctx->physDev->dc_rect.left; height = ctx->physDev->dc_rect.bottom - ctx->physDev->dc_rect.top;

1 0

Vitaliy Margolen : dinput: Add user data format into base class. Implement SetDataFormat.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 3446caab56efa1ca6c038dcac7a80c026229f7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3446caab56efa1ca6c038dcac… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:58:02 2006 -0700 dinput: Add user data format into base class. Implement SetDataFormat. --- dlls/dinput/device.c | 46 +++++++++++++++++++++++++++++++++-------- dlls/dinput/device_private.h | 6 +++- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b6f675d..269fc06 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -288,6 +288,10 @@ void release_DataFormat(DataFormat * for format->dt = NULL; HeapFree(GetProcessHeap(), 0, format->offsets); format->offsets = NULL; + if (format->user_df) + HeapFree(GetProcessHeap(), 0, format->user_df->rgodf); + HeapFree(GetProcessHeap(), 0, format->user_df); + format->user_df = NULL; } /* Make all instances sequential */ @@ -332,7 +336,7 @@ static void calculate_ids(LPDIDATAFORMAT } } -HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPDIDATAFORMAT asked_format, DataFormat *format) +HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; unsigned int i, j; @@ -348,6 +352,14 @@ HRESULT create_DataFormat(LPCDIDATAFORMA if (!(format->offsets = HeapAlloc(GetProcessHeap(), 0, wine_format->dwNumObjs * sizeof(int)))) goto failed; + if (!(format->user_df = HeapAlloc(GetProcessHeap(), 0, asked_format->dwSize))) + goto failed; + memcpy(format->user_df, asked_format, asked_format->dwSize); + + if (!(format->user_df->rgodf = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs*asked_format->dwObjSize))) + goto failed; + memcpy(format->user_df->rgodf, asked_format->rgodf, asked_format->dwNumObjs*asked_format->dwObjSize); + TRACE("Creating DataTransform :\n"); for (i = 0; i < wine_format->dwNumObjs; i++) { @@ -450,7 +462,7 @@ HRESULT create_DataFormat(LPCDIDATAFORMA HeapFree(GetProcessHeap(), 0, done); /* Last step - reset all instances of the new format */ - calculate_ids(asked_format); + calculate_ids(format->user_df); return DI_OK; failed: @@ -459,6 +471,10 @@ failed: format->dt = NULL; HeapFree(GetProcessHeap(), 0, format->offsets); format->offsets = NULL; + if (format->user_df) + HeapFree(GetProcessHeap(), 0, format->user_df->rgodf); + HeapFree(GetProcessHeap(), 0, format->user_df); + format->user_df = NULL; return DIERR_OUTOFMEMORY; } @@ -570,6 +586,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; HRESULT res; + if (!This->data_format.user_df) return DIERR_INVALIDPARAM; + EnterCriticalSection(&This->crit); res = This->acquired ? S_FALSE : DI_OK; This->acquired = 1; @@ -602,15 +620,25 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ */ HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( - LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df -) { + LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df) +{ IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - - TRACE("(this=%p,%p)\n",This,df); - + HRESULT res = DI_OK; + + if (!df) return E_POINTER; + TRACE("(%p) %p\n", This, df); _dump_DIDATAFORMAT(df); - - return DI_OK; + + if (df->dwSize != sizeof(DIDATAFORMAT)) return DIERR_INVALIDPARAM; + if (This->acquired) return DIERR_ACQUIRED; + + EnterCriticalSection(&This->crit); + + release_DataFormat(&This->data_format); + res = create_DataFormat(This->data_format.wine_df, df, &This->data_format); + + LeaveCriticalSection(&This->crit); + return res; } /****************************************************************************** diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index fb5eac2..eb6aa8e 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -40,7 +40,9 @@ typedef struct int internal_format_size; DataTransform *dt; - int *offsets; /* object offsets */ + int *offsets; /* object offsets */ + LPCDIDATAFORMAT wine_df; /* wine internal data format */ + LPDIDATAFORMAT user_df; /* user defined data format */ } DataFormat; /* Device implementation */ @@ -67,7 +69,7 @@ struct IDirectInputDevice2AImpl /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, const void *in, DataFormat *df) ; -extern HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPDIDATAFORMAT asked_format, DataFormat *format); +extern HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPCDIDATAFORMAT asked_format, DataFormat *format); extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */

1 0

Vitaliy Margolen : dinput: Move joystick user data format into base class.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 1d314d54ba993154f0e521908768aae3db807625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d314d54ba993154f0e521908… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:58:13 2006 -0700 dinput: Move joystick user data format into base class. --- dlls/dinput/joystick_linux.c | 142 +++++++++++-------------------------- dlls/dinput/joystick_linuxinput.c | 108 +++++----------------------- 2 files changed, 61 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d314d54ba993154f0e52…

1 0

Vitaliy Margolen : dinput: Move mouse & keyboard user data format to base class.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: d5b57f39040006e24740ad1d9ea4622ad544018b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b57f39040006e24740ad1d9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:58:29 2006 -0700 dinput: Move mouse & keyboard user data format to base class. --- dlls/dinput/keyboard.c | 5 +++- dlls/dinput/mouse.c | 67 +++++------------------------------------------- 2 files changed, 11 insertions(+), 61 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f75d76a..dd19f35 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -196,7 +196,10 @@ static SysKeyboardImpl *alloc_device(REF newDevice->dinput = dinput; InitializeCriticalSection(&newDevice->base.crit); - return newDevice; + newDevice->base.data_format.wine_df = &c_dfDIKeyboard; + if (create_DataFormat(&c_dfDIKeyboard, &c_dfDIKeyboard, &newDevice->base.data_format) == DI_OK) + return newDevice; + return NULL; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 809bf08..2a2c394 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -112,10 +112,6 @@ struct SysMouseImpl IDirectInputImpl *dinput; - /* The current data format and the conversion between internal - and external data formats */ - DIDATAFORMAT *df; - /* SysMouseAImpl */ BYTE absolute; /* Previous position for relative moves */ @@ -240,23 +236,10 @@ static SysMouseImpl *alloc_device(REFGUI InitializeCriticalSection(&newDevice->base.crit); newDevice->dinput = dinput; - newDevice->df = HeapAlloc(GetProcessHeap(), 0, Wine_InternalMouseFormat.dwSize); - if (!newDevice->df) goto FAILED; - memcpy(newDevice->df, &Wine_InternalMouseFormat, Wine_InternalMouseFormat.dwSize); - - /* copy default objects */ - newDevice->df->rgodf = HeapAlloc(GetProcessHeap(), 0, Wine_InternalMouseFormat.dwNumObjs*Wine_InternalMouseFormat.dwObjSize); - if (!newDevice->df->rgodf) goto FAILED; - memcpy(newDevice->df->rgodf, Wine_InternalMouseFormat.rgodf, Wine_InternalMouseFormat.dwNumObjs*Wine_InternalMouseFormat.dwObjSize); - - if (create_DataFormat(&Wine_InternalMouseFormat, newDevice->df, &newDevice->base.data_format) == DI_OK) + newDevice->base.data_format.wine_df = &Wine_InternalMouseFormat; + if (create_DataFormat(&Wine_InternalMouseFormat, &Wine_InternalMouseFormat, &newDevice->base.data_format) == DI_OK) return newDevice; -FAILED: - if (newDevice->df) - HeapFree(GetProcessHeap(), 0, newDevice->df->rgodf); - HeapFree(GetProcessHeap(), 0, newDevice->df); - HeapFree(GetProcessHeap(), 0, newDevice); return NULL; } @@ -328,50 +311,14 @@ static ULONG WINAPI SysMouseAImpl_Releas /* Free the data queue */ HeapFree(GetProcessHeap(), 0, This->base.data_queue); + + release_DataFormat(&This->base.data_format); + DeleteCriticalSection(&This->base.crit); - - /* Free the DataFormat */ - if (This->df != &(Wine_InternalMouseFormat)) { - HeapFree(GetProcessHeap(), 0, This->df->rgodf); - HeapFree(GetProcessHeap(), 0, This->df); - } - HeapFree(GetProcessHeap(),0,This); return 0; } -/****************************************************************************** - * SetDataFormat : the application can choose the format of the data - * the device driver sends back with GetDeviceState. - * - * For the moment, only the "standard" configuration (c_dfDIMouse) is supported - * in absolute and relative mode. - */ -static HRESULT WINAPI SysMouseAImpl_SetDataFormat( - LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df -) -{ - SysMouseImpl *This = (SysMouseImpl *)iface; - - TRACE("(this=%p,%p)\n",This,df); - - _dump_DIDATAFORMAT(df); - - /* Tests under windows show that a call to SetDataFormat always sets the mouse - in relative mode whatever the dwFlags value (DIDF_ABSAXIS/DIDF_RELAXIS). - To switch in absolute mode, SetProperty must be used. */ - This->absolute = 0; - - /* Store the new data format */ - This->df = HeapAlloc(GetProcessHeap(),0,df->dwSize); - memcpy(This->df, df, df->dwSize); - This->df->rgodf = HeapAlloc(GetProcessHeap(),0,df->dwNumObjs*df->dwObjSize); - memcpy(This->df->rgodf,df->rgodf,df->dwNumObjs*df->dwObjSize); - - /* Prepare all the data-conversion filters */ - return create_DataFormat(&Wine_InternalMouseFormat, This->df, &This->base.data_format); -} - /* low-level mouse hook */ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lparam ) { @@ -949,7 +896,7 @@ static const IDirectInputDevice8AVtbl Sy SysMouseAImpl_Unacquire, SysMouseAImpl_GetDeviceState, SysMouseAImpl_GetDeviceData, - SysMouseAImpl_SetDataFormat, + IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2AImpl_GetObjectInfo, @@ -991,7 +938,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(Unacquire)SysMouseAImpl_Unacquire, XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState, XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, - XCAST(SetDataFormat)SysMouseAImpl_SetDataFormat, + XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo,

1 0

Vitaliy Margolen : dinput: Remove redundant parameter.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 6246fa62f99e9c4b8ad5f333fbe898c42d8914fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6246fa62f99e9c4b8ad5f333f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:58:40 2006 -0700 dinput: Remove redundant parameter. --- dlls/dinput/device.c | 38 +++++++++++++++++++----------------- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 269fc06..7586530 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -336,7 +336,7 @@ static void calculate_ids(LPDIDATAFORMAT } } -HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPCDIDATAFORMAT asked_format, DataFormat *format) +HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; unsigned int i, j; @@ -344,12 +344,13 @@ HRESULT create_DataFormat(LPCDIDATAFORMA int *done; int index = 0; DWORD next = 0; - + + if (!format->wine_df) return DIERR_INVALIDPARAM; done = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, asked_format->dwNumObjs * sizeof(int)); dt = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform)); if (!dt || !done) goto failed; - if (!(format->offsets = HeapAlloc(GetProcessHeap(), 0, wine_format->dwNumObjs * sizeof(int)))) + if (!(format->offsets = HeapAlloc(GetProcessHeap(), 0, format->wine_df->dwNumObjs * sizeof(int)))) goto failed; if (!(format->user_df = HeapAlloc(GetProcessHeap(), 0, asked_format->dwSize))) @@ -362,7 +363,8 @@ HRESULT create_DataFormat(LPCDIDATAFORMA TRACE("Creating DataTransform :\n"); - for (i = 0; i < wine_format->dwNumObjs; i++) { + for (i = 0; i < format->wine_df->dwNumObjs; i++) + { format->offsets[i] = -1; for (j = 0; j < asked_format->dwNumObjs; j++) { @@ -373,18 +375,18 @@ HRESULT create_DataFormat(LPCDIDATAFORMA * the GUID of the Wine object. */ ((asked_format->rgodf[j].pguid == NULL) || - (wine_format->rgodf[i].pguid == NULL) || - (IsEqualGUID(wine_format->rgodf[i].pguid, asked_format->rgodf[j].pguid))) + (format->wine_df->rgodf[i].pguid == NULL) || + (IsEqualGUID(format->wine_df->rgodf[i].pguid, asked_format->rgodf[j].pguid))) && (/* Then check if it accepts any instance id, and if not, if it matches Wine's * instance id. */ (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0xFFFF) || (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentionned in no DX docs, but it works fine - tested on WinXP */ - (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType))) + (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(format->wine_df->rgodf[i].dwType))) && ( /* Then if the asked type matches the one Wine provides */ - DIDFT_GETTYPE(asked_format->rgodf[j].dwType) & wine_format->rgodf[i].dwType)) + DIDFT_GETTYPE(asked_format->rgodf[j].dwType) & format->wine_df->rgodf[i].dwType)) { done[j] = 1; @@ -399,23 +401,23 @@ HRESULT create_DataFormat(LPCDIDATAFORMA TRACE(" - Wine (%d) :\n", i); TRACE(" * GUID: %s ('%s')\n", - debugstr_guid(wine_format->rgodf[i].pguid), - _dump_dinput_GUID(wine_format->rgodf[i].pguid)); - TRACE(" * Offset: %3d\n", wine_format->rgodf[i].dwOfs); - TRACE(" * dwType: %08x\n", wine_format->rgodf[i].dwType); - TRACE(" "); _dump_EnumObjects_flags(wine_format->rgodf[i].dwType); TRACE("\n"); + debugstr_guid(format->wine_df->rgodf[i].pguid), + _dump_dinput_GUID(format->wine_df->rgodf[i].pguid)); + TRACE(" * Offset: %3d\n", format->wine_df->rgodf[i].dwOfs); + TRACE(" * dwType: %08x\n", format->wine_df->rgodf[i].dwType); + TRACE(" "); _dump_EnumObjects_flags(format->wine_df->rgodf[i].dwType); TRACE("\n"); - if (wine_format->rgodf[i].dwType & DIDFT_BUTTON) + if (format->wine_df->rgodf[i].dwType & DIDFT_BUTTON) dt[index].size = sizeof(BYTE); else dt[index].size = sizeof(DWORD); - dt[index].offset_in = wine_format->rgodf[i].dwOfs; + dt[index].offset_in = format->wine_df->rgodf[i].dwOfs; dt[index].offset_out = asked_format->rgodf[j].dwOfs; format->offsets[i] = asked_format->rgodf[j].dwOfs; dt[index].value = 0; next = next + dt[index].size; - if (wine_format->rgodf[i].dwOfs != dt[index].offset_out) + if (format->wine_df->rgodf[i].dwOfs != dt[index].offset_out) same = 0; index++; @@ -451,7 +453,7 @@ HRESULT create_DataFormat(LPCDIDATAFORMA } } - format->internal_format_size = wine_format->dwDataSize; + format->internal_format_size = format->wine_df->dwDataSize; format->size = index; if (same) { HeapFree(GetProcessHeap(), 0, dt); @@ -635,7 +637,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ EnterCriticalSection(&This->crit); release_DataFormat(&This->data_format); - res = create_DataFormat(This->data_format.wine_df, df, &This->data_format); + res = create_DataFormat(df, &This->data_format); LeaveCriticalSection(&This->crit); return res; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index eb6aa8e..e35c9f4 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -69,7 +69,7 @@ struct IDirectInputDevice2AImpl /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, const void *in, DataFormat *df) ; -extern HRESULT create_DataFormat(LPCDIDATAFORMAT wine_format, LPCDIDATAFORMAT asked_format, DataFormat *format); +extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format); extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7f80f72..745fd5c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -481,7 +481,7 @@ static HRESULT alloc_device(REFGUID rgui newDevice->base.data_format.wine_df = &c_dfDIJoystick2; /* create the default transform filter */ - hr = create_DataFormat(&c_dfDIJoystick2, &c_dfDIJoystick2, &newDevice->base.data_format); + hr = create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format); if (hr != DI_OK) goto FAILED; IDirectInputDevice_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c1ce5ab..82b8d07 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -392,7 +392,7 @@ static JoystickImpl *alloc_device(REFGUI newDevice->base.data_format.wine_df = &c_dfDIJoystick2; /* create the default transform filter */ - if (create_DataFormat(&c_dfDIJoystick2, &c_dfDIJoystick2, &newDevice->base.data_format) == DI_OK) + if (create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format) == DI_OK) return newDevice; HeapFree(GetProcessHeap(),0,newDevice); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index dd19f35..cbf06ab 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -197,7 +197,7 @@ static SysKeyboardImpl *alloc_device(REF InitializeCriticalSection(&newDevice->base.crit); newDevice->base.data_format.wine_df = &c_dfDIKeyboard; - if (create_DataFormat(&c_dfDIKeyboard, &c_dfDIKeyboard, &newDevice->base.data_format) == DI_OK) + if (create_DataFormat(&c_dfDIKeyboard, &newDevice->base.data_format) == DI_OK) return newDevice; return NULL; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 2a2c394..2707121 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -237,7 +237,7 @@ static SysMouseImpl *alloc_device(REFGUI newDevice->dinput = dinput; newDevice->base.data_format.wine_df = &Wine_InternalMouseFormat; - if (create_DataFormat(&Wine_InternalMouseFormat, &Wine_InternalMouseFormat, &newDevice->base.data_format) == DI_OK) + if (create_DataFormat(&Wine_InternalMouseFormat, &newDevice->base.data_format) == DI_OK) return newDevice; return NULL;

1 0

Vitaliy Margolen : dinput: Use standard mouse data format instead of custom one.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: aa8392c9e7410e3bc693adb482ecd27b268d2fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8392c9e7410e3bc693adb48… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:58:51 2006 -0700 dinput: Use standard mouse data format instead of custom one. --- dlls/dinput/mouse.c | 39 +++------------------------------------ 1 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 2707121..236df70 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -62,39 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define WINE_MOUSE_R_POSITION 4 #define WINE_MOUSE_M_POSITION 5 -typedef struct { - LONG lX; - LONG lY; - LONG lZ; - BYTE rgbButtons[4]; -} Wine_InternalMouseData; - -#define WINE_INTERNALMOUSE_NUM_OBJS 6 - -static const DIOBJECTDATAFORMAT Wine_InternalMouseObjectFormat[WINE_INTERNALMOUSE_NUM_OBJS] = { - { &GUID_XAxis, FIELD_OFFSET(Wine_InternalMouseData, lX), - DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS, 0 }, - { &GUID_YAxis, FIELD_OFFSET(Wine_InternalMouseData, lY), - DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS, 0 }, - { &GUID_ZAxis, FIELD_OFFSET(Wine_InternalMouseData, lZ), - DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS, 0 }, - { &GUID_Button, (FIELD_OFFSET(Wine_InternalMouseData, rgbButtons)) + 0, - DIDFT_MAKEINSTANCE(WINE_MOUSE_L_BUTTON_INSTANCE) | DIDFT_PSHBUTTON, 0 }, - { &GUID_Button, (FIELD_OFFSET(Wine_InternalMouseData, rgbButtons)) + 1, - DIDFT_MAKEINSTANCE(WINE_MOUSE_R_BUTTON_INSTANCE) | DIDFT_PSHBUTTON, 0 }, - { &GUID_Button, (FIELD_OFFSET(Wine_InternalMouseData, rgbButtons)) + 2, - DIDFT_MAKEINSTANCE(WINE_MOUSE_M_BUTTON_INSTANCE) | DIDFT_PSHBUTTON, 0 } -}; - -static const DIDATAFORMAT Wine_InternalMouseFormat = { - sizeof(DIDATAFORMAT), - sizeof(DIOBJECTDATAFORMAT), - DIDF_RELAXIS, - sizeof(Wine_InternalMouseData), - WINE_INTERNALMOUSE_NUM_OBJS, /* dwNumObjs */ - (LPDIOBJECTDATAFORMAT) Wine_InternalMouseObjectFormat -}; - static const IDirectInputDevice8AVtbl SysMouseAvt; static const IDirectInputDevice8WVtbl SysMouseWvt; @@ -126,7 +93,7 @@ struct SysMouseImpl DWORD last_warped; /* This is for mouse reporting. */ - Wine_InternalMouseData m_state; + DIMOUSESTATE2 m_state; }; /* FIXME: This is ugly and not thread safe :/ */ @@ -236,8 +203,8 @@ static SysMouseImpl *alloc_device(REFGUI InitializeCriticalSection(&newDevice->base.crit); newDevice->dinput = dinput; - newDevice->base.data_format.wine_df = &Wine_InternalMouseFormat; - if (create_DataFormat(&Wine_InternalMouseFormat, &newDevice->base.data_format) == DI_OK) + newDevice->base.data_format.wine_df = &c_dfDIMouse2; + if (create_DataFormat(&c_dfDIMouse2, &newDevice->base.data_format) == DI_OK) return newDevice; return NULL;

1 0

Jacek Caban : mshtml: Use HTMLWindow::alert in nsPromptService::Alert.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 13f77846345569bb68059e7b9b48f6838f74b6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f77846345569bb68059e7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 8 12:38:19 2006 +0100 mshtml: Use HTMLWindow::alert in nsPromptService::Alert. --- dlls/mshtml/htmlwindow.c | 15 ++++++++++++++- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsservice.c | 18 ++++++++++++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 8f0fc2b..6cd106f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) +static struct list window_list = LIST_INIT(window_list); + static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); @@ -85,8 +87,10 @@ static ULONG WINAPI HTMLWindow2_Release( TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + list_remove(&This->entry); mshtml_free(This); + } return ref; } @@ -734,10 +738,19 @@ HTMLWindow *HTMLWindow_Create(HTMLDocume ERR("GetContentDOMWindow failed: %08x\n", nsres); } + list_add_head(&window_list, &ret->entry); + return ret; } HTMLWindow *nswindow_to_window(nsIDOMWindow *nswindow) { + HTMLWindow *iter; + + LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLWindow, entry) { + if(iter->nswindow == nswindow) + return iter; + } + return NULL; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a463129..b7bfb36 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -21,6 +21,8 @@ #include "mshtmhst.h" #include "hlink.h" +#include "wine/list.h" + #ifdef INIT_GUID #include "initguid.h" #endif @@ -59,6 +61,8 @@ typedef struct { HTMLDocument *doc; nsIDOMWindow *nswindow; + + struct list entry; } HTMLWindow; typedef enum { diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 76887b2..d4c9d6b 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -146,8 +146,22 @@ static nsrefcnt NSAPI nsPromptService_Re static nsresult NSAPI nsPromptService_Alert(nsIPromptService *iface, nsIDOMWindow *aParent, const PRUnichar *aDialogTitle, const PRUnichar *aText) { - FIXME("(%p %s %s)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText)); - return NS_ERROR_NOT_IMPLEMENTED; + HTMLWindow *window; + BSTR text; + + TRACE("(%p %s %s)\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText)); + + window = nswindow_to_window(aParent); + if(!window) { + WARN("Could not find HTMLWindow for nsIDOMWindow %p\n", aParent); + return NS_ERROR_UNEXPECTED; + } + + text = SysAllocString(aText); + IHTMLWindow2_alert(HTMLWINDOW2(window), text); + SysFreeString(text); + + return NS_OK; } static nsresult NSAPI nsPromptService_AlertCheck(nsIPromptService *iface,

1 0

Pierre d'Herbemont : kernel32: Allow the preferred language to be different from the preferred locale on Mac OS X .
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 3c0d2e3808424e68c9bc0c3d982c13bbc639f4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0d2e3808424e68c9bc0c3d9… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Tue Dec 12 13:55:57 2006 +0100 kernel32: Allow the preferred language to be different from the preferred locale on Mac OS X. --- dlls/kernel32/locale.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8792623..16310a0 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -31,9 +31,12 @@ #include <stdio.h> #include <ctype.h> #include <stdlib.h> +#include <sys/types.h> #ifdef __APPLE__ +# include <CoreFoundation/CFBundle.h> # include <CoreFoundation/CFLocale.h> +# include <CoreFoundation/CFPreferences.h> # include <CoreFoundation/CFString.h> #endif @@ -2822,7 +2825,10 @@ void LOCALE_Init(void) #ifdef __APPLE__ /* MacOS doesn't set the locale environment variables so we have to do it ourselves */ + CFArrayRef preferred_locales, all_locales; + CFStringRef user_language_string_ref = NULL; char user_locale[50]; + CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); @@ -2832,11 +2838,40 @@ void LOCALE_Init(void) unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); TRACE( "setting locale to '%s'\n", user_locale ); -#endif + + /* We still want to set the retrieve the preferred language as chosen in + System Preferences.app, because it can differ from CFLocaleCopyCurrent(). + */ + all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); + preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); + if (preferred_locales) + { + if (CFArrayGetCount( preferred_locales )) + user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); + CFRelease( preferred_locales ); + } + CFRelease( all_locales ); +#endif /* __APPLE__ */ + setlocale( LC_ALL, "" ); unix_cp = setup_unix_locales(); if (!lcid_LC_MESSAGES) lcid_LC_MESSAGES = lcid_LC_CTYPE; + +#ifdef __APPLE__ + /* Override lcid_LC_MESSAGES with user_language if LC_MESSAGES is set to default */ + if (lcid_LC_MESSAGES == lcid_LC_CTYPE && user_language_string_ref) + { + struct locale_name locale_name; + WCHAR buffer[128]; + CFStringGetCString( user_language_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); + strcpynAtoW( buffer, user_locale, sizeof(buffer)/sizeof(WCHAR) ); + parse_locale_name( buffer, &locale_name ); + lcid_LC_MESSAGES = locale_name.lcid; + TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); + } +#endif + NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) ); NtSetDefaultLocale( TRUE, lcid_LC_MESSAGES ); NtSetDefaultLocale( FALSE, lcid_LC_CTYPE );

1 0

Paul Vriens : winspool.drv/tests: No need to return anything as we are using a global variable now.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: b73f30f8eb5c2debabd0065ee924d021ae20bd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73f30f8eb5c2debabd0065ee… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Dec 12 17:18:57 2006 +0100 winspool.drv/tests: No need to return anything as we are using a global variable now. --- dlls/winspool.drv/tests/info.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index dec988e..04b1968 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -70,7 +70,7 @@ static DWORD report_deactivated_spooler } -static LPSTR find_default_printer(VOID) +static void find_default_printer(VOID) { static char buffer[DEFAULT_PRINTER_SIZE]; DWORD needed; @@ -122,7 +122,6 @@ static LPSTR find_default_printer(VOID) } trace("default_printer: '%s'\n", default_printer); } - return default_printer; } @@ -1681,7 +1680,7 @@ START_TEST(info) pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); - default_printer = find_default_printer(); + find_default_printer(); test_AddMonitor(); test_AddPort();

1 0