May 2010 - Wine-Commits - list.winehq.org

Juan Lang : rsaenh: Implement CALG_SSL3_SHAMD5 hashing.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 62d806601bfa992f2e36ff4d208ea9781218bcd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d806601bfa992f2e36ff4d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 20 17:23:25 2010 -0700 rsaenh: Implement CALG_SSL3_SHAMD5 hashing. --- dlls/rsaenh/implglue.c | 1 + dlls/rsaenh/rsaenh.c | 3 ++- dlls/rsaenh/tests/rsaenh.c | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 7ecfc28..c217007 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -342,6 +342,7 @@ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContex case CALG_RSA_KEYX: case CALG_RSA_SIGN: + case CALG_SSL3_SHAMD5: outlen = inlen = (mp_count_bits(&pKeyContext->rsa.N)+7)/8; if (enc) { if (rsa_exptmod(in, inlen, out, &outlen, dwKeySpec, &pKeyContext->rsa) != CRYPT_OK) { diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8a5be99..89bb786 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1426,7 +1426,7 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, ALG_ID aiAlgid; DWORD dwLen; CONST BYTE abOID[19]; - } aOIDDescriptor[8] = { + } aOIDDescriptor[] = { { CALG_MD2, 18, { 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x02, 0x05, 0x00, 0x04, 0x10 } }, { CALG_MD4, 18, { 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, @@ -1444,6 +1444,7 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, { CALG_SHA_384, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x40 } }, + { CALG_SSL3_SHAMD5, 0, { 0 } }, { 0, 0, { 0 } } }; DWORD dwIdxOID, i, j; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1bab33f..5ee85f4 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -654,9 +654,7 @@ static void test_hashes(void) ok(result, "%08x\n", GetLastError()); ok(len == 128, "expected len 128, got %d\n", len); result = CryptSignHash(hHash, AT_KEYEXCHANGE, NULL, 0, pbSigValue, &len); - todo_wine ok(result, "%08x\n", GetLastError()); - todo_wine ok(!memcmp(pbSigValue, signed_ssl3_shamd5_hash, len), "unexpected value\n"); if (len != 128 || memcmp(pbSigValue, signed_ssl3_shamd5_hash, len)) {

1 0

Nikolay Sivov : shell32: Add SHGetLocalizedName stub.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 7abdcd2c4563b4980b8409dd0efaf8ef8c6b4956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abdcd2c4563b4980b8409dd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 20 23:31:55 2010 +0400 shell32: Add SHGetLocalizedName stub. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 7a5d4ed..c398f92 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -358,6 +358,7 @@ @ stdcall SHGetIconOverlayIndexA(str long) @ stdcall SHGetIconOverlayIndexW(wstr long) @ stdcall SHGetInstanceExplorer(long) +@ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index dc71022..2824268 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1225,3 +1225,9 @@ LRESULT CALLBACK ShellHookProc(DWORD a, DWORD b, DWORD c) FIXME("Stub\n"); return 0; } + +HRESULT WINAPI SHGetLocalizedName(LPCWSTR path, LPWSTR module, UINT size, INT *res) +{ + FIXME("%s %p %u %p: stub\n", debugstr_w(path), module, size, res); + return E_NOTIMPL; +}

1 0

Juan Lang : rsaenh: Add tests for CALG_SSL3_SHAMD5 hashing.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 71a9d1380c6d9019d14214787dc8400a6cd6cbb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a9d1380c6d9019d14214787… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 20 17:22:35 2010 -0700 rsaenh: Add tests for CALG_SSL3_SHAMD5 hashing. --- dlls/rsaenh/tests/rsaenh.c | 224 ++++++++++++++++++++++++++++--------------- 1 files changed, 146 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a9d1380c6d9019d1421…

1 0

Alexandre Julliard : user32: Get rid of the CURSORICONINFO structure in icon objects.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 50ebc10da40e6d3d90b6c32845abf0dd6f184e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ebc10da40e6d3d90b6c3284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 12:33:05 2010 +0200 user32: Get rid of the CURSORICONINFO structure in icon objects. --- dlls/user32/cursoricon.c | 202 +++++++++++++++------------------------------- 1 files changed, 66 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50ebc10da40e6d3d90b6c…

1 0

Alexandre Julliard : user32: No longer store the icon bits in the icon object.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: fb70204c696738e04ae6bb9285cff3adb1bcb87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb70204c696738e04ae6bb928… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 12:05:07 2010 +0200 user32: No longer store the icon bits in the icon object. --- dlls/user32/cursoricon.c | 318 +++++----------------------------------------- 1 files changed, 34 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb70204c696738e04ae6b…

1 0

Nikolay Sivov : comctl32/listview: Don' t forward WM_COMMAND to parent if we don't have an Edit box.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 5d708246d79e540f40c914f1bac80e70a4d0fee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d708246d79e540f40c914f1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 20 23:22:10 2010 +0400 comctl32/listview: Don't forward WM_COMMAND to parent if we don't have an Edit box. --- dlls/comctl32/listview.c | 7 ++++++- dlls/comctl32/tests/listview.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7395bb3..2c27aa9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11029,7 +11029,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("(uMsg=%x wParam=%lx lParam=%lx)\n", uMsg, wParam, lParam); + TRACE("(hwnd=%p uMsg=%x wParam=%lx lParam=%lx)\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -11589,6 +11589,11 @@ void LISTVIEW_Unregister(void) */ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { + + TRACE("(%p %x %x %lx)\n", infoPtr, HIWORD(wParam), LOWORD(wParam), lParam); + + if (!infoPtr->hwndEdit) return 0; + switch (HIWORD(wParam)) { case EN_UPDATE: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 929583d..b116962 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3496,6 +3496,22 @@ static void test_editbox(void) r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); expect(0, r); + /* test notifications without edit created */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_SETFOCUS), (LPARAM)0xdeadbeef); + expect(0, r); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "edit box WM_COMMAND (EN_SETFOCUS), no edit created", FALSE); + /* same thing but with valid window */ + hwndedit = CreateWindowA("Edit", "Test edit", WS_VISIBLE | WS_CHILD, 0, 0, 20, + 10, hwnd, (HMENU)1, (HINSTANCE)GetWindowLongPtrA(hwnd, GWLP_HINSTANCE), 0); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_SETFOCUS), (LPARAM)hwndedit); + expect(0, r); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "edit box WM_COMMAND (EN_SETFOCUS), no edit created #2", FALSE); + DestroyWindow(hwndedit); + /* setting focus is necessary */ SetFocus(hwnd); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0);

1 0

Alexandre Julliard : user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point .
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 86c4a3694dbe2c362748cb40f7b2fb15d974d42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c4a3694dbe2c362748cb40f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 13:30:15 2010 +0200 user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point. --- dlls/user32/cursoricon.c | 6 +++--- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 06a93d5..2a0feb1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1156,7 +1156,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, GetBitmapBits( hAndBits, sizeAnd, info + 1 ); GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd ); release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj, &info->data ); + USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1776,7 +1776,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) ptrNew->mask = copy_bitmap( ptrOld->mask ); release_icon_ptr( hIcon, ptrOld ); release_icon_ptr( hNew, ptrNew ); - USER_Driver->pCreateCursorIcon( hNew, &ptrNew->data ); + USER_Driver->pCreateCursorIcon( hNew ); return hNew; } @@ -2241,7 +2241,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj, &info->data ); + USER_Driver->pCreateCursorIcon( hObj ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index dc17264..f2f9892 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -217,7 +217,7 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor ) { } @@ -570,9 +570,9 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor ) { - load_driver()->pCreateCursorIcon( cursor, info ); + load_driver()->pCreateCursorIcon( cursor ); } static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 43daafd..23b4269 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -51,8 +51,6 @@ enum wine_internal_message WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; -struct tagCURSORICONINFO; - typedef struct tagUSER_DRIVER { /* keyboard functions */ HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT); @@ -68,7 +66,7 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pUnloadKeyboardLayout)(HKL); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ - void (CDECL *pCreateCursorIcon)(HCURSOR,struct tagCURSORICONINFO *); + void (CDECL *pCreateCursorIcon)(HCURSOR); void (CDECL *pDestroyCursorIcon)(HCURSOR); void (CDECL *pSetCursor)(HCURSOR); BOOL (CDECL *pGetCursorPos)(LPPOINT);

1 0

Alexandre Julliard : winex11: Create X11 cursors on demand when the cursor is set to a window.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: e25049e879b5fdbe3fe97d2ff00a64ed79eb3633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25049e879b5fdbe3fe97d2ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 13:26:22 2010 +0200 winex11: Create X11 cursors on demand when the cursor is set to a window. --- dlls/winex11.drv/mouse.c | 90 +++++++++++------------------------- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 28 insertions(+), 64 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9e3a5cd..e8c84dc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -39,7 +39,6 @@ MAKE_FUNCPTR(XcursorImageLoadCursor); #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "wine/winuser16.h" #include "x11drv.h" #include "wine/server.h" @@ -90,6 +89,7 @@ static HWND cursor_window; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ static XContext cursor_context; +static Cursor create_cursor( HANDLE handle ); BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ); @@ -195,38 +195,42 @@ static Cursor get_empty_cursor(void) } /*********************************************************************** - * get_x11_cursor - */ -Cursor get_x11_cursor( HCURSOR handle ) -{ - Cursor cursor; - - if (!handle) return get_empty_cursor(); - - if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) - return cursor; - return 0; -} - -/*********************************************************************** * set_window_cursor */ void set_window_cursor( HWND hwnd, HCURSOR handle ) { struct x11drv_win_data *data; - Cursor cursor; + Cursor cursor, prev; if (!(data = X11DRV_get_win_data( hwnd ))) return; wine_tsx11_lock(); - if ((cursor = get_x11_cursor( handle ))) + if (!handle) cursor = get_empty_cursor(); + else if (!cursor_context || XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { - TRACE( "%p xid %lx\n", handle, cursor ); - XDefineCursor( gdi_display, data->whole_window, cursor ); - /* Make the change take effect immediately */ - XFlush( gdi_display ); - data->cursor = handle; + /* try to create it */ + wine_tsx11_unlock(); + if (!(cursor = create_cursor( handle ))) return; + + wine_tsx11_lock(); + if (!cursor_context) cursor_context = XUniqueContext(); + if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) + { + /* someone else was here first */ + XFreeCursor( gdi_display, cursor ); + cursor = prev; + } + else + { + XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + TRACE( "cursor %p created %lx\n", handle, cursor ); + } } + + XDefineCursor( gdi_display, data->whole_window, cursor ); + /* make the change take effect immediately */ + XFlush( gdi_display ); + data->cursor = handle; wine_tsx11_unlock(); } @@ -327,16 +331,8 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, if (hwnd) { - Cursor xcursor; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - if (data && cursor != data->cursor) - { - wine_tsx11_lock(); - if ((xcursor = get_x11_cursor( cursor ))) - XDefineCursor( gdi_display, data->whole_window, xcursor ); - data->cursor = cursor; - wine_tsx11_unlock(); - } + if (data && cursor != data->cursor) set_window_cursor( hwnd, cursor ); } } @@ -796,36 +792,6 @@ static Cursor create_cursor( HANDLE handle ) } /*********************************************************************** - * CreateCursorIcon (X11DRV.@) - */ -void CDECL X11DRV_CreateCursorIcon( HCURSOR handle, CURSORICONINFO *info ) -{ - static const WORD ICON_HOTSPOT = 0x4242; - Cursor cursor, prev; - - /* ignore icons (FIXME: shouldn't use magic hotspot value) */ - if (info->ptHotSpot.x == ICON_HOTSPOT && info->ptHotSpot.y == ICON_HOTSPOT) return; - - cursor = create_cursor( handle ); - if (cursor) - { - wine_tsx11_lock(); - if (!cursor_context) cursor_context = XUniqueContext(); - if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) - { - /* someone else was here first */ - XFreeCursor( gdi_display, cursor ); - cursor = prev; - } - else - XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); - wine_tsx11_unlock(); - TRACE( "cursor %p %ux%u, planes %u, bpp %u -> xid %lx\n", - handle, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, cursor ); - } -} - -/*********************************************************************** * DestroyCursorIcon (X11DRV.@) */ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) @@ -833,7 +799,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) Cursor cursor; wine_tsx11_lock(); - if ((cursor = get_x11_cursor( handle ))) + if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { TRACE( "%p xid %lx\n", handle, cursor ); XFreeCursor( gdi_display, cursor ); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6bdf66e..ab61f54 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -73,7 +73,6 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx -@ cdecl CreateCursorIcon(long ptr) X11DRV_CreateCursorIcon @ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon @ cdecl SetCursor(long) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 13afe78..944669e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -781,7 +781,6 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); -extern Cursor get_x11_cursor( HCURSOR handle ); extern void set_window_cursor( HWND hwnd, HCURSOR handle ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display );

1 0

Alexandre Julliard : winex11: Retrieve the cursor info with GetIconInfo to create a color cursor.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 6264bc20bc8d5d812be9a46dee3b765efe8b02a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6264bc20bc8d5d812be9a46de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:54:41 2010 +0200 winex11: Retrieve the cursor info with GetIconInfo to create a color cursor. --- dlls/winex11.drv/mouse.c | 235 ++++++++++++++++------------------------------ 1 files changed, 82 insertions(+), 153 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9581945..54bc06b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -514,165 +514,73 @@ static BOOL check_alpha_zero(CURSORICONINFO *ptr, unsigned char *xor_bits) #ifdef SONAME_LIBXCURSOR /*********************************************************************** - * create_cursor_image - * - * Create an XcursorImage from a CURSORICONINFO - */ -static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) -{ - static const unsigned char convert_5to8[] = - { - 0x00, 0x08, 0x10, 0x19, 0x21, 0x29, 0x31, 0x3a, - 0x42, 0x4a, 0x52, 0x5a, 0x63, 0x6b, 0x73, 0x7b, - 0x84, 0x8c, 0x94, 0x9c, 0xa5, 0xad, 0xb5, 0xbd, - 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, - }; - static const unsigned char convert_6to8[] = - { - 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, - 0x20, 0x24, 0x28, 0x2d, 0x31, 0x35, 0x39, 0x3d, - 0x41, 0x45, 0x49, 0x4d, 0x51, 0x55, 0x59, 0x5d, - 0x61, 0x65, 0x69, 0x6d, 0x71, 0x75, 0x79, 0x7d, - 0x82, 0x86, 0x8a, 0x8e, 0x92, 0x96, 0x9a, 0x9e, - 0xa2, 0xa6, 0xaa, 0xae, 0xb2, 0xb6, 0xba, 0xbe, - 0xc2, 0xc6, 0xca, 0xce, 0xd2, 0xd7, 0xdb, 0xdf, - 0xe3, 0xe7, 0xeb, 0xef, 0xf3, 0xf7, 0xfb, 0xff, - }; - int x; - int y; - int and_size; - unsigned char *and_bits, *and_ptr, *xor_bits, *xor_ptr; - int and_width_bytes, xor_width_bytes; - XcursorPixel *pixel_ptr; - XcursorImage *image; - unsigned char tmp; - BOOL alpha_zero; - - and_width_bytes = 2 * ((ptr->nWidth+15) / 16); - xor_width_bytes = ptr->nWidthBytes; - - and_size = ptr->nHeight * and_width_bytes; - and_ptr = and_bits = (unsigned char *)(ptr + 1); - - xor_ptr = xor_bits = and_ptr + and_size; - - image = pXcursorImageCreate( ptr->nWidth, ptr->nHeight ); - if (!image) return NULL; - - pixel_ptr = image->pixels; - - alpha_zero = check_alpha_zero(ptr, xor_bits); - - /* On windows, to calculate the color for a pixel, first an AND is done - * with the background and the "and" bitmap, then an XOR with the "xor" - * bitmap. This means that when the data in the "and" bitmap is 0, the - * pixel will get the color as specified in the "xor" bitmap. - * However, if the data in the "and" bitmap is 1, the result will be the - * background XOR'ed with the value in the "xor" bitmap. In case the "xor" - * data is completely black (0x000000) the pixel will become transparent, - * in case it's white (0xffffff) the pixel will become the inverse of the - * background color. - * - * Since we can't support inverting colors, we map the grayscale value of - * the "xor" data to the alpha channel, and xor the color with either - * black or white. - */ - for (y = 0; y < ptr->nHeight; ++y) - { - and_ptr = and_bits + (y * and_width_bytes); - xor_ptr = xor_bits + (y * xor_width_bytes); - - for (x = 0; x < ptr->nWidth; ++x) - { - /* Xcursor pixel data is in ARGB format, with A in the high byte */ - switch (ptr->bBitsPerPixel) - { - case 32: - /* BGRA, 8 bits each */ - *pixel_ptr = *xor_ptr++; - *pixel_ptr |= *xor_ptr++ << 8; - *pixel_ptr |= *xor_ptr++ << 16; - *pixel_ptr |= *xor_ptr++ << 24; - break; - - case 24: - /* BGR, 8 bits each */ - *pixel_ptr = *xor_ptr++; - *pixel_ptr |= *xor_ptr++ << 8; - *pixel_ptr |= *xor_ptr++ << 16; - break; - - case 16: - /* BGR, 5 red, 6 green, 5 blue */ - /* [gggbbbbb][rrrrrggg] -> [xxxxxxxx][rrrrrrrr][gggggggg][bbbbbbbb] */ - *pixel_ptr = convert_5to8[*xor_ptr & 0x1f]; - tmp = (*xor_ptr++ & 0xe0) >> 5; - tmp |= (*xor_ptr & 0x07) << 3; - *pixel_ptr |= convert_6to8[tmp] << 16; - *pixel_ptr |= convert_5to8[*xor_ptr++ >> 3] << 24; - break; - - case 1: - if (*xor_ptr & (1 << (7 - (x & 7)))) *pixel_ptr = 0xffffff; - else *pixel_ptr = 0; - if ((x & 7) == 7) ++xor_ptr; - break; - - default: - FIXME("Currently no support for cursors with %d bits per pixel\n", ptr->bBitsPerPixel); - return 0; - } - - if (alpha_zero) - { - /* Alpha channel */ - if (~*and_ptr & (1 << (7 - (x & 7)))) *pixel_ptr |= 0xff << 24; - else if (*pixel_ptr) - { - int alpha = (*pixel_ptr & 0xff) * 0.30f - + ((*pixel_ptr & 0xff00) >> 8) * 0.55f - + ((*pixel_ptr & 0xff0000) >> 16) * 0.15f; - *pixel_ptr ^= ((x + y) % 2) ? 0xffffff : 0x000000; - *pixel_ptr |= alpha << 24; - } - if ((x & 7) == 7) ++and_ptr; - } - ++pixel_ptr; - } - } - - return image; -} - - -/*********************************************************************** * create_xcursor_cursor * * Use Xcursor to create an X cursor from a Windows one. */ -static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) +static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *icon, int width, int height ) { + int x, y, i, has_alpha; + BITMAPINFO *info; Cursor cursor; XcursorImage *image; + XcursorPixel *ptr; - image = create_cursor_image( ptr ); - if (!image) return 0; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return 0; - /* Make sure hotspot is valid */ - image->xhot = ptr->ptHotSpot.x; - image->yhot = ptr->ptHotSpot.y; - if (image->xhot >= image->width || - image->yhot >= image->height) + wine_tsx11_lock(); + image = pXcursorImageCreate( width, height ); + wine_tsx11_unlock(); + if (!image) { - image->xhot = image->width / 2; - image->yhot = image->height / 2; + HeapFree( GetProcessHeap(), 0, info ); + return 0; } + image->xhot = icon->xHotspot; + image->yhot = icon->yHotspot; image->delay = 0; - cursor = pXcursorImageLoadCursor( display, image ); - pXcursorImageDestroy( image ); + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = width * height * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + GetDIBits( hdc, icon->hbmColor, 0, height, image->pixels, info, DIB_RGB_COLORS ); + + for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) + if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + + if (!has_alpha) + { + unsigned char *mask_bits; + unsigned int width_bytes = (width + 31) / 32 * 4; + + /* generate alpha channel from the mask */ + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = width_bytes * height; + if ((mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) + { + GetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); + for (y = 0, ptr = image->pixels; y < height; y++) + for (x = 0; x < width; x++, ptr++) + if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) + *ptr |= 0xff000000; + HeapFree( GetProcessHeap(), 0, mask_bits ); + } + } + HeapFree( GetProcessHeap(), 0, info ); + wine_tsx11_lock(); + cursor = pXcursorImageLoadCursor( gdi_display, image ); + pXcursorImageDestroy( image ); + wine_tsx11_unlock(); return cursor; } @@ -994,23 +902,44 @@ static Cursor create_xlib_cursor( Display *display, CURSORICONINFO *ptr ) */ static Cursor create_cursor( HANDLE handle, CURSORICONINFO *ptr ) { - Cursor cursor; + Cursor cursor = 0; + HDC hdc; + ICONINFO info; + BITMAP bm; if (!handle) return get_empty_cursor(); + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + if (!GetIconInfo( handle, &info )) + { + DeleteDC( hdc ); + return 0; + } + + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + if (!info.hbmColor) bm.bmHeight /= 2; + + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + #ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) + if (pXcursorImageLoadCursor && info.hbmColor) + cursor = create_xcursor_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); +#endif + + if (!cursor) { wine_tsx11_lock(); - cursor = create_xcursor_cursor( gdi_display, ptr ); + cursor = create_xlib_cursor( gdi_display, ptr ); wine_tsx11_unlock(); - if (cursor) return cursor; } -#endif - - wine_tsx11_lock(); - cursor = create_xlib_cursor( gdi_display, ptr ); - wine_tsx11_unlock(); + if (info.hbmColor) DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + DeleteDC( hdc ); return cursor; }

1 0

Alexandre Julliard : winex11: Move X11 locking inside the cursor creation functions.
by Alexandre Julliard May 21, 2010

May 21, 2010

Module: wine Branch: master Commit: 45b7eb6858f8da0721101a19a9fcd46d53c08e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b7eb6858f8da0721101a19a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:40:06 2010 +0200 winex11: Move X11 locking inside the cursor creation functions. --- dlls/winex11.drv/mouse.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b044182..9581945 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -176,6 +176,7 @@ static Cursor get_empty_cursor(void) static Cursor cursor; static const char data[] = { 0 }; + wine_tsx11_lock(); if (!cursor) { XColor bg; @@ -189,6 +190,7 @@ static Cursor get_empty_cursor(void) XFreePixmap( gdi_display, pixmap ); } } + wine_tsx11_unlock(); return cursor; } @@ -682,7 +684,7 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) * * Create an X cursor from a Windows one. */ -static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) +static Cursor create_xlib_cursor( Display *display, CURSORICONINFO *ptr ) { Pixmap pixmapBits, pixmapMask, pixmapMaskInv = 0, pixmapAll; XColor fg, bg; @@ -691,12 +693,6 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) char *bitMask32 = NULL; BOOL alpha_zero = TRUE; - if (!ptr) return get_empty_cursor(); - -#ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); -#endif - /* Create the X cursor from the bits */ { XImage *image; @@ -992,26 +988,60 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) } /*********************************************************************** + * create_cursor + * + * Create an X cursor from a Windows one. + */ +static Cursor create_cursor( HANDLE handle, CURSORICONINFO *ptr ) +{ + Cursor cursor; + + if (!handle) return get_empty_cursor(); + +#ifdef SONAME_LIBXCURSOR + if (pXcursorImageLoadCursor) + { + wine_tsx11_lock(); + cursor = create_xcursor_cursor( gdi_display, ptr ); + wine_tsx11_unlock(); + if (cursor) return cursor; + } +#endif + + wine_tsx11_lock(); + cursor = create_xlib_cursor( gdi_display, ptr ); + wine_tsx11_unlock(); + return cursor; +} + +/*********************************************************************** * CreateCursorIcon (X11DRV.@) */ void CDECL X11DRV_CreateCursorIcon( HCURSOR handle, CURSORICONINFO *info ) { static const WORD ICON_HOTSPOT = 0x4242; - Cursor cursor; + Cursor cursor, prev; /* ignore icons (FIXME: shouldn't use magic hotspot value) */ if (info->ptHotSpot.x == ICON_HOTSPOT && info->ptHotSpot.y == ICON_HOTSPOT) return; - wine_tsx11_lock(); - cursor = create_cursor( gdi_display, info ); + cursor = create_cursor( handle, info ); if (cursor) { + wine_tsx11_lock(); if (!cursor_context) cursor_context = XUniqueContext(); - XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) + { + /* someone else was here first */ + XFreeCursor( gdi_display, cursor ); + cursor = prev; + } + else + XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + wine_tsx11_unlock(); TRACE( "cursor %p %ux%u, planes %u, bpp %u -> xid %lx\n", handle, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, cursor ); } - wine_tsx11_unlock(); } /***********************************************************************

1 0