May 2011 - Wine-commits - list.winehq.org

Marcus Meissner : comdlg32: Mark internal symbols as hidden visibility.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 4a8f0b8f55ce7bfec67aba26f57ad646aef9f739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8f0b8f55ce7bfec67aba26f… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:36:01 2011 +0200 comdlg32: Mark internal symbols as hidden visibility. --- dlls/comdlg32/cdlg32.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index ad44bbb..539174e 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" -HINSTANCE COMDLG32_hInstance = 0; +DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; @@ -46,18 +46,18 @@ static HINSTANCE SHELL32_hInstance; static HINSTANCE SHFOLDER_hInstance; /* ITEMIDLIST */ -LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); -LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); -LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST); -BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST); -BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); -UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); +LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST) DECLSPEC_HIDDEN; +LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST) DECLSPEC_HIDDEN; +LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST) DECLSPEC_HIDDEN; +BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST) DECLSPEC_HIDDEN; +BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST) DECLSPEC_HIDDEN; +UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST) DECLSPEC_HIDDEN; /* SHELL */ -LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); -DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); -BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); -LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID); +LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD) DECLSPEC_HIDDEN; +DWORD (WINAPI *COMDLG32_SHFree)(LPVOID) DECLSPEC_HIDDEN; +BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR) DECLSPEC_HIDDEN; +LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID) DECLSPEC_HIDDEN; /*********************************************************************** * DllMain (COMDLG32.init)

1 0

Marcus Meissner : d3d10core: Mark a struct as static.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: cb58f81a38a4d0c7084ad5285033f327b73a9483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb58f81a38a4d0c7084ad5285… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:38:06 2011 +0200 d3d10core: Mark a struct as static. --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 82d9b0d..8936f36 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1278,7 +1278,7 @@ static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} -const struct wined3d_parent_ops d3d10_subresource_parent_ops = +static const struct wined3d_parent_ops d3d10_subresource_parent_ops = { d3d10_subresource_destroyed, };

1 0

Marcus Meissner : d3drm: Mark internal symbols as hidden.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 75e7167a0f6ae1a3fa4d1ebd33e36a7aa71d57e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e7167a0f6ae1a3fa4d1ebd3… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:40:43 2011 +0200 d3drm: Mark internal symbols as hidden. --- dlls/d3drm/d3drm_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f3580c3..98b9319 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,7 +26,7 @@ #include "d3drm.h" -HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM); -HRESULT Direct3DRMMeshBuilder_create(LPDIRECT3DRMMESHBUILDER* ppMeshBuilder); +HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM) DECLSPEC_HIDDEN; +HRESULT Direct3DRMMeshBuilder_create(LPDIRECT3DRMMESHBUILDER* ppMeshBuilder) DECLSPEC_HIDDEN; #endif /* __D3DRM_PRIVATE_INCLUDED__ */

1 0

Marcus Meissner : cryptui: Mark internal symbols as static.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 414ae74981cc3c7886218d43c6f1ef60ed3a2870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414ae74981cc3c7886218d43c… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:37:18 2011 +0200 cryptui: Mark internal symbols as static. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 16f53da..23f247e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3082,7 +3082,7 @@ struct selection_list_item add_fields_func add; }; -const struct selection_list_item listItems[] = { +static const struct selection_list_item listItems[] = { { IDS_FIELDS_ALL, add_all_fields }, { IDS_FIELDS_V1, add_v1_fields }, { IDS_FIELDS_EXTENSIONS, add_all_extensions }, @@ -4921,7 +4921,7 @@ static const WCHAR filter_cms[] = { '*','.','s','p','c',';','*','.', 'p','7','b',0 }; static const WCHAR filter_all[] = { '*','.','*',0 }; -struct StringToFilter +static struct StringToFilter { int id; DWORD allowFlags;

1 0

Marcus Meissner : atl: Mark hInst variable as hidden.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 58aad7c2edb823160b7378c5589bf3ef42361565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58aad7c2edb823160b7378c55… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:27:44 2011 +0200 atl: Mark hInst variable as hidden. --- dlls/atl/atl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 78ef7ce..2898835 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -HINSTANCE hInst; +DECLSPEC_HIDDEN HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Stefan Dösinger : wined3d: Fix data types in RxGx snorm-unorm conversion.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 1d7a05cb80462ebd818613fb7aa983d4a9f4d557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7a05cb80462ebd818613fb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:17:31 2011 +0200 wined3d: Fix data types in RxGx snorm-unorm conversion. --- dlls/wined3d/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0df2c9e..20b6001 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -346,10 +346,10 @@ static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT widt Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { - LONG color = (*Source++); + const short color = (*Source++); /* B */ Dest[0] = 0xff; /* G */ Dest[1] = (color >> 8) + 128; /* V */ - /* R */ Dest[2] = (color) + 128; /* U */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ Dest += 3; } } @@ -440,10 +440,10 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi Dest = (unsigned short *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { - DWORD color = (*Source++); + const DWORD color = (*Source++); /* B */ Dest[0] = 0xffff; /* G */ Dest[1] = (color >> 16) + 32768; /* V */ - /* R */ Dest[2] = (color ) + 32768; /* U */ + /* R */ Dest[2] = (color & 0xffff) + 32768; /* U */ Dest += 3; } }

1 0

Stefan Dösinger : wined3d: Heightscaled surfaces still have an integer size.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 774cb21a4d0985e7f66d1ff8ba05160fc56bd6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=774cb21a4d0985e7f66d1ff8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:23:51 2011 +0200 wined3d: Heightscaled surfaces still have an integer size. --- dlls/wined3d/utils.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 20b6001..c34060d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1615,7 +1615,11 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); } - if (format->heightscale != 0.0f) size *= format->heightscale; + if (format->heightscale != 0.0f) + { + /* The D3D format requirements make sure that the resulting format is an integer again */ + size = (UINT) (size * format->heightscale); + } return size; }

1 0

Stefan Dösinger : wined3d: Fix a copypaste typo.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: e4038ebab95dbd61b5bf4f2e885da4813b8b9e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4038ebab95dbd61b5bf4f2e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:34:25 2011 +0200 wined3d: Fix a copypaste typo. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c987674..97ad3a6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3875,7 +3875,7 @@ static int compare_sig(const struct wined3d_shader_signature_element *sig1, cons if ((ret = strcmp(sig1[i].semantic_name, sig2[i].semantic_name))) return ret; if(sig1[i].semantic_idx != sig2[i].semantic_idx) return sig1[i].semantic_idx < sig2[i].semantic_idx ? -1 : 1; if(sig1[i].sysval_semantic != sig2[i].sysval_semantic) return sig1[i].sysval_semantic < sig2[i].sysval_semantic ? -1 : 1; - if(sig1[i].component_type != sig2[i].component_type) return sig1[i].sysval_semantic < sig2[i].component_type ? -1 : 1; + if(sig1[i].component_type != sig2[i].component_type) return sig1[i].component_type < sig2[i].component_type ? -1 : 1; if(sig1[i].register_idx != sig2[i].register_idx) return sig1[i].register_idx < sig2[i].register_idx ? -1 : 1; if(sig1[i].mask != sig2->mask) return sig1[i].mask < sig2[i].mask ? -1 : 1; }

1 0

Alexandre Julliard : winex11: Don' t wait for the foreground window to start clipping in ClipCursor.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 9556b4f7dbf71aec2f4ebf89ec164ae91d9b43ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9556b4f7dbf71aec2f4ebf89e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 14:31:05 2011 +0200 winex11: Don't wait for the foreground window to start clipping in ClipCursor. --- dlls/winex11.drv/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d369f6c..b79525a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1277,7 +1277,8 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + return TRUE; } else if (grab_clipping_window( clip, FALSE )) return TRUE; }

1 0

Alexandre Julliard : winex11: Warp the pointer when clipping, but ignore the resulting events.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 0e2b4f99a9f5d97f8da0189037b7516cf1585d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2b4f99a9f5d97f8da018903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 14:33:32 2011 +0200 winex11: Warp the pointer when clipping, but ignore the resulting events. --- dlls/winex11.drv/event.c | 21 +++++++++++---------- dlls/winex11.drv/mouse.c | 32 ++++++++++++++++++++++++-------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f2e2841..419ad0f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -318,25 +318,26 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) break; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; - switch (next->type) { - case MotionNotify: + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (prev->xcookie.extension != xinput2_opcode) break; + if (prev->xcookie.evtype != XI_RawMotion) break; + if (thread_data->warp_serial) break; + switch (next->type) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); + case MotionNotify: if (next->xany.window == thread_data->clip_window && next->xmotion.time - thread_data->last_motion_notify < 1000) { TRACE( "ignoring MotionNotify for clip window\n" ); return MERGE_IGNORE; } + break; + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); } - break; - case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); } break; #endif diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b79525a..188e36f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1213,15 +1213,13 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) { struct x11drv_thread_data *data = x11drv_init_thread_data(); - if (data->xi2_state == xi_enabled) return TRUE; - - TRACE( "warping to (%d,%d)\n", x, y ); - wine_tsx11_lock(); + data->warp_serial = NextRequest( data->display ); XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ wine_tsx11_unlock(); + TRACE( "warped to %d,%d serial %lu\n", x, y, data->warp_serial ); return TRUE; } @@ -1240,9 +1238,10 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) ret = XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &winX, &winY, &xstate ); if (ret) { + POINT old = *pos; pos->x = winX + virtual_screen_rect.left; pos->y = winY + virtual_screen_rect.top; - TRACE("pointer at (%d,%d)\n", pos->x, pos->y ); + TRACE( "pointer at (%d,%d) server pos %d,%d\n", pos->x, pos->y, old.x, old.y ); } wine_tsx11_unlock(); return ret; @@ -1353,7 +1352,8 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) XMotionEvent *event = &xev->xmotion; INPUT input; - TRACE( "hwnd %p/%lx pos %d,%d is_hint %d\n", hwnd, event->window, event->x, event->y, event->is_hint ); + TRACE( "hwnd %p/%lx pos %d,%d is_hint %d serial %lu\n", + hwnd, event->window, event->x, event->y, event->is_hint, event->serial ); input.u.mi.dx = event->x; input.u.mi.dy = event->y; @@ -1366,6 +1366,7 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); if (event->time - thread_data->last_motion_notify < 1000) return; + if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; thread_data->last_motion_notify = event->time; } @@ -1402,12 +1403,15 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) /*********************************************************************** * X11DRV_RawMotion */ -static void X11DRV_RawMotion( XIRawEvent *event ) +static void X11DRV_RawMotion( XGenericEventCookie *xev ) { + XIRawEvent *event = xev->data; const double *values = event->valuators.values; INPUT input; + struct x11drv_thread_data *thread_data = x11drv_thread_data(); if (!event->valuators.mask_len) return; + if (thread_data->xi2_state != xi_enabled) return; input.u.mi.dx = 0; input.u.mi.dy = 0; @@ -1419,6 +1423,18 @@ static void X11DRV_RawMotion( XIRawEvent *event ) if (XIMaskIsSet( event->valuators.mask, 0 )) input.u.mi.dx = *values++; if (XIMaskIsSet( event->valuators.mask, 1 )) input.u.mi.dy = *values++; + if (thread_data->warp_serial) + { + long diff = xev->serial - thread_data->warp_serial; + + if (diff >= 0) thread_data->warp_serial = 0; /* we caught up now */ + if (diff <= 0) /* <= 0 because we also want to ignore the first event after the warp request */ + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + return; + } + } + TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy ); input.type = INPUT_MOUSE; @@ -1478,7 +1494,7 @@ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) switch (event->evtype) { case XI_RawMotion: - X11DRV_RawMotion( event->data ); + X11DRV_RawMotion( event ); break; default: diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a14fa39..8e335af 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -551,6 +551,7 @@ struct x11drv_thread_data Time last_motion_notify; /* time of last mouse motion */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */

1 0