October 2006 - Wine-commits

Oleg Krylov : comctl32: statusbar: Create tooltip window with WS_POPUP and TTS_ALWAYSTIP style.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: bea5b4b9f7c9666952fda7e4d0e07d748f9fc7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea5b4b9f7c9666952fda7e4d… Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Wed Oct 25 13:29:19 2006 +0300 comctl32: statusbar: Create tooltip window with WS_POPUP and TTS_ALWAYSTIP style. --- dlls/comctl32/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cd6e98a..85f7c6e 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -992,7 +992,7 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATES if (dwStyle & SBT_TOOLTIPS) { infoPtr->hwndToolTip = - CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0, + CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, WS_POPUP | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwnd, 0, (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), NULL);

1 0

Stefan Dösinger : ddraw: Forward the depth stencil buffer to wined3d.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 9329efa88ec11b223c2b2b7b58bd70abe8902055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9329efa88ec11b223c2b2b7b5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Oct 25 12:54:15 2006 +0200 ddraw: Forward the depth stencil buffer to wined3d. --- dlls/ddraw/direct3d.c | 15 +++++++++++++++ dlls/ddraw/surface.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 4a35938..8de0c1c 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -737,6 +737,8 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 IParentImpl *IndexBufferParent; HRESULT hr; IDirectDrawSurfaceImpl *target = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, Surface); + IDirectDrawSurface7 *depthbuffer = NULL; + static DDSCAPS2 depthcaps = { DDSCAPS_ZBUFFER, 0, 0, 0 }; TRACE("(%p)->(%s,%p,%p)\n", iface, debugstr_guid(refiid), Surface, Device); *Device = NULL; @@ -872,6 +874,19 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 This->d3ddevice = object; + /* Look for a depth buffer and enable the Z test if one is found */ + hr = IDirectDrawSurface7_GetAttachedSurface(Surface, + &depthcaps, + &depthbuffer); + if(depthbuffer) + { + TRACE("(%p) Depth buffer found, enabling Z test\n", object); + IWineD3DDevice_SetRenderState(This->wineD3DDevice, + WINED3DRS_ZENABLE, + TRUE); + IDirectDrawSurface7_Release(depthbuffer); + } + return D3D_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d7940bd..ab7eda6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -309,6 +309,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDr /* Unset any index buffer, just to be sure */ IWineD3DDevice_SetIndices(ddraw->wineD3DDevice, NULL, 0); + IWineD3DDevice_SetDepthStencilSurface(ddraw->wineD3DDevice, NULL); if(IWineD3DDevice_Uninit3D(ddraw->wineD3DDevice) != D3D_OK) { @@ -779,6 +780,14 @@ IDirectDrawSurfaceImpl_AddAttachedSurfac Surf->first_attached = This->first_attached; This->next_attached = Surf; + /* Check if we attach a back buffer to the primary */ + if(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER && + This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + IWineD3DDevice_SetDepthStencilSurface(This->ddraw->wineD3DDevice, + Surf->WineD3DSurface); + } + /* MSDN: * "This method increments the reference count of the surface being attached." */ @@ -838,6 +847,14 @@ IDirectDrawSurfaceImpl_DeleteAttachedSur Surf->next_attached = NULL; Surf->first_attached = Surf; + /* Check if we attach a back buffer to the primary */ + if(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER && + This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + IWineD3DDevice_SetDepthStencilSurface(This->ddraw->wineD3DDevice, + NULL); + } + IDirectDrawSurface7_Release(Attach); return DD_OK; }

1 0

Alexandre Julliard : user32: Fixed maximized window size on multi-monitor setups.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 7bee505d3714147c37d72501b7ce1807f1623706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bee505d3714147c37d72501b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 20:04:11 2006 +0200 user32: Fixed maximized window size on multi-monitor setups. --- dlls/user/winpos.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 9e91bc4..fbc99a2 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -808,11 +808,11 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, PO mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) && - MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN)) + if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && + MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) { - MinMax.ptMaxSize.x = mon_info.rcWork.right - mon_info.rcWork.left; - MinMax.ptMaxSize.y = mon_info.rcWork.bottom - mon_info.rcWork.top; + MinMax.ptMaxSize.x = (mon_info.rcWork.right - mon_info.rcWork.left) + 2 * xinc; + MinMax.ptMaxSize.y = (mon_info.rcWork.bottom - mon_info.rcWork.top) + 2 * yinc; } if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc) {

1 0

Alexandre Julliard : winhelp: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 0ab4c36c8e915fedba00813135d127ec12809994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab4c36c8e915fedba0081313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:43:22 2006 +0200 winhelp: Properly handle negative coordinates for mouse events. --- programs/winhelp/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 28d464d..4e9a717 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1111,8 +1111,8 @@ static LRESULT CALLBACK WINHELP_TextWndP HLPFILE* hlpfile; HLPFILE_WINDOWINFO* wi; - mouse.x = LOWORD(lParam); - mouse.y = HIWORD(lParam); + mouse.x = (short)LOWORD(lParam); + mouse.y = (short)HIWORD(lParam); if (part->link) switch (part->link->cookie) {

1 0

Alexandre Julliard : winemine: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: d0547cb631a65e39fd373f172b324abe1fbd47f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0547cb631a65e39fd373f172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:43:16 2006 +0200 winemine: Properly handle negative coordinates for mouse events. --- programs/winemine/main.c | 16 ++++++++-------- programs/winemine/main.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 7551db0..b017b44 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -134,7 +134,7 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT WINE_TRACE("WM_LBUTTONDOWN\n"); if( wParam & MK_RBUTTON ) msg = WM_MBUTTONDOWN; - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); return 0; @@ -142,7 +142,7 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT WINE_TRACE("WM_LBUTTONUP\n"); if( wParam & MK_RBUTTON ) msg = WM_MBUTTONUP; - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture(); return 0; @@ -153,24 +153,24 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT board.press.y = 0; msg = WM_MBUTTONDOWN; } - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); return 0; case WM_RBUTTONUP: WINE_TRACE("WM_RBUTTONUP\n"); if( wParam & MK_LBUTTON ) msg = WM_MBUTTONUP; - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); return 0; case WM_MBUTTONDOWN: WINE_TRACE("WM_MBUTTONDOWN\n"); - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); return 0; case WM_MBUTTONUP: WINE_TRACE("WM_MBUTTONUP\n"); - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); return 0; case WM_MOUSEMOVE: @@ -185,7 +185,7 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT return 0; } - TestBoard( hWnd, &board, LOWORD(lParam), HIWORD(lParam), msg ); + TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); return 0; } @@ -755,7 +755,7 @@ void DrawBoard( HDC hdc, HDC hMemDC, PAI } -void TestBoard( HWND hWnd, BOARD *p_board, unsigned x, unsigned y, int msg ) +void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) { POINT pt; unsigned col,row; diff --git a/programs/winemine/main.h b/programs/winemine/main.h index bc257b8..1b818cb 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -136,7 +136,7 @@ void CreateBoard( BOARD *p_board ); void CreateBoxes( BOARD *p_board ); -void TestBoard( HWND hWnd, BOARD *p_board, unsigned x, unsigned y, int msg ); +void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ); void TestMines( BOARD *p_board, POINT pt, int msg );

1 0

Alexandre Julliard : winefile: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 938f2314559dfcf1d60f008b3bbc8c04535bcc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=938f2314559dfcf1d60f008b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:43:09 2006 +0200 winefile: Properly handle negative coordinates for mouse events. --- programs/winefile/winefile.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 84d06de..7a0577e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4320,7 +4320,7 @@ #endif case WM_LBUTTONDOWN: { RECT rt; - int x = LOWORD(lparam); + int x = (short)LOWORD(lparam); GetClientRect(hwnd, &rt); @@ -4338,7 +4338,7 @@ #endif if (GetCapture() == hwnd) { #ifdef _NO_EXTENSIONS RECT rt; - int x = LOWORD(lparam); + int x = (short)LOWORD(lparam); draw_splitbar(hwnd, last_split); last_split = -1; GetClientRect(hwnd, &rt); @@ -4376,7 +4376,7 @@ #endif case WM_MOUSEMOVE: if (GetCapture() == hwnd) { RECT rt; - int x = LOWORD(lparam); + int x = (short)LOWORD(lparam); #ifdef _NO_EXTENSIONS HDC hdc = GetDC(hwnd);

1 0

Alexandre Julliard : wineconsole: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: f51c4004362eda28e0d4d32acb8795a500a4d26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51c4004362eda28e0d4d32ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:43:02 2006 +0200 wineconsole: Properly handle negative coordinates for mouse events. --- programs/wineconsole/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fbb1b98..4249e1f 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1177,8 +1177,8 @@ static LRESULT CALLBACK WCUSER_Proc(HWND { POINT pt; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); ClientToScreen(hWnd, &pt); WCUSER_SetMenuDetails(data, PRIVATE(data)->hPopMenu); TrackPopupMenu(PRIVATE(data)->hPopMenu, TPM_LEFTALIGN|TPM_TOPALIGN,

1 0

Alexandre Julliard : regedit: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 5b875279d1ff90251ba0e6b157c8828f1611c86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b875279d1ff90251ba0e6b15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:42:57 2006 +0200 regedit: Properly handle negative coordinates for mouse events. --- programs/regedit/childwnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 62c00b0..b7262ff 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -245,7 +245,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, break; case WM_LBUTTONDOWN: { RECT rt; - int x = LOWORD(lParam); + int x = (short)LOWORD(lParam); GetClientRect(hWnd, &rt); if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { last_split = pChildWnd->nSplitPos;

1 0

Alexandre Julliard : oleview: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: 4a464ef03aa2c717b48871174b932b1cffae076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a464ef03aa2c717b48871174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:42:51 2006 +0200 oleview: Properly handle negative coordinates for mouse events. --- programs/oleview/pane.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 4f5486d..61ab23c 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -73,11 +73,11 @@ LRESULT CALLBACK PaneProc(HWND hWnd, UIN SetCursor(LoadCursor(0, IDC_SIZEWE)); break; case WM_LBUTTONDOWN: - if(LOWORD(lParam) >= GetSplitPos(hWnd)-pane->size/2 && - LOWORD(lParam) <= GetSplitPos(hWnd)+pane->size/2) + if((short)LOWORD(lParam) >= GetSplitPos(hWnd)-pane->size/2 && + (short)LOWORD(lParam) <= GetSplitPos(hWnd)+pane->size/2) { pane->last = -1; - DrawSplitMoving(hWnd, LOWORD(lParam)); + DrawSplitMoving(hWnd, (short)LOWORD(lParam)); SetCapture(hWnd); } break; @@ -85,7 +85,7 @@ LRESULT CALLBACK PaneProc(HWND hWnd, UIN if(GetCapture() == hWnd) { pane->last = -1; - DrawSplitMoving(hWnd, LOWORD(lParam)); + DrawSplitMoving(hWnd, (short)LOWORD(lParam)); MoveWindow(pane->left, 0, 0, GetSplitPos(hWnd)-pane->size/2, pane->height, TRUE); @@ -97,7 +97,7 @@ LRESULT CALLBACK PaneProc(HWND hWnd, UIN break; case WM_MOUSEMOVE: if(GetCapture() == hWnd) - DrawSplitMoving(hWnd, LOWORD(lParam)); + DrawSplitMoving(hWnd, (short)LOWORD(lParam)); break; case WM_NOTIFY: if((int)wParam != TYPELIB_TREE) break;

1 0

Alexandre Julliard : shell32: Properly handle negative coordinates for mouse events.
by Alexandre Julliard 25 Oct '06

25 Oct '06

Module: wine Branch: master Commit: ff068c088b53a54915e9d59831b98ce80c4a5cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff068c088b53a54915e9d5983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:42:11 2006 +0200 shell32: Properly handle negative coordinates for mouse events. --- dlls/shell32/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index f9f6db8..f38a920 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -163,7 +163,7 @@ #define XSTEP 128 #define YICON 32 #define YSTEP 64 -static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy, +static BOOL Control_Localize(const CPanel* panel, int cx, int cy, CPlApplet** papplet, unsigned* psp) { unsigned i, x = (XSTEP-XICON)/2, y = 0; @@ -228,7 +228,7 @@ static LRESULT Control_WndProc_LButton(C unsigned i; CPlApplet* applet; - if (Control_Localize(panel, LOWORD(lParam), HIWORD(lParam), &applet, &i)) { + if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) { if (up) { if (panel->clkApplet == applet && panel->clkSP == i) { applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData);

1 0