January 2007 - Wine-commits

Eric Pouech : dbghelp: Removed unneeded code from rewrite of . gnu_link handling.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 2e34ea4e01a50596d887f1a126cd7dd42b109de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e34ea4e01a50596d887f1a12… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jan 14 14:29:12 2007 +0100 dbghelp: Removed unneeded code from rewrite of .gnu_link handling. --- dlls/dbghelp/elf_module.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a06e926..9b6b458 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -800,7 +800,7 @@ static BOOL elf_debuglink_parse (struct * 2/ padding on 4 byte boundary * 3/ CRC of the linked ELF file */ - BOOL ret = FALSE, lret; + BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; struct elf_file_map fmap_link; @@ -808,13 +808,12 @@ static BOOL elf_debuglink_parse (struct { fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); fmap_link.with_crc = 1; - lret = elf_load_debug_info_from_map(module, &fmap_link, pool, - ht_symtab); - if (lret) + ret = elf_load_debug_info_from_map(module, &fmap_link, pool, + ht_symtab); + if (ret) strcpy(module->module.LoadedPdbName, dbg_link); else WARN("Couldn't load debug information from %s\n", dbg_link); - ret = ret || lret; elf_unmap_file(&fmap_link); } else

1 0

Dmitry Timoshkov : user32: Remove redundant visibility checks of a maximized MDI child, add an explanation why we do that.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=499c26ce66ec6cbbb3569c69c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 15 17:03:11 2007 +0800 user32: Remove redundant visibility checks of a maximized MDI child, add an explanation why we do that. --- dlls/user32/mdi.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index a2def9b..f8bb8f8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -120,6 +120,14 @@ typedef struct /* At some points, particularly when switching MDI children, active and * maximized MDI children may be not the same window, so we need to track * them separately. + * The only place where we switch to/from maximized state is DefMDIChildProc + * WM_SIZE/SIZE_MAXIMIZED handler. We get that notification only after the + * ShowWindow(SW_SHOWMAXIMIZED) request, therefore window is guaranteed to + * be visible at the time we get the notification, and it's safe to assume + * that hwndChildMaximized is always visible. + * If the app plays games with WS_VISIBLE, WS_MAXIMIZE or any other window + * states it must keep coherency with USER32 on its own. This is true for + * Windows as well. */ UINT nActiveChildren; HWND hwndChildMaximized; @@ -355,7 +363,7 @@ static LRESULT MDISetMenu( HWND hwnd, HM HMENU oldFrameMenu = ci->hFrameMenu; ci->hFrameMenu = hmenuFrame; - if (ci->hwndChildMaximized && (GetWindowLongW(ci->hwndChildMaximized, GWL_STYLE) & WS_VISIBLE)) + if (ci->hwndChildMaximized) MDI_AugmentFrameMenu( hwndFrame, ci->hwndChildMaximized ); return (LRESULT)oldFrameMenu; @@ -974,7 +982,7 @@ static void MDI_UpdateFrameText( HWND fr if (ci->frameTitle) { - if (ci->hwndChildMaximized && (GetWindowLongW(ci->hwndChildMaximized, GWL_STYLE) & WS_VISIBLE)) + if (ci->hwndChildMaximized) { /* combine frame title and child title if possible */ @@ -1220,8 +1228,7 @@ static LRESULT MDIClientWndProc_common( return 0; case WM_SIZE: - if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) && - (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) ) + if( ci->hwndChildMaximized ) { RECT rect; @@ -1230,9 +1237,9 @@ static LRESULT MDIClientWndProc_common( rect.right = LOWORD(lParam); rect.bottom = HIWORD(lParam); - AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), - 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); - MoveWindow(ci->hwndActiveChild, rect.left, rect.top, + AdjustWindowRectEx( &rect, GetWindowLongA(ci->hwndChildMaximized, GWL_STYLE), + 0, GetWindowLongA(ci->hwndChildMaximized, GWL_EXSTYLE) ); + MoveWindow( ci->hwndChildMaximized, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1); } else @@ -1507,6 +1514,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw break; case WM_SIZE: + /* This is the only place where we switch to/from maximized state */ /* do not change */ TRACE("current active %p, maximized %p\n", ci->hwndActiveChild, ci->hwndChildMaximized);

1 0

Paul Vriens : mpr: Fix typo (Coverity).
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 817265a74e46bc51b92e711f3b42ed60d826a01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=817265a74e46bc51b92e711f3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jan 14 13:23:45 2007 +0100 mpr: Fix typo (Coverity). --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index c894c55..3f57caf 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -819,7 +819,7 @@ DWORD WINAPI WNetEnumResourceA( HANDLE h ret = WN_BAD_POINTER; else if (!lpcCount) ret = WN_BAD_POINTER; - if (!lpBuffer) + else if (!lpBuffer) ret = WN_BAD_POINTER; else if (!lpBufferSize) ret = WN_BAD_POINTER;

1 0

Dmitry Timoshkov : user32: Remove MDI_AugmentFrameMenu call from WM_MDICREATE handler.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: d63fd7911f2164b2f17824e67655c5027c1e8713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63fd7911f2164b2f17824e67… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 14 20:19:50 2007 +0800 user32: Remove MDI_AugmentFrameMenu call from WM_MDICREATE handler. --- dlls/user32/mdi.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 4f6844c..8288885 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1115,12 +1115,6 @@ static LRESULT MDIClientWndProc_common( hwnd, 0, csA->hOwner, (LPVOID)csA->lParam); } - - if (IsZoomed(ci->hwndActiveChild)) - { - MDI_AugmentFrameMenu(GetParent(hwnd), child); - MDI_UpdateFrameText(GetParent(hwnd), hwnd, TRUE, NULL); - } return (LRESULT)child; } return 0;

1 0

Dmitry Timoshkov : user32: Simplify some maximized MDI child checks.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: f6d5368da75b12ff499eca2610d4aefd6286d607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d5368da75b12ff499eca261… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 14 20:20:29 2007 +0800 user32: Simplify some maximized MDI child checks. --- dlls/user32/mdi.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 8288885..a2def9b 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -320,8 +320,8 @@ static LRESULT MDISetMenu( HWND hwnd, HM { if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame; - if (IsZoomed(ci->hwndActiveChild)) - MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild ); + if (ci->hwndChildMaximized) + MDI_RestoreFrameMenu( hwndFrame, ci->hwndChildMaximized ); } if( hmenuWindow && hmenuWindow != ci->hWindowMenu ) @@ -355,8 +355,8 @@ static LRESULT MDISetMenu( HWND hwnd, HM HMENU oldFrameMenu = ci->hFrameMenu; ci->hFrameMenu = hmenuFrame; - if (IsZoomed(ci->hwndActiveChild) && (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE)) - MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild ); + if (ci->hwndChildMaximized && (GetWindowLongW(ci->hwndChildMaximized, GWL_STYLE) & WS_VISIBLE)) + MDI_AugmentFrameMenu( hwndFrame, ci->hwndChildMaximized ); return (LRESULT)oldFrameMenu; } @@ -369,8 +369,8 @@ static LRESULT MDISetMenu( HWND hwnd, HM * that the "if" to this "else" wouldn't catch the need to * augment the frame menu. */ - if( IsZoomed(ci->hwndActiveChild) ) - MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild ); + if( ci->hwndChildMaximized ) + MDI_AugmentFrameMenu( hwndFrame, ci->hwndChildMaximized ); } return 0; @@ -685,8 +685,8 @@ static LONG MDICascade( HWND client, MDI BOOL has_icons = FALSE; int i, total; - if (IsZoomed(ci->hwndActiveChild)) - SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + if (ci->hwndChildMaximized) + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); if (ci->nActiveChildren == 0) return 0; @@ -738,8 +738,8 @@ static void MDITile( HWND client, MDICLI int i, total; BOOL has_icons = FALSE; - if (IsZoomed(ci->hwndActiveChild)) - SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + if (ci->hwndChildMaximized) + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); if (ci->nActiveChildren == 0) return; @@ -974,7 +974,7 @@ static void MDI_UpdateFrameText( HWND fr if (ci->frameTitle) { - if (IsZoomed(ci->hwndActiveChild) && IsWindowVisible(ci->hwndActiveChild)) + if (ci->hwndChildMaximized && (GetWindowLongW(ci->hwndChildMaximized, GWL_STYLE) & WS_VISIBLE)) { /* combine frame title and child title if possible */ @@ -1481,7 +1481,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw switch( wParam ) { case SC_MOVE: - if( ci->hwndActiveChild == hwnd && IsZoomed(ci->hwndActiveChild)) + if( ci->hwndChildMaximized == hwnd ) return 0; break; case SC_RESTORE: @@ -1502,7 +1502,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw case WM_SHOWWINDOW: case WM_SETVISIBLE: - if (IsZoomed(ci->hwndActiveChild)) ci->mdiFlags &= ~MDIF_NEEDUPDATE; + if (ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE; else MDI_PostUpdate(client, ci, SB_BOTH+1); break;

1 0

Stefan Dösinger : wined3d: Do not force dynamic usage on transformed buffers.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 8c8d1e4f89fb4b0d9a14530bfd01c285b4af62bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8d1e4f89fb4b0d9a14530bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 19:02:36 2007 +0100 wined3d: Do not force dynamic usage on transformed buffers. --- dlls/wined3d/device.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1845446..2097b13 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -450,17 +450,6 @@ static void CreateVBO(IWineD3DVertexBuff goto error; } - /* Transformed vertices are horribly inflexible. If the app specifies an - * vertex buffer with transformed vertices in default pool without DYNAMIC - * usage assume DYNAMIC usage and print a warning. The app will have to update - * the vertices regularily for them to be useful - */ - if(((object->fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) && - !(vboUsage & WINED3DUSAGE_DYNAMIC)) { - WARN("Application creates a vertex buffer holding transformed vertices which doesn't specify dynamic usage\n"); - vboUsage |= WINED3DUSAGE_DYNAMIC; - } - /* Don't use static, because dx apps tend to update the buffer * quite often even if they specify 0 usage */

1 0

Stefan Dösinger : wined3d, d3d9: Caps correction.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 8658d20b3e663d71c62b99457a5f446374ab7bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8658d20b3e663d71c62b99457… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 23:13:58 2007 +0100 wined3d, d3d9: Caps correction. --- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 57062b2..3dcd931 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -172,7 +172,7 @@ static HRESULT WINAPI IDirect3D9Impl_Get HeapFree(GetProcessHeap(), 0, pWineCaps); /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ - pCaps->Caps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; + pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; TRACE("(%p) returning %p\n", This, pCaps); return hrc; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb76de5..cbcbdc2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2243,9 +2243,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDe The following fields apply to d3d9 only ------------------------------------------------ */ if (This->dxVersion > 8) { - FIXME("Caps support for directx9 is nonexistent at the moment!\n"); + /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */ *pCaps->DevCaps2 = 0; - /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */ + /* TODO: VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */ *pCaps->MaxNpatchTessellationLevel = 0; *pCaps->MasterAdapterOrdinal = 0; *pCaps->AdapterOrdinalInGroup = 0;

1 0

Dmitry Timoshkov : wined3d: Do not play with WS_VISIBLE, this causes unwanted mapping/unmapping of the window.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 5ddac44dc2a6637613407fa900d3fafac37e70d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddac44dc2a6637613407fa90… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 14 20:16:42 2007 +0800 wined3d: Do not play with WS_VISIBLE, this causes unwanted mapping/unmapping of the window. --- dlls/wined3d/device.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2097b13..a77ccdc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1427,6 +1427,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl HDC hdc; int bpp = 0; RECT clip_rc; + DWORD style; /* Get info on the current display setup */ hdc = GetDC(0); @@ -1442,11 +1443,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl MultiByteToWideChar(CP_ACP, 0, "Gamers CG", -1, devmode.dmDeviceName, CCHDEVICENAME); ChangeDisplaySettingsExW(devmode.dmDeviceName, &devmode, object->win_handle, CDS_FULLSCREEN, NULL); - /* Make popup window */ - SetWindowLongA(object->win_handle, GWL_STYLE, WS_POPUP); + /* Make popup window, remove caption and borders */ + style = GetWindowLongW(object->win_handle, GWL_STYLE); + style &= ~WS_CAPTION; + SetWindowLongW(object->win_handle, GWL_STYLE, style | WS_POPUP); SetWindowPos(object->win_handle, HWND_TOP, 0, 0, *(pPresentationParameters->BackBufferWidth), - *(pPresentationParameters->BackBufferHeight), SWP_SHOWWINDOW | SWP_FRAMECHANGED); + *(pPresentationParameters->BackBufferHeight), SWP_FRAMECHANGED); /* For GetDisplayMode */ This->ddraw_width = devmode.dmPelsWidth;

1 0

Dmitry Timoshkov : winex11.drv: Fix the typos in the fullscreen state debug trace.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 635bb1104927c55763053063a69faaaff9022b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635bb1104927c55763053063a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 14 20:17:07 2007 +0800 winex11.drv: Fix the typos in the fullscreen state debug trace. --- dlls/winex11.drv/winpos.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 4a5a03b..95afc40 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -190,7 +190,7 @@ static void update_fullscreen_state( Dis { XEvent xev; - TRACE("setting fullscreen state for window %ld to %s\n", win, new_fs_state ? "true" : "false"); + TRACE("setting fullscreen state for window %lx to %s\n", win, new_fs_state ? "true" : "false"); xev.xclient.type = ClientMessage; xev.xclient.window = win; @@ -229,10 +229,11 @@ static BOOL fullscreen_state_changed( co *new_fs_state = TRUE; #if 0 /* useful to debug fullscreen state problems */ - TRACE("old rect %s, new rect %s, old screen %s, new screen (0,0-%d,%d)\n", + TRACE("hwnd %p, old rect %s, new rect %s, old screen %s, new screen (0,0-%d,%d)\n", + data->hwnd, wine_dbgstr_rect(old_client_rect), wine_dbgstr_rect(&data->client_rect), wine_dbgstr_rect(old_screen_rect), screen_width, screen_height); - TRACE("old fs state %d\n, new fs state = %d\n", old_fs_state, new_fs_state); + TRACE("old fs state %d\n, new fs state = %d\n", old_fs_state, *new_fs_state); #endif return *new_fs_state != old_fs_state; }

1 0

Stefan Dösinger : wined3d: Revert "wined3d: Do not preload vertex buffers in unlock.".
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: a7916d8011a1b63306474ed1e958c519a385e1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7916d8011a1b63306474ed1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 12 18:55:16 2007 +0100 wined3d: Revert "wined3d: Do not preload vertex buffers in unlock.". This reverts commit 6fb1869b98265a30a285c6f94a768934476a8c2a. --- dlls/wined3d/vertexbuffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index da22469..c7a8a97 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -498,6 +498,8 @@ HRESULT WINAPI IWineD3DVertexBufferImpl GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); checkGLcall("glUnmapBufferARB"); LEAVE_GL(); + } else if(This->Flags & VBFLAG_HASDESC){ + IWineD3DVertexBufferImpl_PreLoad(iface); } return WINED3D_OK; }

1 0