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

Kirill K. Smirnov : kernel32/tests: Add tests for console codepages.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 24bf66180b7563b49d6460e2c49b944b63eab2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24bf66180b7563b49d6460e2c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu May 10 21:24:11 2007 +0400 kernel32/tests: Add tests for console codepages. --- dlls/kernel32/tests/process.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 162a622..a5f240a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1175,6 +1175,20 @@ static void test_Console(void) cpInC = GetConsoleCP(); cpOutC = GetConsoleOutputCP(); + + /* Try to set invalid CP */ + SetLastError(0xdeadbeef); + ok(!SetConsoleCP(0), "Shouldn't succeed\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_PARAMETER, GetLastError()); + + SetLastError(0xdeadbeef); + ok(!SetConsoleOutputCP(0), "Shouldn't succeed\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_PARAMETER, GetLastError()); + SetConsoleCP(cpIn); SetConsoleOutputCP(cpOut); @@ -1213,8 +1227,8 @@ static void test_Console(void) okChildInt("Console", "InputMode", modeIn); okChildInt("Console", "OutputMode", modeOut); - todo_wine ok(cpInC == 1252, "Wrong console CP (expected 1252 got %d/%d)\n", cpInC, cpIn); - todo_wine ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); + ok(cpInC == 1252, "Wrong console CP (expected 1252 got %d/%d)\n", cpInC, cpIn); + ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n"); ok(sbiC.dwCursorPosition.X == (sbi.dwCursorPosition.X ^ 1), "Wrong cursor position\n");

1 0

Stefan Dösinger : wined3d: Only addref clippers if one exists.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 093261b729fc77aeca83c01362e0a78dc9bca0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=093261b729fc77aeca83c0136… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 10 21:45:51 2007 +0200 wined3d: Only addref clippers if one exists. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 727f8b3..12681c4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3504,7 +3504,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD3DCl TRACE("(%p)->(%p)\n", This, clipper); *clipper = This->clipper; - IWineD3DClipper_AddRef(*clipper); + if(*clipper) { + IWineD3DClipper_AddRef(*clipper); + } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Prevent wrong bumpenvmap warnings.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: e40af7d3fa80ce6a536a38595301d5596a9a68ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40af7d3fa80ce6a536a38595… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 10 22:59:24 2007 +0200 wined3d: Prevent wrong bumpenvmap warnings. --- dlls/wined3d/utils.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 12e5230..c444232 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2218,14 +2218,13 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); Handled = TRUE; + break; } else if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { /* Technically texture shader support without register combiners is possible, but not expected to occur * on real world cards, so for now a fixme should be enough */ FIXME("Implement bump mapping with GL_NV_texture_shader in non register combiner path\n"); } - Handled = FALSE; - break; default: Handled = FALSE; }

1 0

Marcus Meissner : msi/tests: Increase buffer size a bit.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: c90429033608fe9ae815fa36744d5c8d4be18399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90429033608fe9ae815fa367… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 28 20:52:08 2007 +0200 msi/tests: Increase buffer size a bit. Spotted by Coverity. --- dlls/msi/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b0bccf9..ad4f35a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1141,7 +1141,7 @@ static void create_cc_test_files(void) static void delete_cab_files(void) { SHFILEOPSTRUCT shfl; - CHAR path[MAX_PATH]; + CHAR path[MAX_PATH+10]; lstrcpyA(path, CURR_DIR); lstrcatA(path, "\\*.cab"); @@ -1149,7 +1149,7 @@ static void delete_cab_files(void) shfl.hwnd = NULL; shfl.wFunc = FO_DELETE; - shfl.pFrom = (LPCSTR)path; + shfl.pFrom = path; shfl.pTo = NULL; shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT;

1 0

Mikołaj Zalewski : shell32: Handle invalid cbSize in Shell_NotifyIcon[AW].
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 44e3200a8d0912e3b7509b3ac6c2446deb7a4c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e3200a8d0912e3b7509b3ac… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 9 23:47:36 2007 +0200 shell32: Handle invalid cbSize in Shell_NotifyIcon[AW]. --- dlls/shell32/systray.c | 37 ++++++++++++-- dlls/shell32/tests/Makefile.in | 5 +- dlls/shell32/tests/systray.c | 106 ++++++++++++++++++++++++++++++++++++++++ programs/explorer/systray.c | 2 +- 4 files changed, 143 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 824eeb9..2258eb9 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -45,6 +45,20 @@ static const WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { NOTIFYICONDATAW nidW; + INT cbSize; + + /* Validate the cbSize as Windows XP does */ + if (pnid->cbSize != NOTIFYICONDATAA_V1_SIZE && + pnid->cbSize != NOTIFYICONDATAA_V2_SIZE && + pnid->cbSize != NOTIFYICONDATAA_V3_SIZE && + pnid->cbSize != sizeof(NOTIFYICONDATAA)) + { + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + pnid->cbSize, NOTIFYICONDATAA_V1_SIZE); + cbSize = NOTIFYICONDATAA_V1_SIZE; + } + else + cbSize = pnid->cbSize; ZeroMemory(&nidW, sizeof(nidW)); nidW.cbSize = sizeof(nidW); @@ -58,7 +72,7 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) if (pnid->uFlags & NIF_TIP) MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR)); - if (pnid->cbSize >= NOTIFYICONDATAA_V2_SIZE) + if (cbSize >= NOTIFYICONDATAA_V2_SIZE) { nidW.dwState = pnid->dwState; nidW.dwStateMask = pnid->dwStateMask; @@ -74,10 +88,10 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) nidW.dwInfoFlags = pnid->dwInfoFlags; } - if (pnid->cbSize >= NOTIFYICONDATAA_V3_SIZE) + if (cbSize >= NOTIFYICONDATAA_V3_SIZE) nidW.guidItem = pnid->guidItem; - if (pnid->cbSize >= sizeof(NOTIFYICONDATAA)) + if (cbSize >= sizeof(NOTIFYICONDATAA)) nidW.hBalloonIcon = pnid->hBalloonIcon; return Shell_NotifyIconW(dwMessage, &nidW); } @@ -93,6 +107,21 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); + /* Validate the cbSize so that WM_COPYDATA doesn't crash the application */ + if (nid->cbSize != NOTIFYICONDATAW_V1_SIZE && + nid->cbSize != NOTIFYICONDATAW_V2_SIZE && + nid->cbSize != NOTIFYICONDATAW_V3_SIZE && + nid->cbSize != sizeof(NOTIFYICONDATAW)) + { + NOTIFYICONDATAW newNid; + + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + nid->cbSize, NOTIFYICONDATAW_V1_SIZE); + CopyMemory(&newNid, nid, NOTIFYICONDATAW_V1_SIZE); + newNid.cbSize = NOTIFYICONDATAW_V1_SIZE; + return Shell_NotifyIconW(dwMessage, &newNid); + } + tray = FindWindowExW(0, NULL, classname, NULL); if (!tray) return FALSE; @@ -131,7 +160,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) } cds.lpData = buffer; - memcpy(buffer, nid, sizeof(*nid)); + memcpy(buffer, nid, nid->cbSize); buffer += nid->cbSize; memcpy(buffer, &bmMask, sizeof(bmMask)); buffer += sizeof(bmMask); diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 94b0c85..f66b34d 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 shlwapi advapi32 kernel32 +IMPORTS = shell32 ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ @@ -13,7 +13,8 @@ CTESTS = \ shlexec.c \ shlfileop.c \ shlfolder.c \ - string.c + string.c \ + systray.c @MAKE_TEST_RULES@ diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c new file mode 100644 index 0000000..e6d72a9 --- /dev/null +++ b/dlls/shell32/tests/systray.c @@ -0,0 +1,106 @@ +/* Unit tests for systray + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define _WIN32_IE 0x600 +#include <assert.h> +#include <stdarg.h> + +#include <windows.h> + +#include "wine/test.h" + + +static HWND hMainWnd; + +void test_cbsize() +{ + NOTIFYICONDATAW nidW; + NOTIFYICONDATAA nidA; + + ZeroMemory(&nidW, sizeof(nidW)); + nidW.cbSize = NOTIFYICONDATAW_V1_SIZE; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + nidW.uFlags = NIF_ICON|NIF_MESSAGE; + nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); + nidW.uCallbackMessage = WM_USER+17; + ok(Shell_NotifyIconW(NIM_ADD, &nidW), "NIM_ADD failed!\n"); + + /* using an invalid cbSize does work */ + nidW.cbSize = 3; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + ok(Shell_NotifyIconW(NIM_DELETE, &nidW), "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidW.cbSize = sizeof(nidW); + /* wine currently doesn't return error code put prints an ERR(...) */ + todo_wine ok(!Shell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); + + /* same for Shell_NotifyIconA */ + ZeroMemory(&nidA, sizeof(nidA)); + nidA.cbSize = NOTIFYICONDATAA_V1_SIZE; + nidA.hWnd = hMainWnd; + nidA.uID = 1; + nidA.uFlags = NIF_ICON|NIF_MESSAGE; + nidA.hIcon = LoadIcon(NULL, IDI_APPLICATION); + nidA.uCallbackMessage = WM_USER+17; + ok(Shell_NotifyIconA(NIM_ADD, &nidA), "NIM_ADD failed!\n"); + + /* using an invalid cbSize does work */ + nidA.cbSize = 3; + nidA.hWnd = hMainWnd; + nidA.uID = 1; + ok(Shell_NotifyIconA(NIM_DELETE, &nidA), "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidA.cbSize = sizeof(nidA); + /* wine currently doesn't return error code put prints an ERR(...) */ + todo_wine ok(!Shell_NotifyIconA(NIM_DELETE, &nidA), "The icon was not deleted\n"); +} + +START_TEST(systray) +{ + WNDCLASSA wc; + MSG msg; + RECT rc; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = DefWindowProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + GetClientRect(hMainWnd, &rc); + ShowWindow(hMainWnd, SW_SHOW); + + test_cbsize(); + + PostQuitMessage(0); + while(GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + DestroyWindow(hMainWnd); +} diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index b93d209..1814bce 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -290,7 +290,7 @@ static void delete_icon(const NOTIFYICONDATAW *nid) if (!icon) { - WINE_ERR("invalid tray icon ID specified: %ud\n", nid->uID); + WINE_ERR("invalid tray icon ID specified: %u\n", nid->uID); return; }

1 0

Stefan Dösinger : ddraw: Remove all non-d3d7 capability flags.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 6e22f03654b8ae396622f3c992417b5229aae107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e22f03654b8ae396622f3c99… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 7 15:32:21 2007 +0200 ddraw: Remove all non-d3d7 capability flags. --- dlls/ddraw/direct3d.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 5dee99a..e147094 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1315,6 +1315,108 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D, hr = IWineD3D_GetDeviceCaps(WineD3D, 0, WINED3DDEVTYPE_HAL, &WCaps); if(hr != D3D_OK) return hr; + /* Remove all non-d3d7 caps */ + Desc7->dwDevCaps &= ( + D3DDEVCAPS_FLOATTLVERTEX | D3DDEVCAPS_SORTINCREASINGZ | D3DDEVCAPS_SORTDECREASINGZ | + D3DDEVCAPS_SORTEXACT | D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | + D3DDEVCAPS_TLVERTEXSYSTEMMEMORY | D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY | + D3DDEVCAPS_TEXTUREVIDEOMEMORY | D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | + D3DDEVCAPS_TEXTURENONLOCALVIDMEM | D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | + D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_CANBLTSYSTONONLOCAL | + D3DDEVCAPS_HWRASTERIZATION); + + Desc7->dwStencilCaps &= ( + D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE | + D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT | + D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED); + + /* FVF caps ?*/ + + Desc7->dwTextureOpCaps &= ( + D3DTEXOPCAPS_DISABLE | D3DTEXOPCAPS_SELECTARG1 | D3DTEXOPCAPS_SELECTARG2 | + D3DTEXOPCAPS_MODULATE | D3DTEXOPCAPS_MODULATE2X | D3DTEXOPCAPS_MODULATE4X | + D3DTEXOPCAPS_ADD | D3DTEXOPCAPS_ADDSIGNED | D3DTEXOPCAPS_ADDSIGNED2X | + D3DTEXOPCAPS_SUBTRACT | D3DTEXOPCAPS_ADDSMOOTH | D3DTEXOPCAPS_BLENDTEXTUREALPHA | + D3DTEXOPCAPS_BLENDFACTORALPHA | D3DTEXOPCAPS_BLENDTEXTUREALPHAPM | D3DTEXOPCAPS_BLENDCURRENTALPHA | + D3DTEXOPCAPS_PREMODULATE | D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | + D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA | D3DTEXOPCAPS_BUMPENVMAP | + D3DTEXOPCAPS_BUMPENVMAPLUMINANCE | D3DTEXOPCAPS_DOTPRODUCT3); + + Desc7->dwVertexProcessingCaps &= ( + D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_VERTEXFOG | + D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER); + + Desc7->dpcLineCaps.dwMiscCaps &= ( + D3DPMISCCAPS_MASKPLANES | D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP | + D3DPMISCCAPS_CONFORMANT | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | + D3DPMISCCAPS_CULLCCW); + + Desc7->dpcLineCaps.dwRasterCaps &= ( + D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ROP2 | D3DPRASTERCAPS_XOR | + D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_SUBPIXEL | + D3DPRASTERCAPS_SUBPIXELX | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | + D3DPRASTERCAPS_STIPPLE | D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT | D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT | + D3DPRASTERCAPS_ANTIALIASEDGES | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | + D3DPRASTERCAPS_ZBUFFERLESSHSR | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | + D3DPRASTERCAPS_WBUFFER | D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT | D3DPRASTERCAPS_WFOG | + D3DPRASTERCAPS_ZFOG); + + Desc7->dpcLineCaps.dwZCmpCaps &= ( + D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | + D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | + D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); + + Desc7->dpcLineCaps.dwSrcBlendCaps &= ( + D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | + D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | + D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | + D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | + D3DPBLENDCAPS_BOTHINVSRCALPHA); + + Desc7->dpcLineCaps.dwDestBlendCaps &= ( + D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR | + D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA | + D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR | + D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA | + D3DPBLENDCAPS_BOTHINVSRCALPHA); + + Desc7->dpcLineCaps.dwAlphaCmpCaps &= ( + D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | + D3DPCMPCAPS_LESSEQUAL | D3DPCMPCAPS_GREATER | D3DPCMPCAPS_NOTEQUAL | + D3DPCMPCAPS_GREATEREQUAL | D3DPCMPCAPS_ALWAYS); + + Desc7->dpcLineCaps.dwShadeCaps &= ( + D3DPSHADECAPS_COLORFLATMONO | D3DPSHADECAPS_COLORFLATRGB | D3DPSHADECAPS_COLORGOURAUDMONO | + D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_COLORPHONGMONO | D3DPSHADECAPS_COLORPHONGRGB | + D3DPSHADECAPS_SPECULARFLATMONO | D3DPSHADECAPS_SPECULARFLATRGB | D3DPSHADECAPS_SPECULARGOURAUDMONO | + D3DPSHADECAPS_SPECULARGOURAUDRGB | D3DPSHADECAPS_SPECULARPHONGMONO | D3DPSHADECAPS_SPECULARPHONGRGB | + D3DPSHADECAPS_ALPHAFLATBLEND | D3DPSHADECAPS_ALPHAFLATSTIPPLED | D3DPSHADECAPS_ALPHAGOURAUDBLEND | + D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED | D3DPSHADECAPS_ALPHAPHONGBLEND | D3DPSHADECAPS_ALPHAPHONGSTIPPLED | + D3DPSHADECAPS_FOGFLAT | D3DPSHADECAPS_FOGGOURAUD | D3DPSHADECAPS_FOGPHONG); + + Desc7->dpcLineCaps.dwTextureCaps &= ( + D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA | + D3DPTEXTURECAPS_TRANSPARENCY | D3DPTEXTURECAPS_BORDER | D3DPTEXTURECAPS_SQUAREONLY | + D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE| D3DPTEXTURECAPS_NONPOW2CONDITIONAL | + D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_COLORKEYBLEND); + + Desc7->dpcLineCaps.dwTextureFilterCaps &= ( + D3DPTFILTERCAPS_NEAREST | D3DPTFILTERCAPS_LINEAR | D3DPTFILTERCAPS_MIPNEAREST | + D3DPTFILTERCAPS_MIPLINEAR | D3DPTFILTERCAPS_LINEARMIPNEAREST | D3DPTFILTERCAPS_LINEARMIPLINEAR | + D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC | + D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | + D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | + D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC); + + Desc7->dpcLineCaps.dwTextureBlendCaps &= ( + D3DPTBLENDCAPS_DECAL | D3DPTBLENDCAPS_MODULATE | D3DPTBLENDCAPS_DECALALPHA | + D3DPTBLENDCAPS_MODULATEALPHA | D3DPTBLENDCAPS_DECALMASK | D3DPTBLENDCAPS_MODULATEMASK | + D3DPTBLENDCAPS_COPY | D3DPTBLENDCAPS_ADD); + + Desc7->dpcLineCaps.dwTextureAddressCaps &= ( + D3DPTADDRESSCAPS_WRAP | D3DPTADDRESSCAPS_MIRROR | D3DPTADDRESSCAPS_CLAMP | + D3DPTADDRESSCAPS_BORDER | D3DPTADDRESSCAPS_INDEPENDENTUV); + if(!(Desc7->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_POW2)) { /* DirectX7 always has the np2 flag set, no matter what the card supports. Some old games(rollcage) * check the caps incorrectly. If wined3d supports nonpow2 textures it also has np2 conditional support

1 0

Stefan Dösinger : ddraw: Use point filter for blit operations.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: e7b68eec34b8da683643466fa2871ebb2365fd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b68eec34b8da683643466fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 10 17:42:41 2007 +0200 ddraw: Use point filter for blit operations. D3DTEXF_NONE is a special value for mipmapping which disabled mipmapping, but it is not a valid mag / min filter parameter. D3DTEXF_POINT is what we want --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/surface_gdi.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d0c93d7..a19b8dd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -745,7 +745,7 @@ IDirectDrawSurfaceImpl_Blt(IDirectDrawSurface7 *iface, SrcRect, Flags, (WINEDDBLTFX *) DDBltFx, - WINED3DTEXF_NONE); + WINED3DTEXF_POINT); switch(hr) { case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6b2ac1..735d8f4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2365,10 +2365,10 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D if( (xrel - 1.0 < -eps) || (xrel - 1.0 > eps)) { FIXME("Doing a pixel by pixel copy from the framebuffer to a texture, expect major performance issues\n"); - if(Filter != WINED3DTEXF_NONE) { + if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) { ERR("Texture filtering not supported in direct blit\n"); } - } else if((Filter != WINED3DTEXF_NONE) && ((yrel - 1.0 < -eps) || (yrel - 1.0 > eps))) { + } else if((Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) && ((yrel - 1.0 < -eps) || (yrel - 1.0 > eps))) { ERR("Texture filtering not supported in direct blit\n"); } @@ -3207,7 +3207,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, D if(trans & WINEDDBLTFAST_DONOTWAIT) Flags |= WINEDDBLT_DONOTWAIT; - if(IWineD3DSurfaceImpl_BltOverride(This, &DstRect, Source, &SrcRect, Flags, NULL, WINED3DTEXF_NONE) == WINED3D_OK) return WINED3D_OK; + if(IWineD3DSurfaceImpl_BltOverride(This, &DstRect, Source, &SrcRect, Flags, NULL, WINED3DTEXF_POINT) == WINED3D_OK) return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 7d277d4..c191b51 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -525,7 +525,7 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, return WINEDDERR_SURFACEBUSY; } - if(Filter != WINED3DTEXF_NONE) { + if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) { /* Can happen when d3d9 apps do a StretchRect call which isn't handled in gl */ FIXME("Filters not supported in software blit\n"); }

1 0

Stefan Dösinger : ddraw: GetSurfaceDesc returns the surface memory while the surface is locked.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: a5c484cbf3948ec824e990503f798d3333ff55fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c484cbf3948ec824e990503… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 10 21:55:14 2007 +0200 ddraw: GetSurfaceDesc returns the surface memory while the surface is locked. --- dlls/ddraw/surface.c | 12 +++++++++--- dlls/ddraw/tests/dsurface.c | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a19b8dd..98c425d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -585,7 +585,6 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, DDSD->dwSize = sizeof(DDSURFACEDESC2); } - DD_STRUCT_COPY_BYSIZE(DDSD,&(This->surface_desc)); hr = IWineD3DSurface_LockRect(This->WineD3DSurface, &LockedRect, Rect, @@ -596,7 +595,8 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, * does not set the LPSURFACE flag on locked surfaces !?!. * DDSD->dwFlags |= DDSD_LPSURFACE; */ - DDSD->lpSurface = LockedRect.pBits; + This->surface_desc.lpSurface = LockedRect.pBits; + DD_STRUCT_COPY_BYSIZE(DDSD,&(This->surface_desc)); TRACE("locked surface returning description :\n"); if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(DDSD); @@ -622,9 +622,15 @@ IDirectDrawSurfaceImpl_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); + HRESULT hr; TRACE("(%p)->(%p)\n", This, pRect); - return IWineD3DSurface_UnlockRect(This->WineD3DSurface); + hr = IWineD3DSurface_UnlockRect(This->WineD3DSurface); + if(SUCCEEDED(hr)) + { + This->surface_desc.lpSurface = NULL; + } + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a2d7e7a..067306e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -174,8 +174,7 @@ static void SrcColorKey32BlitTest(void) { LPDIRECTDRAWSURFACE lpSrc; LPDIRECTDRAWSURFACE lpDst; - DDSURFACEDESC ddsd; - DDSURFACEDESC ddsd2; + DDSURFACEDESC ddsd, ddsd2, ddsd3; DDCOLORKEY DDColorKey; LPDWORD lpData; HRESULT rc; @@ -211,9 +210,24 @@ static void SrcColorKey32BlitTest(void) lpData[1] = 0xCCCCCCCC; lpData[2] = 0xCCCCCCCC; lpData[3] = 0xCCCCCCCC; + + memset(&ddsd3, 0, sizeof(ddsd3)); + ddsd3.dwSize = sizeof(ddsd3); + U4(ddsd3).ddpfPixelFormat.dwSize = sizeof(U4(ddsd3).ddpfPixelFormat); + rc = IDirectDrawSurface_GetSurfaceDesc(lpDst, &ddsd3); + ok(rc == DD_OK, "IDirectDrawSurface_GetSurfaceDesc between a lock/unlock pair returned %08x\n", rc); + ok(ddsd3.lpSurface == ddsd3.lpSurface, "lpSurface from GetSurfaceDesc(%p) differs from the one returned by Lock(%p)\n", ddsd3.lpSurface, ddsd2.lpSurface); + rc = IDirectDrawSurface_Unlock(lpDst, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc); + memset(&ddsd3, 0, sizeof(ddsd3)); + ddsd3.dwSize = sizeof(ddsd3); + U4(ddsd3).ddpfPixelFormat.dwSize = sizeof(U4(ddsd3).ddpfPixelFormat); + rc = IDirectDrawSurface_GetSurfaceDesc(lpDst, &ddsd3); + ok(rc == DD_OK, "IDirectDrawSurface_GetSurfaceDesc between a lock/unlock pair returned %08x\n", rc); + ok(ddsd3.lpSurface == NULL, "lpSurface from GetSurfaceDesc(%p) is not NULL after unlock\n", ddsd3.lpSurface); + rc = IDirectDrawSurface_Lock(lpSrc, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n");

1 0

Stefan Dösinger : wined3d: Destroying the resource frees all private data.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 5c48d504fcc82a9640cf13980895ab933fd6e736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c48d504fcc82a9640cf13980… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 11 00:09:35 2007 +0200 wined3d: Destroying the resource frees all private data. Also adds a test for ddraw, d3d8 and d3d9. --- dlls/d3d8/tests/surface.c | 65 +++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/surface.c | 65 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/surface.c | 16 ++++++--- dlls/ddraw/tests/dsurface.c | 72 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 75 ++++++++++++++++++++++++------------------- include/d3d8.h | 5 +++ 6 files changed, 260 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c48d504fcc82a9640cf1…

1 0

Stefan Dösinger : wined3d: Implement DDBLT_DEPTHFILL on the active depth stencil target.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: a90f650fd21c0f08a4368e5bb41c8c748d11a96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90f650fd21c0f08a4368e5bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 10 21:10:49 2007 +0200 wined3d: Implement DDBLT_DEPTHFILL on the active depth stencil target. --- dlls/wined3d/surface.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 735d8f4..727f8b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3086,6 +3086,26 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * return WINED3DERR_INVALIDCALL; } +static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) +{ + IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + + if (Flags & WINEDDBLT_DEPTHFILL) { + return IWineD3DDevice_Clear((IWineD3DDevice *) myDevice, + DestRect == NULL ? 0 : 1, + (WINED3DRECT *) DestRect, + WINED3DCLEAR_ZBUFFER, + 0x00000000, + (float) DDBltFx->u5.dwFillDepth / (float) MAXDWORD, + 0x00000000); + + return WINED3D_OK; + } + + FIXME("(%p): Unsupp depthstencil blit\n", This); + return WINED3DERR_INVALIDCALL; +} + static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; @@ -3094,11 +3114,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *Dest TRACE("(%p): Usage is %s\n", This, debug_d3dusage(This->resource.usage)); /* Accessing the depth stencil is supposed to fail between a BeginScene and EndScene pair */ - if(myDevice->inScene && - (iface == myDevice->stencilBufferTarget || - (SrcSurface && SrcSurface == myDevice->stencilBufferTarget))) { - TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if(iface == myDevice->stencilBufferTarget || (SrcSurface && SrcSurface == myDevice->stencilBufferTarget)) { + if(myDevice->inScene) { + TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } else if(IWineD3DSurfaceImpl_BltZ(This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx) == WINED3D_OK) { + TRACE("Z Blit override handled the blit\n"); + return WINED3D_OK; + } } /* Special cases for RenderTargets */

1 0