wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

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 : user32: Fix checking of show count in ShowCursor.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: eeda373f6ff1989b61a256dfb66d6381930b2cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeda373f6ff1989b61a256dfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 11:53:37 2010 +0200 user32: Fix checking of show count in ShowCursor. --- dlls/user32/cursoricon.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 856d900..9d7788d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1701,7 +1701,7 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { HCURSOR cursor; int increment = bShow ? 1 : -1; - int prev_count; + int count; SERVER_START_REQ( set_cursor ) { @@ -1709,15 +1709,16 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) req->show_count = increment; wine_server_call( req ); cursor = wine_server_ptr_handle( reply->prev_handle ); - prev_count = reply->prev_count; + count = reply->prev_count + increment; } SERVER_END_REQ; - TRACE("%d, count=%d\n", bShow, prev_count + increment ); + TRACE("%d, count=%d\n", bShow, count ); - if (!prev_count) USER_Driver->pSetCursor( bShow ? cursor : 0 ); + if (bShow && !count) USER_Driver->pSetCursor( cursor ); + else if (!bShow && count == -1) USER_Driver->pSetCursor( 0 ); - return prev_count + increment; + return count; } /***********************************************************************

1 0

Gerald Pfeifer : user32/tests: Remove SetShellWindowEx from test_shell_window.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 612df7ee228c9f2312f2b82ce23818d7fa047779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612df7ee228c9f2312f2b82ce… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 20:14:52 2010 +0200 user32/tests: Remove SetShellWindowEx from test_shell_window. --- dlls/user32/tests/win.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a295850..eab16e7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1040,7 +1040,6 @@ static void test_shell_window(void) DWORD error; HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); - BOOL (WINAPI*SetShellWindowEx)(HWND, HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; @@ -1055,7 +1054,6 @@ static void test_shell_window(void) hUser32 = GetModuleHandleA("user32"); SetShellWindow = (void *)GetProcAddress(hUser32, "SetShellWindow"); - SetShellWindowEx = (void *)GetProcAddress(hUser32, "SetShellWindowEx"); trace("previous shell window: %p\n", shellWindow);

1 0

Gerald Pfeifer : mountmgr.sys: Remove variable result which is not really used from update_symlink.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0c2fbbe7f04e774afc56a1e09b81847688b92997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2fbbe7f04e774afc56a1e09… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 19:44:22 2010 +0200 mountmgr.sys: Remove variable result which is not really used from update_symlink. --- dlls/mountmgr.sys/device.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ba5a02b..6c182e8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -175,7 +175,6 @@ static void update_symlink( const char *path, const char *dest, const char *orig /* send notification about a change to a given drive */ static void send_notify( int drive, int code ) { - DWORD_PTR result; DEV_BROADCAST_VOLUME info; info.dbcv_size = sizeof(info); @@ -183,8 +182,8 @@ static void send_notify( int drive, int code ) info.dbcv_reserved = 0; info.dbcv_unitmask = 1 << drive; info.dbcv_flags = DBTF_MEDIA; - result = BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, - WM_DEVICECHANGE, code, (LPARAM)&info ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, + WM_DEVICECHANGE, code, (LPARAM)&info ); } /* create the disk device for a given volume */

1 0

Gerald Pfeifer : d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: c45c226de4559687f993187fb44b4ef79bf19681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c226de4559687f993187fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 01:06:30 2010 +0200 d3dx9_36/tests: Remove variable scaling which is not really used from D3DXMatrixTest. --- dlls/d3dx9_36/tests/math.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 832798f..6d192f9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -236,7 +236,7 @@ static void D3DXMatrixTest(void) LPD3DXMATRIX funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; - D3DXVECTOR3 at, axis, eye, last, scaling; + D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; BOOL expected, got; FLOAT angle, determinant, expectedfloat, gotfloat; @@ -264,7 +264,6 @@ static void D3DXMatrixTest(void) axis.x = 1.0f; axis.y = -3.0f; axis.z = 7.0f; eye.x = 8.0f; eye.y = -5.0f; eye.z = 5.75f; last.x = 9.7f; last.y = -8.6; last.z = 1.3f; - scaling.x = 0.03f; scaling.y =0.05f; scaling.z = 0.06f; light.x = 9.6f; light.y = 8.5f; light.z = 7.4; light.w = 6.3;

1 0

Gerald Pfeifer : winecfg: Remove variable drive which is not really used from DriveDlgProc.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: cd958391e6894942419638804adbc5e6d30c0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd958391e6894942419638804… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 12:57:01 2010 +0200 winecfg: Remove variable drive which is not really used from DriveDlgProc. --- programs/winecfg/driveui.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 87af06c..dced874 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -736,7 +736,6 @@ INT_PTR CALLBACK DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) { int item; - struct drive *drive; switch (msg) { @@ -813,7 +812,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_BUTTON_EDIT: if (HIWORD(wParam) != BN_CLICKED) break; item = SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETCURSEL, 0, 0); - drive = (struct drive *) SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); + SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); break; case IDC_BUTTON_AUTODETECT:

1 0

Gerald Pfeifer : quartz: Remove variable keyframe which is not really used from AVISplitter_next_request .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: af72df259ef32f84746b48cdb1b5c2b63b98a21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af72df259ef32f84746b48cdb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 01:00:51 2010 +0200 quartz: Remove variable keyframe which is not really used from AVISplitter_next_request. --- dlls/quartz/avisplit.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d1d3426..3d567d2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -206,7 +206,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe { DWORD flags = This->oldindex->aIndex[stream->pos].dwFlags; DWORD size = This->oldindex->aIndex[stream->pos].dwSize; - BOOL keyframe; /* End of file */ if (stream->index) @@ -216,8 +215,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe return S_FALSE; } - keyframe = !!(flags & AVIIF_KEYFRAME); - rtSampleStart = MEDIATIME_FROM_BYTES(This->offset); rtSampleStart += MEDIATIME_FROM_BYTES(This->oldindex->aIndex[stream->pos].dwOffset); rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(size);

1 0

Gerald Pfeifer : shell32/tests: Remove variable res which is not really used from init_strings.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 3a8862355389e6bf1226e134d4fcf2d0b8e28d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8862355389e6bf1226e134d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 23:38:35 2010 +0200 shell32/tests: Remove variable res which is not really used from init_strings. --- dlls/shell32/tests/progman_dde.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 333e1f1..d7bf432 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -149,7 +149,6 @@ static void init_strings(void) { HKEY key; DWORD size; - LONG res; /* Older Win9x and NT4 */ @@ -162,7 +161,7 @@ static void init_strings(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); size = sizeof(commonprograms); - res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); + RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); RegCloseKey(key); }

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

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

← Newer
1
...
63
64
65
66
67
68
69
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010