October 2013 - Wine-Commits

Dmitry Timoshkov : user32/tests: Fix window tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 4c5a32e7917d1a4ff86b3ee3ab0d9ff37f0bb180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5a32e7917d1a4ff86b3ee3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:25 2013 +0900 user32/tests: Fix window tests compilation with __WINESRC__ defined. --- dlls/user32/tests/win.c | 570 +++++++++++++++++++++++----------------------- 1 files changed, 285 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c5a32e7917d1a4ff86b3…

1 0

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

Oct. 24, 2013

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

Dmitry Timoshkov : user32/tests: Fix wsprintf tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 154df653d669710f2431d1b4d0b25a15ff3efc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154df653d669710f2431d1b4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:32 2013 +0900 user32/tests: Fix wsprintf tests compilation with __WINESRC__ defined. --- dlls/user32/tests/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 5370df4..b7e755b 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -118,7 +118,7 @@ static void CharUpperTest(void) failed = 0; for (i=0;i<256;i++) { - out = (INT_PTR)CharUpper((LPTSTR)i); + out = (INT_PTR)CharUpperA((LPSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) { @@ -136,7 +136,7 @@ static void CharLowerTest(void) failed = 0; for (i=0;i<256;i++) { - out = (INT_PTR)CharLower((LPTSTR)i); + out = (INT_PTR)CharLowerA((LPSTR)i); /* printf("%0x ",out); */ if ((out >> 16) != 0) {

1 0

Dmitry Timoshkov : user32/tests: Enable user32 tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: ae3a6d52d0c1b00169e7cdbcf362473de2b36688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3a6d52d0c1b00169e7cdbcf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:54:36 2013 +0900 user32/tests: Enable user32 tests compilation with __WINESRC__ defined. --- dlls/user32/tests/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 88c4447..eb5789a 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = user32.dll IMPORTS = user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ broadcast.c \

1 0

Dmitry Timoshkov : user32/tests: Fix listbox tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

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

1 0

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

Oct. 23, 2013

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

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

Oct. 23, 2013

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 Oct. 23, 2013

Oct. 23, 2013

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(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)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(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", NULL, 2}, +/* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", + "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", + "??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name;

1 0

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

Oct. 23, 2013

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 Oct. 23, 2013

Oct. 23, 2013

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