October 2010 - Wine-commits

Anders Jonsson : crypt32: Update Swedish translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: ce5a8aab8329db206c4a37d427f1f2709eaa4b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5a8aab8329db206c4a37d42… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Oct 17 20:41:43 2010 +0200 crypt32: Update Swedish translation. --- dlls/crypt32/crypt32_Sv.rc | 203 ++++++++++++++++++++++++++++++------------- 1 files changed, 141 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce5a8aab8329db206c4a3…

1 0

Detlef Riekenberg : shell32: We have a Unicode parameter when launching a CPL.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 463dafc3aca5a606b85025b3ca908389e3688710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463dafc3aca5a606b85025b3c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 17 23:50:44 2010 +0200 shell32: We have a Unicode parameter when launching a CPL. --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 3346ddc..3be0494 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -817,7 +817,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); }

1 0

Hans Leidekker : mscms: Fix a memory leak in TranslateColors.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 872fded8171cac993c458a1573d39845f008c775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872fded8171cac993c458a157… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 18 10:18:31 2010 +0200 mscms: Fix a memory leak in TranslateColors. --- dlls/mscms/transform.c | 73 +++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 32 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index a795386..48043a1 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -355,8 +355,8 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, COLORTYPE input_type, PCOLOR out, COLORTYPE output_type ) { - BOOL ret = FALSE; #ifdef HAVE_LCMS + BOOL ret = TRUE; struct transform *transform = grab_transform( handle ); cmsHTRANSFORM xfrm; unsigned int i; @@ -374,78 +374,87 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + ret = FALSE; + break; } } case COLOR_Lab: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + ret = FALSE; + break; } } case COLOR_GRAY: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + ret = FALSE; + break; } } case COLOR_CMYK: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + ret = FALSE; + break; } } case COLOR_XYZ: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + ret = FALSE; + break; } } default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); + ret = FALSE; break; } + +done: release_transform( transform ); + return ret; #endif /* HAVE_LCMS */ - return ret; + return FALSE; }

1 0

Alexandre Julliard : riched20: Use the correct resource id for the reverse arrow cursor.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 954558806e01e9d9e4ad28bf1726bafd03f8b191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954558806e01e9d9e4ad28bf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 19:47:31 2010 +0200 riched20: Use the correct resource id for the reverse arrow cursor. --- dlls/riched20/res.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/res.h b/dlls/riched20/res.h index 8f329d1..aaf1222 100644 --- a/dlls/riched20/res.h +++ b/dlls/riched20/res.h @@ -18,4 +18,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define OCR_REVERSE 32768 +#define OCR_REVERSE 107

1 0

Alexandre Julliard : ole32: Use the correct resource ids for the drag&drop cursors.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 1e04e923be2977a2f80f1ab9310d5c4a5a281aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e04e923be2977a2f80f1ab93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 20:22:14 2010 +0200 ole32: Use the correct resource ids for the drag&drop cursors. --- dlls/ole32/ole2.c | 8 ++++---- dlls/ole32/ole32res.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 0829ca1..03cb7f0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2224,19 +2224,19 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) if (*trackerInfo->pdwEffect & DROPEFFECT_MOVE) { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(1)); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(2)); } else if (*trackerInfo->pdwEffect & DROPEFFECT_COPY) { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(2)); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(3)); } else if (*trackerInfo->pdwEffect & DROPEFFECT_LINK) { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(3)); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(4)); } else { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(0)); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(1)); } SetCursor(hCur); diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc index 60887a5..c03197c 100644 --- a/dlls/ole32/ole32res.rc +++ b/dlls/ole32/ole32res.rc @@ -37,13 +37,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: nodrop.cur */ -0 CURSOR nodrop.cur +1 CURSOR nodrop.cur /* @makedep: drag_move.cur */ -1 CURSOR drag_move.cur +2 CURSOR drag_move.cur /* @makedep: drag_copy.cur */ -2 CURSOR drag_copy.cur +3 CURSOR drag_copy.cur /* @makedep: drag_link.cur */ -3 CURSOR drag_link.cur +4 CURSOR drag_link.cur

1 0

Alexandre Julliard : comctl32: Use the correct resource ids for cursors.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 2b4aeca70b7e6c44f876e0ecc29a963cbc5024be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4aeca70b7e6c44f876e0ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 20:22:18 2010 +0200 comctl32: Use the correct resource ids for cursors. --- dlls/comctl32/comctl32.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 3d172ae..4014688 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -101,16 +101,15 @@ extern HBRUSH COMCTL32_hPattern55AABrush; #define IDT_CHECK 401 -/* Header cursors */ +/* Cursors */ +#define IDC_MOVEBUTTON 102 +#define IDC_COPY 104 #define IDC_DIVIDER 106 #define IDC_DIVIDEROPEN 107 /* DragList resources */ #define IDI_DRAGARROW 501 -#define IDC_COPY 502 - -#define IDC_MOVEBUTTON 1 /* HOTKEY internal strings */ #define HKY_NONE 2048

1 0

Alexandre Julliard : winex11: Use GetIconInfoEx when creating cursors.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 85a69604deb42ea06ee829d08b0a7893e3b52f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a69604deb42ea06ee829d08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 12:09:25 2010 +0200 winex11: Use GetIconInfoEx when creating cursors. --- dlls/winex11.drv/mouse.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 485a50d..b3e5fcf 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -470,7 +470,7 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, * * Use Xcursor to create a frame of an X cursor from a Windows one. */ -static XcursorImage *create_xcursor_frame( HDC hdc, ICONINFO *iinfo, HANDLE icon, +static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HANDLE icon, HBITMAP hbmColor, unsigned char *color_bits, int color_size, HBITMAP hbmMask, unsigned char *mask_bits, int mask_size, int width, int height, int istep ) @@ -537,7 +537,7 @@ cleanup: * * Use Xcursor to create an X cursor from a Windows one. */ -static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *iinfo, HANDLE icon, int width, int height ) +static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE icon, int width, int height ) { unsigned char *color_bits, *mask_bits; HBITMAP hbmColor = 0, hbmMask = 0; @@ -701,7 +701,7 @@ done: * * Create an X cursor from a Windows one. */ -static Cursor create_xlib_cursor( HDC hdc, ICONINFO *icon, int width, int height ) +static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, int height ) { XColor fg, bg; Cursor cursor = None; @@ -831,13 +831,14 @@ static Cursor create_cursor( HANDLE handle ) { Cursor cursor = 0; HDC hdc; - ICONINFO info; + ICONINFOEXW info; BITMAP bm; if (!handle) return get_empty_cursor(); if (!(hdc = CreateCompatibleDC( 0 ))) return 0; - if (!GetIconInfo( handle, &info )) + info.cbSize = sizeof(info); + if (!GetIconInfoExW( handle, &info )) { DeleteDC( hdc ); return 0;

1 0

Alexandre Julliard : winex11: Avoid creating a DC when not necessary.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 94e65bae5421be51559c1c12f142b5fc26648094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e65bae5421be51559c1c12f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 12:11:17 2010 +0200 winex11: Avoid creating a DC when not necessary. --- dlls/winex11.drv/mouse.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b3e5fcf..0b87c44 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -830,19 +830,13 @@ done: static Cursor create_cursor( HANDLE handle ) { Cursor cursor = 0; - HDC hdc; ICONINFOEXW info; BITMAP bm; if (!handle) return get_empty_cursor(); - if (!(hdc = CreateCompatibleDC( 0 ))) return 0; info.cbSize = sizeof(info); - if (!GetIconInfoExW( handle, &info )) - { - DeleteDC( hdc ); - return 0; - } + if (!GetIconInfoExW( handle, &info )) return 0; GetObjectW( info.hbmMask, sizeof(bm), &bm ); if (!info.hbmColor) bm.bmHeight /= 2; @@ -856,11 +850,17 @@ static Cursor create_cursor( HANDLE handle ) if (info.hbmColor) { + HDC hdc = CreateCompatibleDC( 0 ); + if (hdc) + { #ifdef SONAME_LIBXCURSOR - if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) + cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif - if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + } DeleteObject( info.hbmColor ); + DeleteDC( hdc ); } else { @@ -872,7 +872,6 @@ static Cursor create_cursor( HANDLE handle ) } DeleteObject( info.hbmMask ); - DeleteDC( hdc ); return cursor; }

1 0

Alexandre Julliard : winex11: Add support for remapping standard Win32 cursors to the X11 system cursors .
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 45b87f1f9466315fe58de6d7fbf5123f48c0b231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b87f1f9466315fe58de6d7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 12:16:28 2010 +0200 winex11: Add support for remapping standard Win32 cursors to the X11 system cursors. --- dlls/winex11.drv/mouse.c | 117 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++ 3 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0b87c44..0746fd9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <X11/Xlib.h> +#include <X11/cursorfont.h> #include <stdarg.h> #ifdef SONAME_LIBXCURSOR @@ -35,11 +36,13 @@ MAKE_FUNCPTR(XcursorImageLoadCursor); MAKE_FUNCPTR(XcursorImagesCreate); MAKE_FUNCPTR(XcursorImagesDestroy); MAKE_FUNCPTR(XcursorImagesLoadCursor); +MAKE_FUNCPTR(XcursorLibraryLoadCursor); # undef MAKE_FUNCPTR #endif /* SONAME_LIBXCURSOR */ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define OEMRESOURCE #include "windef.h" #include "winbase.h" @@ -120,6 +123,7 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImagesCreate); LOAD_FUNCPTR(XcursorImagesDestroy); LOAD_FUNCPTR(XcursorImagesLoadCursor); + LOAD_FUNCPTR(XcursorLibraryLoadCursor); #undef LOAD_FUNCPTR #endif /* SONAME_LIBXCURSOR */ } @@ -622,6 +626,110 @@ cleanup: return cursor; } + +struct system_cursors +{ + WORD id; + const char *name; +}; + +static const struct system_cursors user32_cursors[] = +{ + { OCR_NORMAL, "left_ptr" }, + { OCR_IBEAM, "xterm" }, + { OCR_WAIT, "watch" }, + { OCR_CROSS, "cross" }, + { OCR_UP, "center_ptr" }, + { OCR_SIZE, "fleur" }, + { OCR_SIZEALL, "fleur" }, + { OCR_ICON, "icon" }, + { OCR_SIZENWSE, "nwse-resize" }, + { OCR_SIZENESW, "nesw-resize" }, + { OCR_SIZEWE, "ew-resize" }, + { OCR_SIZENS, "ns-resize" }, + { OCR_NO, "not-allowed" }, + { OCR_HAND, "hand2" }, + { OCR_APPSTARTING, "left_ptr_watch" }, + { OCR_HELP, "question_arrow" }, + { 0 } +}; + +static const struct system_cursors comctl32_cursors[] = +{ + { 102, "move" }, + { 104, "copy" }, + { 105, "left_ptr" }, + { 106, "row-resize" }, + { 107, "row-resize" }, + { 108, "hand2" }, + { 135, "col-resize" }, + { 0 } +}; + +static const struct system_cursors ole32_cursors[] = +{ + { 1, "no-drop" }, + { 2, "move" }, + { 3, "copy" }, + { 4, "alias" }, + { 0 } +}; + +static const struct system_cursors riched20_cursors[] = +{ + { 105, "hand2" }, + { 107, "right_ptr" }, + { 109, "copy" }, + { 110, "move" }, + { 111, "no-drop" }, + { 0 } +}; + +static const struct +{ + const struct system_cursors *cursors; + WCHAR name[16]; +} module_cursors[] = +{ + { user32_cursors, {'u','s','e','r','3','2','.','d','l','l',0} }, + { comctl32_cursors, {'c','o','m','c','t','l','3','2','.','d','l','l',0} }, + { ole32_cursors, {'o','l','e','3','2','.','d','l','l',0} }, + { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } +}; + +/*********************************************************************** + * create_xcursor_system_cursor + * + * Create an X cursor for a system cursor. + */ +static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) +{ + const struct system_cursors *cursors; + unsigned int i; + Cursor cursor = 0; + HMODULE module; + + if (!pXcursorLibraryLoadCursor) return 0; + if (info->szResName[0]) return 0; /* only integer resources are supported here */ + if (!(module = GetModuleHandleW( info->szModName ))) return 0; + + for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + if (GetModuleHandleW( module_cursors[i].name ) == module) break; + if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) return 0; + + cursors = module_cursors[i].cursors; + for (i = 0; cursors[i].id; i++) if (cursors[i].id == info->wResID) break; + + if (cursors[i].name) + { + wine_tsx11_lock(); + cursor = pXcursorLibraryLoadCursor( gdi_display, cursors[i].name ); + wine_tsx11_unlock(); + if (!cursor) WARN( "no library cursor found for %s\n", debugstr_a(cursors[i].name) ); + } + return cursor; +} + #endif /* SONAME_LIBXCURSOR */ @@ -838,6 +946,15 @@ static Cursor create_cursor( HANDLE handle ) info.cbSize = sizeof(info); if (!GetIconInfoExW( handle, &info )) return 0; +#ifdef SONAME_LIBXCURSOR + if (use_system_cursors && (cursor = create_xcursor_system_cursor( &info ))) + { + DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + return cursor; + } +#endif + GetObjectW( info.hbmMask, sizeof(bm), &bm ); if (!info.hbmColor) bm.bmHeight /= 2; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a4b9d76..536a4a1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -596,6 +596,7 @@ extern int dxgrab; extern int use_xkb; extern int use_take_focus; extern int use_primary_selection; +extern int use_system_cursors; extern int usexcomposite; extern int managed_mode; extern int decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b07061c..cf221b1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -82,6 +82,7 @@ int usexcomposite = 1; int use_xkb = 1; int use_take_focus = 1; int use_primary_selection = 0; +int use_system_cursors = 1; int managed_mode = 1; int decorated_mode = 1; int private_color_map = 0; @@ -396,6 +397,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "UsePrimarySelection", buffer, sizeof(buffer) )) use_primary_selection = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "UseSystemCursors", buffer, sizeof(buffer) )) + use_system_cursors = IS_OPTION_TRUE( buffer[0] ); + screen_depth = 0; if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer);

1 0

Alexandre Julliard : winex11: Allow specifying system cursor replacements through the registry.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: c876f250549e7f7ebb797dfed0e45f9f56805476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c876f250549e7f7ebb797dfed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 12:26:28 2010 +0200 winex11: Allow specifying system cursor replacements through the registry. --- dlls/winex11.drv/mouse.c | 54 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0746fd9..77a9e5f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -45,10 +45,12 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor); #define OEMRESOURCE #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "x11drv.h" #include "wine/server.h" #include "wine/library.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -704,29 +706,67 @@ static const struct */ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) { + static const WCHAR idW[] = {'%','h','u',0}; const struct system_cursors *cursors; unsigned int i; Cursor cursor = 0; HMODULE module; + HKEY key; + WCHAR *p, name[MAX_PATH * 2], valueW[64]; + char valueA[64]; + DWORD size, ret; if (!pXcursorLibraryLoadCursor) return 0; - if (info->szResName[0]) return 0; /* only integer resources are supported here */ - if (!(module = GetModuleHandleW( info->szModName ))) return 0; + if (!info->szModName[0]) return 0; + + p = strrchrW( info->szModName, '\\' ); + strcpyW( name, p ? p + 1 : info->szModName ); + p = name + strlenW( name ); + *p++ = ','; + if (info->szResName[0]) strcpyW( p, info->szResName ); + else sprintfW( p, idW, info->wResID ); + valueA[0] = 0; + + /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Cursors */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\X11 Driver\\Cursors", &key )) + { + size = sizeof(valueW) / sizeof(WCHAR); + ret = RegQueryValueExW( key, name, NULL, NULL, (BYTE *)valueW, &size ); + RegCloseKey( key ); + if (!ret) + { + if (!valueW[0]) return 0; /* force standard cursor */ + if (!WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, sizeof(valueA), NULL, NULL )) + valueA[0] = 0; + goto done; + } + } + + if (info->szResName[0]) goto done; /* only integer resources are supported here */ + if (!(module = GetModuleHandleW( info->szModName ))) goto done; for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) return 0; + if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; cursors = module_cursors[i].cursors; - for (i = 0; cursors[i].id; i++) if (cursors[i].id == info->wResID) break; + for (i = 0; cursors[i].id; i++) + if (cursors[i].id == info->wResID) + { + strcpy( valueA, cursors[i].name ); + break; + } - if (cursors[i].name) +done: + if (valueA[0]) { wine_tsx11_lock(); - cursor = pXcursorLibraryLoadCursor( gdi_display, cursors[i].name ); + cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); wine_tsx11_unlock(); - if (!cursor) WARN( "no library cursor found for %s\n", debugstr_a(cursors[i].name) ); + if (!cursor) WARN( "no system cursor found for %s mapped to %s\n", + debugstr_w(name), debugstr_a(valueA) ); } + else WARN( "no system cursor found for %s\n", debugstr_w(name) ); return cursor; }

1 0