March 2008 - Wine-Commits - list.winehq.org

Alexander Dorofeyev : wined3d: Handle zero primitive count.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 3d2bdf52cd164ce029f1dd5541f659a227f297bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2bdf52cd164ce029f1dd554… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 14:53:45 2008 +0200 wined3d: Handle zero primitive count. --- dlls/wined3d/drawprim.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2ece349..e70b905 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -984,6 +984,8 @@ void drawPrimitive(IWineD3DDevice *iface, IWineD3DSurfaceImpl *target; int i; + if (NumPrimitives == 0) return; + /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE;

1 0

Alexander Dorofeyev : ddraw/tests: Test SetPalette on non-palettized surfaces.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: bacd2340b424cba1eff7e6beffabf81b1f5751e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacd2340b424cba1eff7e6bef… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 01:59:23 2008 +0200 ddraw/tests: Test SetPalette on non-palettized surfaces. --- dlls/ddraw/tests/dsurface.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index cf3ae6f..99c45fd 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2371,7 +2371,9 @@ static void BltParamTest(void) static void PaletteTest(void) { HRESULT hr; - IDirectDrawPalette *palette; + LPDIRECTDRAWSURFACE lpSurf = NULL; + DDSURFACEDESC ddsd; + IDirectDrawPalette *palette = NULL; PALETTEENTRY Table[256]; PALETTEENTRY palEntries[256]; int i; @@ -2387,7 +2389,7 @@ static void PaletteTest(void) /* Create a 8bit palette without DDPCAPS_ALLOW256 set */ hr = IDirectDraw_CreatePalette(lpDD, DDPCAPS_8BIT, Table, &palette, NULL); ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); - + if (FAILED(hr)) goto err; /* Read back the palette and verify the entries. Without DDPCAPS_ALLOW256 set / entry 0 and 255 should have been overwritten with black and white */ IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); @@ -2428,6 +2430,8 @@ static void PaletteTest(void) /* Create a 8bit palette with DDPCAPS_ALLOW256 set */ hr = IDirectDraw_CreatePalette(lpDD, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); + if (FAILED(hr)) goto err; + IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); if(hr == DD_OK) @@ -2438,7 +2442,39 @@ static void PaletteTest(void) "Palette entry %d should have contained (255,0,0) but was set to %d,%d,%d)\n", i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue); } + + /* Try to set palette to a non-palettized surface */ + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.dwWidth = 800; + ddsd.dwHeight = 600; + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xFF0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x00FF00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x0000FF; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpSurf, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n",hr); + if (FAILED(hr)) { + skip("failed to create surface\n"); + goto err; + } + + hr = IDirectDrawSurface_SetPalette(lpSurf, palette); + ok(hr == DDERR_INVALIDPIXELFORMAT, "CreateSurface returned: %x\n",hr); + IDirectDrawPalette_Release(palette); + palette = NULL; + + hr = IDirectDrawSurface_GetPalette(lpSurf, &palette); + ok(hr == DDERR_NOPALETTEATTACHED, "CreateSurface returned: %x\n",hr); + + err: + + if (lpSurf) IDirectDrawSurface_Release(lpSurf); + if (palette) IDirectDrawPalette_Release(palette); } static void StructSizeTest(void)

1 0

Alexander Dorofeyev : ddraw: Make SetPalette fail for non-palettized surfaces.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 4b53dde0f53020196a3a11683c6f0711c7f2a999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b53dde0f53020196a3a11683… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 23 01:59:01 2008 +0200 ddraw: Make SetPalette fail for non-palettized surfaces. --- dlls/ddraw/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ae57bb4..c48e07e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2501,6 +2501,11 @@ IDirectDrawSurfaceImpl_SetPalette(IDirectDrawSurface7 *iface, HRESULT hr; TRACE("(%p)->(%p)\n", This, Pal); + if (!(This->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | + DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) { + return DDERR_INVALIDPIXELFORMAT; + } + /* Find the old palette */ EnterCriticalSection(&ddraw_cs); hr = IDirectDrawSurface_GetPalette(iface, &oldPal);

1 0

Roderick Colenbrander : wined3d: Fix a typo in CheckSrgbWriteCapability. We support both X8R8G8B8 and A8R8G8B8.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: cb9252db369a62b071810489adb134ebccde8f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9252db369a62b071810489a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 23 10:10:57 2008 +0000 wined3d: Fix a typo in CheckSrgbWriteCapability. We support both X8R8G8B8 and A8R8G8B8. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d470c4..0719ea1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2009,7 +2009,7 @@ static BOOL CheckSrgbWriteCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WI /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are * doing the color fixup in shaders. * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ - if((CheckFormat == WINED3DFMT_X8R8G8B8) || (CheckFormat == WINED3DFMT_X8R8G8B8)) { + if((CheckFormat == WINED3DFMT_X8R8G8B8) || (CheckFormat == WINED3DFMT_A8R8G8B8)) { int vs_selected_mode; int ps_selected_mode; select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode);

1 0

Roderick Colenbrander : wined3d: Add more debug code to CheckDeviceFormat.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 9123e8f3746df272a2369f8b56c0045564d28db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9123e8f3746df272a2369f8b5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 23 00:00:19 2008 +0000 wined3d: Add more debug code to CheckDeviceFormat. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef9f27e..5d470c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2613,7 +2613,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } else if((UsageCaps == (Usage & ~WINED3DUSAGE_AUTOGENMIPMAP)) && (Usage & WINED3DUSAGE_AUTOGENMIPMAP)){ return WINED3DOK_NOAUTOGEN; } else { - TRACE_(d3d_caps)("[FAILED] - Usage=%#08x requested but only %#08x is available\n", Usage, UsageCaps); + TRACE_(d3d_caps)("[FAILED] - Usage=%#08x requested for CheckFormat=%s and RType=%d but only %#08x is available\n", Usage, debug_d3dformat(CheckFormat), RType, UsageCaps); return WINED3DERR_NOTAVAILABLE; } }

1 0

Anatoly Lyutin : kernel32: Implement IsWow64Process.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: f773e148b096baa58ff4bb79ca0bd8f958b26c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f773e148b096baa58ff4bb79c… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Fri Mar 21 18:36:01 2008 +0300 kernel32: Implement IsWow64Process. --- dlls/kernel32/process.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b3bf535..054fbc0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2928,8 +2928,17 @@ DWORD WINAPI RegisterServiceProcess(DWORD dwProcessId, DWORD dwType) */ BOOL WINAPI IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) { - FIXME("(%p %p) stub!\n", hProcess, Wow64Process); - *Wow64Process = FALSE; + ULONG pbi; + NTSTATUS status; + + status = NtQueryInformationProcess( hProcess, ProcessWow64Information, &pbi, sizeof(pbi), NULL ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + *Wow64Process = (pbi != 0); return TRUE; }

1 0

Detlef Riekenberg : winspool: Forward EnumPrintersA to EnumPrintersW.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 9e35ee852fa90cb30804e3ace1544d50f8b6a799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e35ee852fa90cb30804e3ace… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Mar 22 19:28:50 2008 +0100 winspool: Forward EnumPrintersA to EnumPrintersW. --- dlls/winspool.drv/info.c | 262 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 249 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e35ee852fa90cb30804e…

1 0

Alexandre Julliard : user32: Clamp the mouse position to the window rectangle when starting a window resize .
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 549f7c91b40ab1bd908ce1fcb841d346abb78028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549f7c91b40ab1bd908ce1fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 24 18:01:02 2008 +0100 user32: Clamp the mouse position to the window rectangle when starting a window resize. --- dlls/user32/winpos.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 35ac5b0..04377b9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2300,7 +2300,8 @@ static LONG start_size_move( HWND hwnd, WPARAM wParam, POINT *capturePoint, LONG switch(msg.message) { case WM_MOUSEMOVE: - pt = msg.pt; + pt.x = min( max( msg.pt.x, rectWindow.left ), rectWindow.right - 1 ); + pt.y = min( max( msg.pt.y, rectWindow.top ), rectWindow.bottom - 1 ); hittest = SendMessageW( hwnd, WM_NCHITTEST, 0, MAKELONG( pt.x, pt.y ) ); if ((hittest < HTLEFT) || (hittest > HTBOTTOMRIGHT)) hittest = 0; break;

1 0

Alexandre Julliard : user32: Make sure we set menu capture to a window that is visible.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 635544e20f52a939ed133fddba0d54f65baf2a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=635544e20f52a939ed133fddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 24 17:59:58 2008 +0100 user32: Make sure we set menu capture to a window that is visible. --- dlls/user32/menu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 17b2179..2efc415 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2963,6 +2963,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; + HWND capture_win; mt.trackFlags = 0; mt.hCurrentMenu = hmenu; @@ -2991,7 +2992,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); + /* owner may not be visible when tracking a popup, so use the menu itself */ + capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; + set_capture_window( capture_win, GUI_INMENUMODE, NULL ); while (!fEndMenu) {

1 0

Alexandre Julliard : winex11: Setting window z-order using a sibling doesn' t work with some window managers.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 5787c12ba66c055bc0747ef63644df1dbfad86be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5787c12ba66c055bc0747ef63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 24 15:47:28 2008 +0100 winex11: Setting window z-order using a sibling doesn't work with some window managers. So let's see what happens if we don't set z-order at all in that case. --- dlls/winex11.drv/window.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4802add..4a393d9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1048,20 +1048,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data changes.stack_mode = Above; mask |= CWStackMode; } - else - { - /* should use stack_mode Below but most window managers don't get it right */ - /* so move it above the next one in Z order */ - HWND next = GetWindow( data->hwnd, GW_HWNDNEXT ); - while (next && !(GetWindowLongW( next, GWL_STYLE ) & WS_VISIBLE)) - next = GetWindow( next, GW_HWNDNEXT ); - if (next) - { - changes.stack_mode = Above; - changes.sibling = X11DRV_get_whole_window(next); - mask |= CWStackMode | CWSibling; - } - } + /* should use stack_mode Below but most window managers don't get it right */ + /* and Above with a sibling doesn't work so well either, so we ignore it */ } /* only the size is allowed to change for the desktop window */ @@ -1071,8 +1059,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); - TRACE( "setting win %lx pos %d,%d,%dx%d after %lx changes=%x\n", - data->whole_window, data->whole_rect.left, data->whole_rect.top, + TRACE( "setting win %p/%lx pos %d,%d,%dx%d after %lx changes=%x\n", + data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, data->whole_rect.right - data->whole_rect.left, data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask );

1 0