January 2009 - Wine-Commits

Paul Vriens : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 850cd7ccb2a754f091033589b39f5702c6cfc1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=850cd7ccb2a754f091033589b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 17:48:07 2009 +0100 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlfileop.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3aacd0c..234a907 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -40,6 +40,7 @@ #define DE_DESTSUBTREE 0x76 #define DE_INVALIDFILES 0x7C #define DE_DESTSAMETREE 0x7D +#define DE_FLDDESTISFILE 0x7E #define DE_FILEDESTISFLD 0x80 #define expect_retval(ret, ret_prewin32)\ ok(retval == ret ||\ @@ -917,8 +918,16 @@ static void test_copy(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); retval = SHFileOperation(&shfo); - expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); - ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); + if (retval == DE_FLDDESTISFILE) + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(shfo.fAnyOperationsAborted, "Expected aborted operations\n"); + } ok(!file_exists("test3.txt\\test2.txt"), "Expected test3.txt\\test2.txt to not exist\n"); /* try to copy many files to nonexistent directory */ @@ -1560,7 +1569,10 @@ static void test_copy(void) shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(retval == ERROR_CANCELLED || + retval == DE_FILEDESTISFLD || /* Vista */ + broken(retval == DE_OPCANCELLED), /* Win9x, NT4 */ + "Expected ERROR_CANCELLED or DE_FILEDESTISFLD. got %d\n", retval); if (file_exists("threedir\\threedir")) { /* NT4 */

1 0

Paul Vriens : shell32/tests: Fix some errors on NT4 (FO_DELETE).
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: faf2f8e682edea6de3ab952e1dab8730d4273251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf2f8e682edea6de3ab952e1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 17:38:56 2009 +0100 shell32/tests: Fix some errors on NT4 (FO_DELETE). --- dlls/shell32/tests/shlfileop.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d3e81a8..3aacd0c 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -497,17 +497,19 @@ static void test_delete(void) shfo.lpszProgressTitle = NULL; ok(!SHFileOperationA(&shfo), "Deletion was not successful\n"); - ok(file_exists("test4.txt"), "Directory should not have been removed\n"); + ok(dir_exists("test4.txt"), "Directory should not have been removed\n"); ok(!file_exists("test1.txt"), "File should have been removed\n"); + ok(!file_exists("test2.txt"), "File should have been removed\n"); + ok(!file_exists("test3.txt"), "File should have been removed\n"); ret = SHFileOperationA(&shfo); - ok(!ret, "Directory exists, but is not removed, ret=%d\n", ret); - ok(file_exists("test4.txt"), "Directory should not have been removed\n"); + ok(ret == ERROR_SUCCESS, "Directory exists, but is not removed, ret=%d\n", ret); + ok(dir_exists("test4.txt"), "Directory should not have been removed\n"); shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; ok(!SHFileOperationA(&shfo), "Directory is not removed\n"); - ok(!file_exists("test4.txt"), "Directory should have been removed\n"); + ok(!dir_exists("test4.txt"), "Directory should have been removed\n"); ret = SHFileOperationA(&shfo); ok(!ret, "The requested file does not exist, ret=%d\n", ret); @@ -517,13 +519,13 @@ static void test_delete(void) buf[strlen(buf) + 1] = '\0'; ok(MoveFileA("test1.txt", "test4.txt\\test1.txt"), "Filling the subdirectory failed\n"); ok(!SHFileOperationA(&shfo), "Directory is not removed\n"); - ok(!file_exists("test4.txt"), "Directory is not removed\n"); + ok(!dir_exists("test4.txt"), "Directory is not removed\n"); init_shfo_tests(); shfo.pFrom = "test1.txt\0test4.txt\0"; ok(!SHFileOperationA(&shfo), "Directory and a file are not removed\n"); ok(!file_exists("test1.txt"), "The file should have been removed\n"); - ok(!file_exists("test4.txt"), "Directory should have been removed\n"); + ok(!dir_exists("test4.txt"), "Directory should have been removed\n"); ok(file_exists("test2.txt"), "This file should not have been removed\n"); /* FOF_FILESONLY does not delete a dir matching a wildcard */ @@ -533,13 +535,15 @@ static void test_delete(void) ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test1.txt"), "test1.txt should have been removed\n"); ok(!file_exists("test_5.txt"), "test_5.txt should have been removed\n"); - ok(file_exists("test4.txt"), "test4.txt should not have been removed\n"); + ok(dir_exists("test4.txt"), "test4.txt should not have been removed\n"); /* FOF_FILESONLY only deletes a dir if explicitly specified */ init_shfo_tests(); shfo.pFrom = "test_?.txt\0test4.txt\0"; ok(!SHFileOperation(&shfo), "Failed to delete files and directory\n"); - ok(!file_exists("test4.txt"), "test4.txt should have been removed\n"); + ok(!dir_exists("test4.txt") || + broken(dir_exists("test4.txt")), /* NT4 */ + "test4.txt should have been removed\n"); ok(!file_exists("test_5.txt"), "test_5.txt should have been removed\n"); ok(file_exists("test1.txt"), "test1.txt should not have been removed\n"); @@ -586,8 +590,10 @@ static void test_delete(void) shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperation(&shfo); - ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); - ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); + ok(ret == ERROR_PATH_NOT_FOUND || + broken(ret == ERROR_SUCCESS), /* NT4 */ + "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); + ok(!dir_exists("testdir2"), "Expected testdir2 to not exist\n"); ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); /* try the FOF_NORECURSION flag, continues deleting subdirs */ @@ -597,7 +603,7 @@ static void test_delete(void) ret = SHFileOperation(&shfo); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); - ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); + ok(!dir_exists("testdir2\\nested"), "Expected testdir2\\nested to not exist\n"); } /* tests the FO_RENAME action */

1 0

Alexandre Julliard : include: Fix packing of the setupapi structures.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: a2cf243776976d47996ee7259e578ba59fe0eaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2cf243776976d47996ee7259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 14:03:57 2009 +0100 include: Fix packing of the setupapi structures. --- dlls/setupapi/tests/devinst.c | 6 ------ include/setupapi.h | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 78b2ca3..9a5b1fc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -835,12 +835,6 @@ static void testGetDeviceInterfaceDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, size, &size, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, - "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); - /* Windows 2000 and up check for the exact size */ - detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); - ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, - size, &size, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n", GetLastError()); ok(!lstrcmpiA(path, detail->DevicePath) || diff --git a/include/setupapi.h b/include/setupapi.h index 820c5c4..b36243a 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -22,8 +22,10 @@ #include <commctrl.h> -#ifdef __cplusplus -extern "C" { +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack1.h> #endif /* setupapi doesn't use the normal convention, it adds an underscore before A/W */ @@ -1848,8 +1850,6 @@ BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID); #undef DECL_WINELIB_SETUPAPI_TYPE_AW -#ifdef __cplusplus -} -#endif +#include <poppack.h> #endif /* _INC_SETUPAPI */

1 0

Alexandre Julliard : oleaut32/tests: Only compare the initialized part of DECIMAL variants.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 3b6cab3f77c6991bb9a05c89a046df8b2669be4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6cab3f77c6991bb9a05c89a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 14:03:30 2009 +0100 oleaut32/tests: Only compare the initialized part of DECIMAL variants. --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 61225e4..648c959 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2838,7 +2838,7 @@ static void test_VarFix(void) S1(U1(*pdec)).Mid32 = 0; S1(U1(*pdec)).Lo32 = 1; hres = pVarFix(&v,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&v, &vDst, sizeof(v)), + ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&V_DECIMAL(&v), &V_DECIMAL(&vDst), sizeof(DECIMAL)), "VarFix: expected 0x0,%d,identical, got 0x%X,%d\n", VT_DECIMAL, hres, V_VT(&vDst)); @@ -2953,7 +2953,7 @@ static void test_VarInt(void) S1(U1(*pdec)).Mid32 = 0; S1(U1(*pdec)).Lo32 = 1; hres = pVarInt(&v,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&v, &vDst, sizeof(v)), + ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&V_DECIMAL(&v), &V_DECIMAL(&vDst), sizeof(DECIMAL)), "VarInt: expected 0x0,%d,identical, got 0x%X,%d\n", VT_DECIMAL, hres, V_VT(&vDst));

1 0

Paul Vriens : shell32/tests: Fix the last test failure on Win9x.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 7ea6c85e97ee231cd16f88c2d39d18fc89a9d4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea6c85e97ee231cd16f88c2d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 17:09:44 2009 +0100 shell32/tests: Fix the last test failure on Win9x. --- dlls/shell32/tests/shlfileop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 38caaf3..d3e81a8 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -561,7 +561,9 @@ static void test_delete(void) shfo.pFrom = "test1.txt\0"; shfo.wFunc = 0; ret = SHFileOperation(&shfo); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER || + broken(ret == ERROR_SUCCESS), /* Win9x, NT4 */ + "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* try an invalid list, only one null terminator */

1 0

Henri Verbeet : wined3d: Remove stray tabs.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 9d8c6326c0c18ff35d53239293a7787d4afd21b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8c6326c0c18ff35d5323929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:43 2009 +0100 wined3d: Remove stray tabs. --- dlls/wined3d/basetexture.c | 1 - dlls/wined3d/device.c | 7 +++---- dlls/wined3d/directx.c | 13 ++++++------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/palette.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 158650e..8622e94 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -249,7 +249,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface) glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } } - } else { /* this only happened if we've run out of openGL textures */ WARN("This texture doesn't have an openGL texture assigned to it\n"); hr = WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8187f5b..fb9dd6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1954,7 +1954,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW object->parent = Parent; object->wineD3DDevice = This; object->palNumEntries = IWineD3DPaletteImpl_Size(Flags); - object->hpal = CreatePalette((const LOGPALETTE*)&(object->palVersion)); if(!object->hpal) { @@ -2880,9 +2879,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I if (rho < 0.0001) rho = 0.0001f; object->exponent = -0.3/log(cos(rho/2)); } - if (object->exponent > 128.0) { - object->exponent = 128.0; - } + if (object->exponent > 128.0) { + object->exponent = 128.0; + } object->cutoff = pLight->Phi*90/M_PI; /* FIXME: Range */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7c0fa14..639b07e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -520,8 +520,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ENTER_GL(); gl_string = (const char *) glGetString(GL_RENDERER); - if (NULL == gl_string) - gl_string = "None"; + if (!gl_string) gl_string = "None"; strcpy(gl_info->gl_renderer, gl_string); gl_string = (const char *) glGetString(GL_VENDOR); @@ -3152,11 +3151,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->RasterCaps |= WINED3DPRASTERCAPS_FOGRANGE; } /* FIXME Add: - WINED3DPRASTERCAPS_COLORPERSPECTIVE - WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE - WINED3DPRASTERCAPS_ANTIALIASEDGES - WINED3DPRASTERCAPS_ZBUFFERLESSHSR - WINED3DPRASTERCAPS_WBUFFER */ + WINED3DPRASTERCAPS_COLORPERSPECTIVE + WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE + WINED3DPRASTERCAPS_ANTIALIASEDGES + WINED3DPRASTERCAPS_ZBUFFERLESSHSR + WINED3DPRASTERCAPS_WBUFFER */ pCaps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6224162..b78078f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -202,8 +202,8 @@ void primitiveDeclarationConvertToStridedData( element->Usage == WINED3DDECLUSAGE_POSITIONT)) { static BOOL warned = FALSE; if(!warned) { - /* This may be bad with the fixed function pipeline */ - FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); + /* This may be bad with the fixed function pipeline */ + FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); warned = TRUE; } } diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 8f6e37a..338e66e 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -1,4 +1,4 @@ -/* DirectDraw - IDirectPalette base interface +/* DirectDraw - IDirectPalette base interface * * Copyright 1997-2000 Marcus Meissner * Copyright 2000-2001 TransGaming Technologies Inc. diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2837740..1793696 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1830,7 +1830,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Dest = (WORD *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { WORD color = *Source++; - *Dest = color; + *Dest = color; if ((color < This->SrcBltCKey.dwColorSpaceLowValue) || (color > This->SrcBltCKey.dwColorSpaceHighValue)) { *Dest |= (1 << 15); diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 07a13b5..7e53cd3 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -341,7 +341,7 @@ const char* filename) for (y = 0; y < This->pow2Height; y++) { const unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); - for (x = 0; x < This->pow2Width; x++) { + for (x = 0; x < This->pow2Width; x++) { unsigned int color; unsigned int comp; int i;

1 0

Henri Verbeet : wined3d: Remove a silly check in drawStridedInstanced().
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 9d523ebd8f770531ad4eeb9e6f1ed0bc511322cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d523ebd8f770531ad4eeb9e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:42 2009 +0100 wined3d: Remove a silly check in drawStridedInstanced(). --- dlls/wined3d/drawprim.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 40d008a..6224162 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -687,7 +687,6 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3 } TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex); - idxData = idxData == (void *)-1 ? NULL : idxData; /* First, figure out how many instances we have to draw */ for(i = 0; i < MAX_STREAMS; i++) {

1 0

Henri Verbeet : wined3d: Rewrite BeginStateBlock() to use CreateStateBlock( ) instead of duplicating the code.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: ac914262ede4a2f87567e48d8522f709c538a3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac914262ede4a2f87567e48d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:43 2009 +0100 wined3d: Rewrite BeginStateBlock() to use CreateStateBlock() instead of duplicating the code. --- dlls/wined3d/device.c | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a43a9c1..8187f5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -349,7 +349,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, /* Special case - Used during initialization to produce a placeholder stateblock so other functions called can update a state block */ - if (Type == WINED3DSBT_INIT) { + if (Type == WINED3DSBT_INIT || Type == WINED3DSBT_RECORDED) + { /* Don't bother increasing the reference count otherwise a device will never be freed due to circular dependencies */ return WINED3D_OK; @@ -4704,42 +4705,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DStateBlockImpl *object; - HRESULT temp_result; - int i; + IWineD3DStateBlock *stateblock; + HRESULT hr; TRACE("(%p)\n", This); - - if (This->isRecordingState) { - return WINED3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DStateBlockImpl)); - if (NULL == object ) { - FIXME("(%p)Error allocating memory for stateblock\n", This); - return E_OUTOFMEMORY; - } - TRACE("(%p) created object %p\n", This, object); - object->wineD3DDevice= This; - /** FIXME: object->parent = parent; **/ - object->parent = NULL; - object->blockType = WINED3DSBT_RECORDED; - object->ref = 1; - object->lpVtbl = &IWineD3DStateBlock_Vtbl; - for(i = 0; i < LIGHTMAP_SIZE; i++) { - list_init(&object->lightMap[i]); - } + if (This->isRecordingState) return WINED3DERR_INVALIDCALL; - temp_result = allocate_shader_constants(object); - if (WINED3D_OK != temp_result) - return temp_result; + hr = IWineD3DDeviceImpl_CreateStateBlock(iface, WINED3DSBT_RECORDED, &stateblock, NULL); + if (FAILED(hr)) return hr; IWineD3DStateBlock_Release((IWineD3DStateBlock*)This->updateStateBlock); - This->updateStateBlock = object; + This->updateStateBlock = (IWineD3DStateBlockImpl *)stateblock; This->isRecordingState = TRUE; - TRACE("(%p) recording stateblock %p\n",This , object); + TRACE("(%p) recording stateblock %p\n", This, stateblock); + return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Failing HeapAlloc() should be an ERR.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: d9e58e6591120216a0b6bd917d50f2c3b10265ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e58e6591120216a0b6bd917… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:42 2009 +0100 wined3d: Failing HeapAlloc() should be an ERR. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 688b2f2..a43a9c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -55,7 +55,7 @@ const WINED3DLIGHT WINED3D_default_light = { static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); /* helper macros */ -#define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; WARN("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} +#define D3DMEMCHECK(object, ppResult) if(NULL == object) { *ppResult = NULL; ERR("Out of memory\n"); return WINED3DERR_OUTOFVIDEOMEMORY;} #define D3DCREATEOBJECTINSTANCE(object, type) { \ object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3D##type##Impl)); \

1 0

Henri Verbeet : wined3d: Simplify checking if an attribute is used in loadNumberedArrays().
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 92488ca7c11f366678fe79cc771fb17b2641cd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92488ca7c11f366678fe79cc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 9 10:23:42 2009 +0100 wined3d: Simplify checking if an attribute is used in loadNumberedArrays(). --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5c999b8..b054ee1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3900,7 +3900,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, stateblock->wineD3DDevice->instancedDraw = FALSE; for (i = 0; i < MAX_ATTRIBS; i++) { - if (!strided->u.input[i].VBO && !strided->u.input[i].lpData) + if (!(strided->use_map & (1 << i))) { if (context->numbered_array_mask & (1 << i)) unload_numbered_array(stateblock, context, i); continue;

1 0