wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Bruno Jesus : rsaenh/tests: Add more AES encrypt/decrypt tests.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 87f214c7ff9bab466a0ff1697acbbd0bf5fbad76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f214c7ff9bab466a0ff1697… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 1 01:05:41 2014 -0300 rsaenh/tests: Add more AES encrypt/decrypt tests. --- dlls/rsaenh/tests/rsaenh.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index f0b7b19..abc90e1 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1048,24 +1048,54 @@ static void test_aes(int keylen) HCRYPTKEY hKey; BOOL result; DWORD dwLen, dwMode; - unsigned char pbData[16], enc_data[16], bad_data[16]; + unsigned char pbData[48], enc_data[16], bad_data[16]; int i; - + static const BYTE aes_plain[32] = { + "AES Test With 2 Blocks Of Data." }; + static const BYTE aes_cbc_enc[3][48] = { + /* 128 bit key encrypted text */ + { 0xfe, 0x85, 0x3b, 0xe1, 0xf5, 0xe1, 0x58, 0x75, 0xd5, 0xa9, 0x74, 0xe3, 0x09, 0xea, 0xa5, 0x04, + 0x23, 0x35, 0xa2, 0x3b, 0x5c, 0xf1, 0x6c, 0x6f, 0xb9, 0xcd, 0x64, 0x06, 0x3e, 0x41, 0x83, 0xef, + 0x2a, 0xfe, 0xea, 0xb5, 0x6c, 0x17, 0x20, 0x79, 0x8c, 0x51, 0x3e, 0x56, 0xed, 0xe1, 0x47, 0x68 }, + /* 192 bit key encrypted text */ + { 0x6b, 0xf0, 0xfd, 0x32, 0xee, 0xc6, 0x06, 0x13, 0xa8, 0xe6, 0x3c, 0x81, 0x85, 0xb8, 0x2e, 0xa1, + 0xd4, 0x3b, 0xe8, 0x22, 0xa5, 0x74, 0x4a, 0xbe, 0x9d, 0xcf, 0xcc, 0x37, 0x26, 0x19, 0x5a, 0xd1, + 0x7f, 0x76, 0xbf, 0x94, 0x28, 0xce, 0x27, 0x21, 0x61, 0x87, 0xeb, 0xb9, 0x8b, 0xa8, 0xb4, 0x57 }, + /* 256 bit key encrypted text */ + { 0x20, 0x57, 0x17, 0x0b, 0x17, 0x76, 0xd8, 0x3b, 0x26, 0x90, 0x8b, 0x4c, 0xf2, 0x00, 0x79, 0x33, + 0x29, 0x2b, 0x13, 0x9c, 0xe2, 0x95, 0x09, 0xc1, 0xcd, 0x20, 0x87, 0x22, 0x32, 0x70, 0x9d, 0x75, + 0x9a, 0x94, 0xf5, 0x76, 0x5c, 0xb1, 0x62, 0x2c, 0xe1, 0x76, 0x7c, 0x86, 0x73, 0xe6, 0x7a, 0x23 } + }; switch (keylen) { case 256: result = derive_key(CALG_AES_256, &hKey, 0); + i = 2; break; case 192: result = derive_key(CALG_AES_192, &hKey, 0); + i = 1; break; default: case 128: result = derive_key(CALG_AES_128, &hKey, 0); + i = 0; break; } if (!result) return; + dwLen = sizeof(aes_plain); + memcpy(pbData, aes_plain, dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); + ok(result, "Expected OK, got last error %d\n", GetLastError()); + ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); +todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result && dwLen == 32 && !memcmp(aes_plain, pbData, dwLen), + "%08x, dwLen: %d\n", GetLastError(), dwLen); + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; /* Does AES provider support salt? */

1 0

Vincent Povirk : ole32: Simplify the FileMonikerImpl_BindToStorage code.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 69ff6f74b25866d55a8c13053836796243902c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ff6f74b25866d55a8c13053… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 30 13:40:02 2014 -0500 ole32: Simplify the FileMonikerImpl_BindToStorage code. --- dlls/ole32/filemoniker.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 06c4798..c7bbb66 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -605,22 +605,11 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef /* get the file name */ IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - /* verify if the file contains a storage object */ - res=StgIsStorageFile(filePath); + res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if(res==S_OK){ + if (SUCCEEDED(res)) + *ppvObject=pstg; - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - - if (SUCCEEDED(res)){ - - *ppvObject=pstg; - - IStorage_AddRef(pstg); - - return res; - } - } CoTaskMemFree(filePath); } else

1 0

Henri Verbeet : ddraw/tests: Get rid of struct nvertex.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 7447b37ff565d39755d626c9f31ef396114f1cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7447b37ff565d39755d626c9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:33 2014 +0200 ddraw/tests: Get rid of struct nvertex. --- dlls/ddraw/tests/visual.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7be1f34..e517d64 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -274,13 +274,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void lighting_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -314,19 +307,25 @@ static void lighting_test(IDirect3DDevice7 *device) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - struct nvertex unlitnquad[] = + struct { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - }; - struct nvertex litnquad[] = + struct vec3 position; + struct vec3 normal; + DWORD diffuse; + } + unlitnquad[] = + { + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + }, + litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Henri Verbeet : ddraw/tests: Get rid of struct tvertex.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: ecf20e2630050284e913d54fae773db58c1e92af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf20e2630050284e913d54fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:32 2014 +0200 ddraw/tests: Get rid of struct tvertex. --- dlls/ddraw/tests/visual.c | 62 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index f24c6cc..7be1f34 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -28,6 +28,11 @@ struct vec3 float x, y, z; }; +struct vec4 +{ + float x, y, z, w; +}; + static HWND window; static IDirectDraw7 *DirectDraw; static IDirectDrawSurface7 *Surface; @@ -269,12 +274,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct tvertex -{ - float x, y, z, w; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -2981,33 +2980,38 @@ out: */ static void depth_clamp_test(IDirect3DDevice7 *device) { - struct tvertex quad1[] = + struct { - { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - }; - struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - }; - struct tvertex quad3[] = + {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + }, + quad2[] = { - {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - }; - struct tvertex quad4[] = + {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + }, + quad3[] = + { + {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + }, + quad4[] = { - { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, }; struct {

1 0

Henri Verbeet : ddraw/tests: Get rid of struct vertex.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 3cf189af6412853179e34324ef888df1640567c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf189af6412853179e34324e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:31 2014 +0200 ddraw/tests: Get rid of struct vertex. --- dlls/ddraw/tests/visual.c | 107 +++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7aaf7cd..f24c6cc 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -23,6 +23,11 @@ #include "ddraw.h" #include "d3d.h" +struct vec3 +{ + float x, y, z; +}; + static HWND window; static IDirectDraw7 *DirectDraw; static IDirectDrawSurface7 *Surface; @@ -264,12 +269,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct vertex -{ - float x, y, z; - DWORD diffuse; -}; - struct tvertex { float x, y, z, w; @@ -297,19 +296,24 @@ static void lighting_test(IDirect3DDevice7 *device) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - struct vertex unlitquad[] = + struct { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, - }; - struct vertex litquad[] = + struct vec3 position; + DWORD diffuse; + } + unlitquad[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000}, + }, + litquad[] = + { + {{-1.0f, 0.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; struct nvertex unlitnquad[] = { @@ -930,19 +934,24 @@ static void alpha_test(IDirect3DDevice7 *device) DWORD color, red, green, blue; DDSURFACEDESC2 ddsd; - struct vertex quad1[] = + struct { - {-1.0f, -1.0f, 0.1f, 0x4000ff00}, - {-1.0f, 0.0f, 0.1f, 0x4000ff00}, - { 1.0f, -1.0f, 0.1f, 0x4000ff00}, - { 1.0f, 0.0f, 0.1f, 0x4000ff00}, - }; - struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{-1.0f, 0.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, 0.0f, 0.1f}, 0x4000ff00}, + }, + quad2[] = { - {-1.0f, 0.0f, 0.1f, 0xc00000ff}, - {-1.0f, 1.0f, 0.1f, 0xc00000ff}, - { 1.0f, 0.0f, 0.1f, 0xc00000ff}, - { 1.0f, 1.0f, 0.1f, 0xc00000ff}, + {{-1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0xc00000ff}, }; static float composite_quad[][5] = { { 0.0f, -1.0f, 0.1f, 0.0f, 1.0f}, @@ -2237,12 +2246,17 @@ static void D3D3_ViewportClearTest(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - struct vertex quad[] = + struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - {-1.0f, -1.0f, 0.1f, 0xffffffff}, - {-1.0f, 1.0f, 0.1f, 0xffffffff}, - { 1.0f, 1.0f, 0.1f, 0xffffffff}, - { 1.0f, -1.0f, 0.1f, 0xffffffff}, + {{-1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{-1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffffffff}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; @@ -2995,19 +3009,24 @@ static void depth_clamp_test(IDirect3DDevice7 *device) { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - struct vertex quad5[] = + struct { - { -0.5f, 0.5f, 10.0f, 0xff14f914}, - { 0.5f, 0.5f, 10.0f, 0xff14f914}, - { -0.5f, -0.5f, 10.0f, 0xff14f914}, - { 0.5f, -0.5f, 10.0f, 0xff14f914}, - }; - struct vertex quad6[] = + struct vec3 position; + DWORD diffuse; + } + quad5[] = + { + {{-0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{-0.5f, -0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, -0.5f, 10.0f}, 0xff14f914}, + }, + quad6[] = { - { -1.0f, 0.5f, 10.0f, 0xfff91414}, - { 1.0f, 0.5f, 10.0f, 0xfff91414}, - { -1.0f, 0.25f, 10.0f, 0xfff91414}, - { 1.0f, 0.25f, 10.0f, 0xfff91414}, + {{-1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{-1.0f, 0.25f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.25f, 10.0f}, 0xfff91414}, }; D3DVIEWPORT7 vp;

1 0

Henri Verbeet : wined3d: Print a winediag message if we failed to create a DXTn texture because of lack of driver support.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 91fbd2232d65200509c9c29a5c8275e451492f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbd2232d65200509c9c29a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:30 2014 +0200 wined3d: Print a winediag message if we failed to create a DXTn texture because of lack of driver support. --- dlls/wined3d/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4291fd0..e0e12bc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -25,6 +25,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, @@ -53,6 +54,13 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) { + static unsigned int once; + + if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 + || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) + && !(format->flags & WINED3DFMT_FLAG_TEXTURE) && !once++) + ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); + WARN("Failed to initialize resource, returning %#x\n", hr); return hr; }

1 0

Henri Verbeet : ddraw: Check for a lost surface in ddraw_surface7_Flip().
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 8ebc82cd8dbf306256318047d5b9c009f654eac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebc82cd8dbf306256318047d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:29 2014 +0200 ddraw: Check for a lost surface in ddraw_surface7_Flip(). --- dlls/ddraw/surface.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6452a9b..e0fdf81 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1227,6 +1227,9 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) return DDERR_NOTFLIPPABLE; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + return DDERR_SURFACELOST; + wined3d_mutex_lock(); tmp = dst_impl->wined3d_surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1a5d9de..7e0e925 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6610,7 +6610,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8bd9317..b96330c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7675,7 +7675,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 92e6e99..393cea3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7397,7 +7397,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2014