wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Dmitry Timoshkov : user32/tests: Fix resource tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: f26bace5afbff9a8773b1837ee9acfe55c926768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26bace5afbff9a8773b1837e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:06 2013 +0900 user32/tests: Fix resource tests compilation with __WINESRC__ defined. --- dlls/user32/tests/resource.c | 60 +++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 6b89ef7..2313595 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -23,7 +23,7 @@ #include "wine/test.h" -static UINT (WINAPI *pPrivateExtractIconsA)(LPCTSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL; +static UINT (WINAPI *pPrivateExtractIconsA)(LPCSTR, int, int, int, HICON *, UINT *, UINT, UINT) = NULL; static void init_function_pointers(void) { @@ -33,7 +33,7 @@ static void init_function_pointers(void) static void test_LoadStringW(void) { - HINSTANCE hInst = GetModuleHandle(NULL); + HINSTANCE hInst = GetModuleHandleA(NULL); WCHAR copiedstringw[128], returnedstringw[128], *resourcepointer = NULL; char copiedstring[128], returnedstring[128]; int length1, length2, retvalue; @@ -79,7 +79,7 @@ static void test_LoadStringW(void) static void test_LoadStringA (void) { - HINSTANCE hInst = GetModuleHandle (NULL); + HINSTANCE hInst = GetModuleHandleA(NULL); static const char str[] = "String resource"; /* same in resource.rc */ char buf[128]; struct string_test { @@ -148,7 +148,7 @@ static void test_accel1(void) ac[n].key = 0; ac[n++].fVirt = 0; - hAccel = CreateAcceleratorTable( &ac[0], n ); + hAccel = CreateAcceleratorTableA( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n"); r = DestroyAcceleratorTable( hAccel ); @@ -176,13 +176,13 @@ static void test_accel1(void) ac[n].key = 0xffff; ac[n++].fVirt = 0x0001; - hAccel = CreateAcceleratorTable( &ac[0], n ); + hAccel = CreateAcceleratorTableA( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n"); - r = CopyAcceleratorTable( hAccel, NULL, 0 ); + r = CopyAcceleratorTableA( hAccel, NULL, 0 ); ok( r == n, "two entries in table %u/%u\n", r, n); - r = CopyAcceleratorTable( hAccel, &ac[0], n ); + r = CopyAcceleratorTableA( hAccel, &ac[0], n ); ok( r == n, "still should be two entries in table %u/%u\n", r, n); n=0; @@ -213,7 +213,7 @@ done: r = DestroyAcceleratorTable( hAccel ); ok( r, "destroy accelerator table\n"); - hAccel = CreateAcceleratorTable( &ac[0], 0 ); + hAccel = CreateAcceleratorTableA( &ac[0], 0 ); ok( !hAccel || broken(hAccel != NULL), /* nt4 */ "zero elements should fail\n"); /* these will on crash win2k @@ -246,36 +246,36 @@ static void test_accel2(void) */ /* try a zero count */ - hac = CreateAcceleratorTable( &ac[0], 0 ); + hac = CreateAcceleratorTableA( &ac[0], 0 ); ok( !hac || broken(hac != NULL), /* nt4 */ "fail\n"); if (!hac) ok( !DestroyAcceleratorTable( hac ), "destroy failed\n"); /* creating one accelerator should work */ - hac = CreateAcceleratorTable( &ac[0], 1 ); + hac = CreateAcceleratorTableA( &ac[0], 1 ); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* how about two of the same type? */ - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - res = CopyAcceleratorTable( hac, NULL, 100 ); + res = CopyAcceleratorTableA( hac, NULL, 100 ); ok( res == 2, "copy null failed %d\n", res); - res = CopyAcceleratorTable( hac, NULL, 0 ); + res = CopyAcceleratorTableA( hac, NULL, 0 ); ok( res == 2, "copy null failed %d\n", res); - res = CopyAcceleratorTable( hac, NULL, 1 ); + res = CopyAcceleratorTableA( hac, NULL, 1 ); ok( res == 2, "copy null failed %d\n", res); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy 1 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ /* how about two of the same type with a non-zero key? */ ac[0].key = 0x20; ac[1].key = 0x20; - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ @@ -284,17 +284,17 @@ static void test_accel2(void) ac[0].key = 0x40; ac[1].fVirt = FVIRTKEY; ac[1].key = 0x40; - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 2 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); /* ok( !memcmp( ac, out, sizeof ac ), "tables different\n"); */ ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); /* how virtual key codes */ ac[0].fVirt = FVIRTKEY; - hac = CreateAcceleratorTable( &ac[0], 1); + hac = CreateAcceleratorTableA( &ac[0], 1); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 2 ), "copy 2 failed\n"); /* ok( !memcmp( ac, out, sizeof ac/2 ), "tables different\n"); */ ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -302,9 +302,9 @@ static void test_accel2(void) ac[0].cmd = 0xffff; ac[0].fVirt = 0xff; ac[0].key = 0xffff; - hac = CreateAcceleratorTable( &ac[0], 1); + hac = CreateAcceleratorTableA( &ac[0], 1); ok( hac != NULL , "fail\n"); - ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); + ok( 1 == CopyAcceleratorTableA( hac, out, 1 ), "copy 1 failed\n"); /* ok( memcmp( ac, out, sizeof ac/2 ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); @@ -313,9 +313,9 @@ static void test_accel2(void) /* how turning on all bits? */ memset( ac, 0xff, sizeof ac ); - hac = CreateAcceleratorTable( &ac[0], 2); + hac = CreateAcceleratorTableA( &ac[0], 2); ok( hac != NULL , "fail\n"); - res = CopyAcceleratorTable( hac, out, 2 ); + res = CopyAcceleratorTableA( hac, out, 2 ); ok( res == 2, "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); @@ -365,14 +365,14 @@ static void test_LoadImage(void) HBITMAP bmp; HRSRC hres; - bmp = LoadBitmapA(GetModuleHandle(NULL), MAKEINTRESOURCE(100)); + bmp = LoadBitmapA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(100)); ok(bmp != NULL, "Could not load a bitmap resource\n"); if (bmp) DeleteObject(bmp); - hres = FindResource(GetModuleHandle(NULL), "#100", RT_BITMAP); + hres = FindResourceA(GetModuleHandleA(NULL), "#100", (LPCSTR)RT_BITMAP); ok(hres != NULL, "Could not find a bitmap resource with a numeric string\n"); - bmp = LoadBitmapA(GetModuleHandle(NULL), "#100"); + bmp = LoadBitmapA(GetModuleHandleA(NULL), "#100"); ok(bmp != NULL, "Could not load a bitmap resource with a numeric string\n"); if (bmp) DeleteObject(bmp); }

1 0

Dmitry Timoshkov : user32/tests: Fix message tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: a7219e8c883dba6307e9db8fe587f3c1efa88cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7219e8c883dba6307e9db8fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:02 2013 +0900 user32/tests: Fix message tests compilation with __WINESRC__ defined. --- dlls/user32/tests/msg.c | 606 +++++++++++++++++++++++----------------------- 1 files changed, 303 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7219e8c883dba6307e9d…

1 0

Dmitry Timoshkov : user32/tests: Fix monitor tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 33ff6d2549031b44c4b41debb7c97ac676cf3676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ff6d2549031b44c4b41debb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:58 2013 +0900 user32/tests: Fix monitor tests compilation with __WINESRC__ defined. --- dlls/user32/tests/monitor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b509860..f442338 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -161,7 +161,7 @@ static void test_ChangeDisplaySettingsEx(void) } SetLastError(0xdeadbeef); - res = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettings error %u\n", GetLastError()); width = dm.dmPelsWidth; @@ -356,12 +356,12 @@ static void test_work_area(void) mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); SetLastError(0xdeadbeef); - ret = SystemParametersInfo(SPI_GETWORKAREA, 0, &rc_work, 0); + ret = SystemParametersInfoA(SPI_GETWORKAREA, 0, &rc_work, 0); ok(ret, "SystemParametersInfo error %u\n", GetLastError()); trace("work area (%d,%d-%d,%d)\n", rc_work.left, rc_work.top, rc_work.right, rc_work.bottom); ok(EqualRect(&rc_work, &mi.rcWork), "work area is different\n"); - hwnd = CreateWindowEx(0, "static", NULL, WS_OVERLAPPEDWINDOW|WS_VISIBLE,100,100,10,10,0,0,0,NULL); + hwnd = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW|WS_VISIBLE,100,100,10,10,0,0,0,NULL); ok(hwnd != 0, "CreateWindowEx failed\n"); ret = GetWindowRect(hwnd, &rc_normal); @@ -383,7 +383,7 @@ static void test_work_area(void) else ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); - SetWindowLong(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); + SetWindowLongA(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); wp.length = sizeof(wp); ret = GetWindowPlacement(hwnd, &wp);

1 0

Dmitry Timoshkov : user32/tests: Fix menu tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: d2ab1731c81f4c72002a491cfc996a1a6ce3321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ab1731c81f4c72002a491cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:53 2013 +0900 user32/tests: Fix menu tests compilation with __WINESRC__ defined. --- dlls/user32/tests/menu.c | 402 +++++++++++++++++++++++----------------------- 1 files changed, 201 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2ab1731c81f4c72002a4…

1 0

Stefan Dösinger : ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: a562af5acef646bd7b775f2b2ffce4bfe6d23e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a562af5acef646bd7b775f2b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:39 2013 +0200 ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE. --- dlls/ddraw/tests/ddraw4.c | 22 ++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b0a70db..457eea0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3813,10 +3813,16 @@ static void test_texturemanage(void) { {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, @@ -3824,10 +3830,16 @@ static void test_texturemanage(void) {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, 0, DD_OK, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, @@ -4589,10 +4601,20 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE, + "managed texture" + }, + { + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, "opaque managed texture" }, { + DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE, + "opaque managed texture" + }, + { DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, 0, "render target" diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 14a069e..6cf6b7f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3626,10 +3626,16 @@ static void test_texturemanage(void) { {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE}, {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, @@ -3637,10 +3643,16 @@ static void test_texturemanage(void) {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, {DDSCAPS_VIDEOMEMORY, 0, DD_OK, DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, @@ -4414,10 +4426,20 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE, + "managed texture" + }, + { + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE, "opaque managed texture" }, { + DDSCAPS_TEXTURE, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE, + "opaque managed texture" + }, + { DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, 0, "render target" @@ -4449,9 +4471,19 @@ static void test_surface_lock(void) }, { DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES, + "managed cube" + }, + { + DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE, "opaque managed cube" }, + { + DDSCAPS_TEXTURE | DDSCAPS_COMPLEX, + DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE, + "opaque managed cube" + }, }; if (!(ddraw = create_ddraw()))

1 0

Stefan Dösinger : ddraw: Treat D3DTEXTUREMANAGE like TEXTUREMANAGE.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: db68ffcba180b6ca0591e3d4d1c0eec87cd2eacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68ffcba180b6ca0591e3d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:38 2013 +0200 ddraw: Treat D3DTEXTUREMANAGE like TEXTUREMANAGE. Sim City 4 uses this flag. The main problem I noticed was with WINED3D_MAP_DISCARD handling introduced for surfaces in patches that aren't yet in the tree, but the difference already matters for older cards because of video memory accounting. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/surface.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bdb375b..e01f923 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2962,7 +2962,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + if (DDSD->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) { @@ -3001,7 +3001,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } if (!(desc2.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) - && !(desc2.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) + && !(desc2.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) { enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); enum wined3d_resource_type rtype; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 416c13f..e11b633 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,7 +5608,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else layers = 1; - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_MANAGED; @@ -5730,7 +5730,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (!(desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) && !((desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - && (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE))) + && (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))) { /* Tests show surfaces without memory flags get these flags added * right after creation. */ @@ -5760,7 +5760,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, { pool = WINED3D_POOL_SYSTEM_MEM; } - else if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + else if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { pool = WINED3D_POOL_MANAGED; /* Managed textures have the system memory flag set. */

1 0

Stefan Dösinger : ddraw/tests: Add surface lockability tests.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 9c456ef88ce71d174402b2f1840ff64c856d21ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c456ef88ce71d174402b2f18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 23 12:05:37 2013 +0200 ddraw/tests: Add surface lockability tests. --- dlls/ddraw/tests/ddraw1.c | 116 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 115 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 567 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c456ef88ce71d174402b…

1 0

Alexandre Julliard : user32: Don' t trigger a graphics driver load for functions that require an existing window .
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 11597d6b3cb9a0e2c27a275c58877cf8c30854f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11597d6b3cb9a0e2c27a275c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 23 16:13:17 2013 +0200 user32: Don't trigger a graphics driver load for functions that require an existing window. --- dlls/user32/driver.c | 127 +++++++------------------------------------------- 1 files changed, 17 insertions(+), 110 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 4cfc552..18778cd 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -553,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) -{ - load_driver()->pDestroyCursorIcon( cursor ); -} - static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) { load_driver()->pSetCursor( cursor ); @@ -649,116 +644,28 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } -static void CDECL loaderdrv_DestroyWindow( HWND hwnd ) -{ - load_driver()->pDestroyWindow( hwnd ); -} - static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { load_driver()->pGetDC( hdc, hwnd, top_win, win_rect, top_rect, flags ); } -static DWORD CDECL loaderdrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD mask, DWORD flags ) -{ - return load_driver()->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); -} - -static void CDECL loaderdrv_ReleaseDC( HWND hwnd, HDC hdc ) -{ - load_driver()->pReleaseDC( hwnd, hdc ); -} - -static BOOL CDECL loaderdrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) -{ - return load_driver()->pScrollDC( hdc, dx, dy, update ); -} - -static void CDECL loaderdrv_SetCapture( HWND hwnd, UINT flags ) -{ - load_driver()->pSetCapture( hwnd, flags ); -} - -static void CDECL loaderdrv_SetFocus( HWND hwnd ) -{ - load_driver()->pSetFocus( hwnd ); -} - static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static void CDECL loaderdrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) -{ - load_driver()->pSetParent( hwnd, parent, old_parent ); -} - static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } -static void CDECL loaderdrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) -{ - load_driver()->pSetWindowIcon( hwnd, type, icon ); -} - -static void CDECL loaderdrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) -{ - load_driver()->pSetWindowStyle( hwnd, offset, style ); -} - -static void CDECL loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) -{ - load_driver()->pSetWindowText( hwnd, text ); -} - -static UINT CDECL loaderdrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) -{ - return load_driver()->pShowWindow( hwnd, cmd, rect, swp ); -} - -static LRESULT CDECL loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pSysCommand( hwnd, wparam, lparam ); -} - static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, const RECT *window_rect ) { return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); } -static LRESULT CDECL loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); -} - -static void CDECL loaderdrv_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - RECT *visible_rect, struct window_surface **surface ) -{ - load_driver()->pWindowPosChanging( hwnd, insert_after, swp_flags, - window_rect, client_rect, visible_rect, surface ); -} - -static void CDECL loaderdrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, - const RECT *window_rect, const RECT *client_rect, - const RECT *visible_rect, const RECT *valid_rects, - struct window_surface *surface ) -{ - load_driver()->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, - client_rect, visible_rect, valid_rects, surface ); -} - -static BOOL CDECL loaderdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) -{ - return FALSE; /* don't trigger a driver load */ -} - static USER_DRIVER lazy_load_driver = { /* keyboard functions */ @@ -776,7 +683,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_DestroyCursorIcon, + nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, loaderdrv_SetCursorPos, @@ -798,25 +705,25 @@ static USER_DRIVER lazy_load_driver = /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, - loaderdrv_DestroyWindow, + nulldrv_DestroyWindow, loaderdrv_GetDC, - loaderdrv_MsgWaitForMultipleObjectsEx, - loaderdrv_ReleaseDC, - loaderdrv_ScrollDC, - loaderdrv_SetCapture, - loaderdrv_SetFocus, + nulldrv_MsgWaitForMultipleObjectsEx, + nulldrv_ReleaseDC, + nulldrv_ScrollDC, + nulldrv_SetCapture, + nulldrv_SetFocus, loaderdrv_SetLayeredWindowAttributes, - loaderdrv_SetParent, + nulldrv_SetParent, loaderdrv_SetWindowRgn, - loaderdrv_SetWindowIcon, - loaderdrv_SetWindowStyle, - loaderdrv_SetWindowText, - loaderdrv_ShowWindow, - loaderdrv_SysCommand, + nulldrv_SetWindowIcon, + nulldrv_SetWindowStyle, + nulldrv_SetWindowText, + nulldrv_ShowWindow, + nulldrv_SysCommand, loaderdrv_UpdateLayeredWindow, - loaderdrv_WindowMessage, - loaderdrv_WindowPosChanging, - loaderdrv_WindowPosChanged, + nulldrv_WindowMessage, + nulldrv_WindowPosChanging, + nulldrv_WindowPosChanged, /* system parameters */ - loaderdrv_SystemParametersInfo + nulldrv_SystemParametersInfo };

1 0

Piotr Caban : msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: ed8ab4415306631a144342dcc2b883c7887f05bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8ab4415306631a144342dcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 23 15:54:02 2013 +0200 msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*. --- dlls/msvcr110/msvcr110.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b82a58e..a704d1a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1385,17 +1385,17 @@ @ cdecl _kbhit() msvcrt._kbhit @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s -@ stub -arch=i386 _libm_sse2_acos_precise -@ stub -arch=i386 _libm_sse2_asin_precise -@ stub -arch=i386 _libm_sse2_atan_precise -@ stub -arch=i386 _libm_sse2_cos_precise -@ stub -arch=i386 _libm_sse2_exp_precise -@ stub -arch=i386 _libm_sse2_log10_precise -@ stub -arch=i386 _libm_sse2_log_precise -@ stub -arch=i386 _libm_sse2_pow_precise -@ stub -arch=i386 _libm_sse2_sin_precise +@ cdecl -arch=i386 _libm_sse2_acos_precise() msvcrt.__libm_sse2_acos +@ cdecl -arch=i386 _libm_sse2_asin_precise() msvcrt.__libm_sse2_asin +@ cdecl -arch=i386 _libm_sse2_atan_precise() msvcrt.__libm_sse2_atan +@ cdecl -arch=i386 _libm_sse2_cos_precise() msvcrt.__libm_sse2_cos +@ cdecl -arch=i386 _libm_sse2_exp_precise() msvcrt.__libm_sse2_exp +@ cdecl -arch=i386 _libm_sse2_log10_precise() msvcrt.__libm_sse2_log10 +@ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log +@ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow +@ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin @ stub -arch=i386 _libm_sse2_sqrt_precise -@ stub -arch=i386 _libm_sse2_tan_precise +@ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) msvcrt._local_unwind2

1 0

Piotr Caban : msvcrt/tests: Fix __unDName test failures on Win2000.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: d2c8dcb7e0e0dc13509f6ff459bdc0965594b31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c8dcb7e0e0dc13509f6ff45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 23 12:53:19 2013 +0200 msvcrt/tests: Fix __unDName test failures on Win2000. --- dlls/msvcrt/tests/cpp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c8ff25d..c331db1 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1320,7 +1320,9 @@ static void test_demangle(void) "?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise@bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, -/* 128 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", NULL, 2}, +/* 128 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", + "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", + "??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
76
Older →

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 October 2013