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

Alexandre Julliard : winex11: Take into account the cursor show count when setting the initial cursor for a window .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 1afd0df7de85a4555d738aff0d5f99f5146c19d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afd0df7de85a4555d738aff0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:33:59 2010 +0200 winex11: Take into account the cursor show count when setting the initial cursor for a window. --- dlls/winex11.drv/window.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8cd3bf3..28d5ae6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -425,6 +425,25 @@ static void sync_window_style( Display *display, struct x11drv_win_data *data ) /*********************************************************************** + * sync_window_cursor + */ +static void sync_window_cursor( struct x11drv_win_data *data ) +{ + HCURSOR cursor; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + cursor = reply->prev_count >= 0 ? wine_server_ptr_handle( reply->prev_handle ) : 0; + } + SERVER_END_REQ; + + set_window_cursor( data->hwnd, cursor ); +} + + +/*********************************************************************** * sync_window_region * * Update the X11 window region. @@ -1053,7 +1072,6 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; char *process_name = get_process_name(); - Cursor cursor; wine_tsx11_lock(); @@ -1086,9 +1104,6 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); - if ((cursor = get_x11_cursor( data->cursor ))) - XDefineCursor( gdi_display, data->whole_window, cursor ); - data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); @@ -1681,6 +1696,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); + + sync_window_cursor( data ); done: if (win_rgn) DeleteObject( win_rgn ); return data->whole_window;

1 0

Alexandre Julliard : winex11: Select for EnterNotify events on the desktop window in order to update the cursor .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: f4be1662341111db5ca530124e28fc4b70dac2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4be1662341111db5ca530124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:34:17 2010 +0200 winex11: Select for EnterNotify events on the desktop window in order to update the cursor. --- dlls/winex11.drv/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a2bc004..4a36e46 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -142,7 +142,7 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) wine_tsx11_lock(); /* Create window */ - win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | + win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow );

1 0

Alexandre Julliard : winex11: The startscan line is relative to the destination in SetDIBits.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 27c85646057fd4b1011f4e3c7101930a892accaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c85646057fd4b1011f4e3c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:35:47 2010 +0200 winex11: The startscan line is relative to the destination in SetDIBits. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index d72ae00..95e3511 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4043,8 +4043,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start { unsigned int srcwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); int dstwidthb = ds.dsBm.bmWidthBytes; - LPBYTE dbits = physBitmap->base; - const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb); + LPBYTE dbits = physBitmap->base + startscan * dstwidthb; + const BYTE *sbits = bits; int widthb; UINT y;

1 0

Nikolay Sivov : user32: Fix selected brush color for caret bitmap creation.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: dcddea361f3cd2717c92757adddb87badc55d3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcddea361f3cd2717c92757ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 8 22:10:29 2010 +0400 user32: Fix selected brush color for caret bitmap creation. --- dlls/user32/caret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 953a081..308336d 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -154,7 +154,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) { HBITMAP hPrevBmp = SelectObject(hMemDC, hBmp); SetRect( &r, 0, 0, width, height ); - FillRect(hMemDC, &r, ULongToHandle((bitmap ? COLOR_GRAYTEXT : COLOR_WINDOW) + 1)); + FillRect(hMemDC, &r, bitmap ? GetStockObject(GRAY_BRUSH) : GetStockObject(WHITE_BRUSH)); SelectObject(hMemDC, hPrevBmp); } DeleteDC(hMemDC);

1 0

Mike Kaplinskiy : include: Add WSAID_WSASENDMSG extension guid.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: db1f5d5f75500c44bc3d327afa4b6704daf987f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1f5d5f75500c44bc3d327af… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:23:33 2010 -0400 include: Add WSAID_WSASENDMSG extension guid. --- include/mswsock.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 398572b..5423438 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -118,7 +118,7 @@ extern "C" { #define WSAID_CONNECTEX \ {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} #define WSAID_DISCONNECTEX \ - {0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}} + {0x7fda2e11,0x8630,0x436f,{0xa0,0x31,0xf5,0x36,0xa6,0xee,0xc1,0x57}} #define WSAID_GETACCEPTEXSOCKADDRS \ {0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} #define WSAID_TRANSMITFILE \ @@ -127,6 +127,8 @@ extern "C" { {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}} #define WSAID_WSARECVMSG \ {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} +#define WSAID_WSASENDMSG \ + {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} typedef struct _TRANSMIT_FILE_BUFFERS { LPVOID Head; @@ -170,6 +172,7 @@ typedef VOID (WINAPI * LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, st typedef BOOL (WINAPI * LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD); typedef BOOL (WINAPI * LPFN_TRANSMITPACKETS)(SOCKET, LPTRANSMIT_PACKETS_ELEMENT, DWORD, DWORD, LPOVERLAPPED, DWORD); typedef INT (WINAPI * LPFN_WSARECVMSG)(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); +typedef INT (WINAPI * LPFN_WSASENDMSG)(SOCKET, LPWSAMSG, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI AcceptEx(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); VOID WINAPI GetAcceptExSockaddrs(PVOID, DWORD, DWORD, DWORD, struct sockaddr **, LPINT, struct sockaddr **, LPINT);

1 0

Mike Kaplinskiy : ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: df710826e17e9d49a3943cea9b82b168f5095b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df710826e17e9d49a3943cea9… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:10:58 2010 -0400 ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub. --- dlls/ws2_32/socket.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6a6973..63607fe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2706,9 +2706,54 @@ INT WINAPI WSAIoctl(SOCKET s, break; case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; + { + static const GUID connectex_guid = WSAID_CONNECTEX; + static const GUID disconnectex_guid = WSAID_DISCONNECTEX; + static const GUID acceptex_guid = WSAID_ACCEPTEX; + static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; + static const GUID transmitfile_guid = WSAID_TRANSMITFILE; + static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; + static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; + static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; + + if ( IsEqualGUID(&connectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented ConnectEx\n"); + } + else if ( IsEqualGUID(&disconnectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + } + else if ( IsEqualGUID(&acceptex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented AcceptEx\n"); + } + else if ( IsEqualGUID(&getaccepexsockaddrs_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented GetAcceptExSockaddrs\n"); + } + else if ( IsEqualGUID(&transmitfile_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + } + else if ( IsEqualGUID(&transmitpackets_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); + } + else if ( IsEqualGUID(&wsarecvmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSARecvMsg\n"); + } + else if ( IsEqualGUID(&wsasendmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSASendMsg\n"); + } + else + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); + + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } case WS_SIO_KEEPALIVE_VALS: {

1 0

Gerald Pfeifer : cmd: Remove variable copyFromDir which is not really used from WCMD_copy.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0d527532face4cd5a1922b222555dcef53cb7ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d527532face4cd5a1922b222… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:59:08 2010 +0200 cmd: Remove variable copyFromDir which is not really used from WCMD_copy. --- programs/cmd/builtins.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0573114..7a4f9a1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -175,7 +175,6 @@ void WCMD_copy (void) { DWORD len; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; BOOL copyToDir = FALSE; - BOOL copyFromDir = FALSE; WCHAR srcspec[MAX_PATH]; DWORD attribs; WCHAR drive[10]; @@ -204,7 +203,6 @@ void WCMD_copy (void) { /* If a directory, then add \* on the end when searching */ if (attribs & FILE_ATTRIBUTE_DIRECTORY) { strcatW(srcpath, slashW); - copyFromDir = TRUE; strcatW(srcspec, slashW); strcatW(srcspec, starW); } else {

1 0

Gerald Pfeifer : taskmgr: Remove variable idctrl which is not really used from TaskManagerWndProc.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 11bbb0f0100976bba287b14d72ae0c74e6dcf342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bbb0f0100976bba287b14d7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:00:24 2010 +0200 taskmgr: Remove variable idctrl which is not really used from TaskManagerWndProc. --- programs/taskmgr/taskmgr.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 5958d5c..a9c6278 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -777,7 +777,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) PAINTSTRUCT ps; LPRECT pRC; RECT rc; - int idctrl; LPNMHDR pnmh; WINDOWPLACEMENT wp; @@ -960,7 +959,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_NOTIFY: - idctrl = (int)wParam; pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && (pnmh->idFrom == IDC_TAB) &&

1 0

Gerald Pfeifer : gdi32/tests: Remove two variables which are not really used from test_clipping.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: fcf831aceffed81c983b14b7552f9db4f39e070a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf831aceffed81c983b14b75… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:50:45 2010 +0200 gdi32/tests: Remove two variables which are not really used from test_clipping. --- dlls/gdi32/tests/bitmap.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 882d548..d94239f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2810,9 +2810,7 @@ static void test_GdiAlphaBlend(void) static void test_clipping(void) { HBITMAP bmpDst; - HBITMAP oldDst; HBITMAP bmpSrc; - HBITMAP oldSrc; HRGN hRgn; LPVOID bits; BOOL result; @@ -2830,11 +2828,11 @@ static void test_clipping(void) bmpDst = CreateDIBSection( hdcDst, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpDst != NULL, "Couldn't create destination bitmap\n"); - oldDst = SelectObject( hdcDst, bmpDst ); + SelectObject( hdcDst, bmpDst ); bmpSrc = CreateDIBSection( hdcSrc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldSrc = SelectObject( hdcSrc, bmpSrc ); + SelectObject( hdcSrc, bmpSrc ); result = BitBlt( hdcDst, 0, 0, 100, 100, hdcSrc, 100, 100, SRCCOPY ); ok(result, "BitBlt failed\n");

1 0

Gerald Pfeifer : winefile: Remove variable hChildClass which is not really used from InitInstance.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 7b252d6edb7db11f745b307daa5f44ea1725492d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b252d6edb7db11f745b307da… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 22:30:39 2010 +0200 winefile: Remove variable hChildClass which is not really used from InitInstance. --- programs/winefile/winefile.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index b63144c..c150c9a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4505,7 +4505,6 @@ static void InitInstance(HINSTANCE hinstance) WNDCLASSEXW wcFrame; WNDCLASSW wcChild; - ATOM hChildClass; int col; INITCOMMONCONTROLSEX icc = { @@ -4551,7 +4550,7 @@ static void InitInstance(HINSTANCE hinstance) wcChild.lpszMenuName = 0; wcChild.lpszClassName = sWINEFILETREE; - hChildClass = RegisterClassW(&wcChild); + RegisterClassW(&wcChild); Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE));

1 0