wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Alexandre Julliard : gdi32: Update the DC mappings when the layout is changed.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: f695c1d19d1d43d7778384841e549342626ca7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f695c1d19d1d43d7778384841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:07 2010 +0200 gdi32: Update the DC mappings when the layout is changed. --- dlls/gdi32/dc.c | 6 +++ dlls/gdi32/mapping.c | 3 +- dlls/gdi32/tests/mapping.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c55442f..7c86d34 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -289,6 +289,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) scaleX = (double)dc->vportExtX / (double)dc->wndExtX; scaleY = (double)dc->vportExtY / (double)dc->wndExtY; + if (dc->layout & LAYOUT_RTL) scaleX = -scaleX; xform->eM11 = scaleX; xform->eM12 = 0.0; xform->eM21 = 0.0; @@ -1948,6 +1949,11 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) { oldlayout = dc->layout; dc->layout = layout; + if (layout != oldlayout) + { + if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + DC_UpdateXforms( dc ); + } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 35bb1ea..8010b3d 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -185,7 +185,8 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) default: goto done; } - dc->MapMode = mode; + /* RTL layout is always MM_ANISOTROPIC */ + if (!(dc->layout & LAYOUT_RTL)) dc->MapMode = mode; DC_UpdateXforms( dc ); done: release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index f6d2edb..7193a0f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -217,6 +217,81 @@ static void test_world_transform(void) DeleteDC(hdc); } +static void test_dc_layout(void) +{ + INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; + SIZE size; + DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); + DWORD (WINAPI *pGetLayout)(HDC hdc); + HDC hdc; + + pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); + pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); + if (!pGetLayout || !pSetLayout) + { + win_skip( "Don't have SetLayout\n" ); + return; + } + + hdc = CreateCompatibleDC(0); + + size_cx = GetDeviceCaps(hdc, HORZSIZE); + size_cy = GetDeviceCaps(hdc, VERTSIZE); + res_x = GetDeviceCaps(hdc, HORZRES); + res_y = GetDeviceCaps(hdc, VERTRES); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + pSetLayout( hdc, LAYOUT_RTL ); + if (!pGetLayout( hdc )) + { + win_skip( "SetLayout not supported\n" ); + DeleteDC(hdc); + return; + } + + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -1000, 1000); + + SetMapMode(hdc, MM_LOMETRIC); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + + expect_viewport_ext(hdc, res_x, -res_y); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + pSetLayout( hdc, LAYOUT_LTR ); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + DeleteDC(hdc); +} + static void test_modify_world_transform(void) { HDC hdc = GetDC(0); @@ -562,6 +637,7 @@ START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); + test_dc_layout(); test_isotropic_mapping(); test_setvirtualresolution(); test_gettransform();

1 0

Alexandre Julliard : gdi32/tests: Fix a typo in a macro name.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 480117fdafd6514568f8f75ec84997580d5d4f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480117fdafd6514568f8f75ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 21:04:56 2010 +0200 gdi32/tests: Fix a typo in a macro name. --- dlls/gdi32/tests/mapping.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 655ab2c..f6d2edb 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -39,7 +39,7 @@ ok(rough_match(_pt.y, _y), "expected y %d, got %d\n", (_y), _pt.y); \ } -#define expect_world_trasform(_hdc, _em11, _em22) \ +#define expect_world_transform(_hdc, _em11, _em22) \ { \ BOOL _ret; \ XFORM _xform; \ @@ -105,7 +105,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); SetLastError(0xdeadbeef); @@ -128,7 +128,7 @@ static void test_world_transform(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); SetLastError(0xdeadbeef); @@ -137,7 +137,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); ret = SetGraphicsMode(hdc, GM_ADVANCED); @@ -150,7 +150,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ @@ -177,7 +177,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); SetLastError(0xdeadbeef); @@ -192,7 +192,7 @@ static void test_world_transform(void) ok( rough_match( size.cy, size_cy * 10 ) || rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy)); SetLastError(0xdeadbeef); @@ -201,7 +201,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); ret = SetGraphicsMode(hdc, GM_COMPATIBLE); @@ -211,7 +211,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); DeleteDC(hdc);

1 0

Alexandre Julliard : user32: DCX_NORESETATTRS should be applied at DC release time.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: f1ea06375d76c9f8e181e3ee4874ddef661e80c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea06375d76c9f8e181e3ee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 20:00:35 2010 +0200 user32: DCX_NORESETATTRS should be applied at DC release time. --- dlls/user32/painting.c | 21 ++++++++++++++------- dlls/user32/tests/dce.c | 9 +++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index efb0884..5e57e7f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -168,6 +168,16 @@ static void update_visible_region( struct dce *dce ) /*********************************************************************** + * reset_dce_attrs + */ +static void reset_dce_attrs( struct dce *dce ) +{ + RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ + SaveDC( dce->hdc ); /* save the state again for next time */ +} + + +/*********************************************************************** * release_dce */ static void release_dce( struct dce *dce ) @@ -329,6 +339,7 @@ void free_dce( struct dce *dce, HWND hwnd ) if (!--dce->count) { /* turn it into a cache entry */ + reset_dce_attrs( dce ); release_dce( dce ); dce->flags |= DCX_CACHE; } @@ -455,6 +466,7 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) dce = (struct dce *)GetDCHook( hdc, NULL ); if (dce && dce->count) { + if (!(dce->flags & DCX_NORESETATTRS)) reset_dce_attrs( dce ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); if (dce->flags & DCX_CACHE) dce->count = 0; ret = TRUE; @@ -898,6 +910,7 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) { static const DWORD clip_flags = DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW; + static const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; HWND parent; @@ -1021,18 +1034,12 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) } dce->hwnd = hwnd; - dce->flags = (dce->flags & ~clip_flags) | (flags & clip_flags); + dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce ); - if (!(flags & DCX_NORESETATTRS)) - { - RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ - SaveDC( dce->hdc ); /* save the state again for next time */ - } - TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); return dce->hdc; } diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index cfa07e5..c366ebc 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -66,10 +66,7 @@ static void test_dc_attributes(void) hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); if (!hdc) break; rop = GetROP2( hdc ); - if (hdc == old_hdc) - todo_wine ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); - else - ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); if (hdc == old_hdc) { found_dc = 1; @@ -104,8 +101,8 @@ static void test_dc_attributes(void) rop = GetROP2( hdc ); if (hdc == old_hdc) { - todo_wine ok( rop == R2_WHITE || broken( rop == def_rop), - "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == R2_WHITE || broken( rop == def_rop), + "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); SetROP2( old_hdc, def_rop ); } else

1 0

Frédéric Delanoy : Update French homepage translation
by Jeremy Newman 23 Jul '10

23 Jul '10

Module: website Branch: master Commit: 9a7318f299f6c600a8e88274d9e4fb9503854df6 URL: http://source.winehq.org/git/website.git/?a=commit;h=9a7318f299f6c600a8e882… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 23 11:19:05 2010 +0200 Update French homepage translation >From 1185affa1222e87e551db3421a69e2762449487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Fri, 23 Jul 2010 11:17:13 +0200 Subject: Update French homepage translation --- templates/fr/home.template | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 1688032..2765775 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -12,8 +12,8 @@ <div class="info" onClick="document.location='{$root}/about/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/about/">Informations</a></div> - <div class="subtitle">Aperçu des fonctionnalités de Wine.</div> + <div class="title"><a href="{$root}/about/">À propos</a></div> + <div class="subtitle">Apprenez-en plus sur le projet Wine.</div> </div> </div> @@ -21,15 +21,15 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/download/">Téléchargement</a></div> - <div class="subtitle">Recevez Wine maintenant !</div> + <div class="subtitle">Installez la dernière version de Wine.</div> </div> </div> <div class="help" onClick="document.location='{$root}/help/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/help/">Aide</a></div> - <div class="subtitle">Documentation, support et Wiki.</div> + <div class="title"><a href="{$root}/help/">Support</a></div> + <div class="subtitle">Obtenez de l'aide sur Wine.</div> </div> </div> @@ -37,7 +37,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Développement</a></div> - <div class="subtitle">Sources de Wine, suivi des anomalies, etc.</div> + <div class="subtitle">Devenez un développeur Wine.</div> </div> </div> @@ -50,7 +50,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="javascript:document.donateForm.submit();">Dons</a></div> - <div class="subtitle">Faire un don à Wine.</div> + <div class="subtitle">Faites un don au projet Wine.</div> </div> </div>

1 0

Piotr Caban : msvcp90: Added allocator<char> implementation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: e79af2f0d9c9e8db1551e1155ab74a9b774e10e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79af2f0d9c9e8db1551e1155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 09:40:19 2010 +0200 msvcp90: Added allocator<char> implementation. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/memory.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 21 ++++++++ dlls/msvcp90/msvcp90.spec | 22 ++++---- dlls/msvcp90/msvcp90_main.c | 19 ++++++++ 5 files changed, 159 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79af2f0d9c9e8db1551e…

1 0

Alexandre Julliard : include: Make sure wine/port. h and msvcrt headers are not used together.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 8f1ea6eeb1bbe95733d57e05f1b3da8c1a715408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1ea6eeb1bbe95733d57e05f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 17:40:55 2010 +0200 include: Make sure wine/port.h and msvcrt headers are not used together. --- include/msvcrt/crtdefs.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 1f51937..0e43dd5 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -22,6 +22,10 @@ #define __WINE_USE_MSVCRT #endif +#ifdef __WINE_WINE_PORT_H +# error You cannot use both wine/port.h and msvcrt headers +#endif + #if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif

1 0

Alexandre Julliard : msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c27aa289b7e51ee98f6a3cfca485e784c5ef9071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27aa289b7e51ee98f6a3cfca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 16:55:35 2010 +0200 msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit. --- dlls/crtdll/crtdll.spec | 6 ++++-- dlls/msvcr100/msvcr100.spec | 18 ++++++++++++------ dlls/msvcr70/msvcr70.spec | 12 ++++++++---- dlls/msvcr71/msvcr71.spec | 12 ++++++++---- dlls/msvcr80/msvcr80.spec | 18 ++++++++++++------ dlls/msvcr90/msvcr90.spec | 18 ++++++++++++------ dlls/msvcrt/msvcrt.spec | 18 ++++++++++++------ dlls/msvcrt/tests/cpp.c | 14 +++++++++++--- dlls/msvcrt20/msvcrt20.spec | 6 ++++-- dlls/msvcrt40/msvcrt40.spec | 6 ++++-- dlls/msvcrtd/msvcrtd.spec | 9 ++++++--- dlls/msvcrtd/tests/debug.c | 8 ++++++-- 12 files changed, 99 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c27aa289b7e51ee98f6a3…

1 0

Owen Rudge : d3dx9/tests: Add beginning of general tests for texture functions.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 79690ab1ea6fa73d86bf44753ecacced042f4af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79690ab1ea6fa73d86bf44753… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 21 15:06:09 2010 +0100 d3dx9/tests: Add beginning of general tests for texture functions. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/texture.c | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 02f48c1..4a7aa28 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ - surface.c + surface.c \ + texture.c RC_SRCS = rsrc.rc diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c new file mode 100644 index 0000000..de7ccf4 --- /dev/null +++ b/dlls/d3dx9_36/tests/texture.c @@ -0,0 +1,81 @@ +/* + * Tests for the D3DX9 texture functions + * + * Copyright 2009 Tony Wasserka + * Copyright 2010 Owen Rudge for CodeWeavers + * + * 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 COBJMACROS +#include "wine/test.h" +#include "d3dx9tex.h" + +static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) +{ + HRESULT hr; + + todo_wine { + + /* general tests */ + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + } /* todo_wine */ +} + +START_TEST(texture) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + test_D3DXCheckTextureRequirements(device); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +}

1 0

Paul Vriens : shlwapi/tests: Load shell32 explicitly.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: eaa6376e64f1de887153b9d23ac3bdd922763cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa6376e64f1de887153b9d23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 22 15:13:06 2010 +0200 shlwapi/tests: Load shell32 explicitly. --- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index a810f84..e3f9b94 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 +IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 88165ef..d60effd 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -64,6 +64,9 @@ static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); +static HMODULE hshell32; +static HRESULT (WINAPI *pSHGetDesktopFolder)(IShellFolder**); + static const CHAR ie_international[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -2514,7 +2517,7 @@ static void test_SHIShellFolder_EnumObjects(void) ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ - hres = SHGetDesktopFolder(&folder); + hres = pSHGetDesktopFolder(&folder); ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); enm = NULL; @@ -2696,6 +2699,9 @@ START_TEST(ordinal) hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); + hshell32 = LoadLibraryA("shell32.dll"); + pSHGetDesktopFolder = (void *)GetProcAddress(hshell32, "SHGetDesktopFolder"); + test_GetAcceptLanguagesA(); test_SHSearchMapInt(); test_alloc_shared(); @@ -2714,4 +2720,7 @@ START_TEST(ordinal) test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); test_SHSetIniString(); + + FreeLibrary(hshell32); + FreeLibrary(hmlang); }

1 0

David Hedberg : shell32: Change a fixme to a trace in shfldr_unixfs.c.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: a6db972c774178e8cccac6ada6dedbea6a0cab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6db972c774178e8cccac6ada… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 21 21:49:13 2010 +0200 shell32: Change a fixme to a trace in shfldr_unixfs.c. This downgrades a FIXME that can be triggered in normal operation through the use of, for example, SHGetIDListFromObject. --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 745f308..9ae030f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -847,7 +847,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_QueryInterface(IShellFolder2 *ifa cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); } else { *ppv = NULL; - FIXME("Unimplemented interface %s\n", shdebugstr_guid(riid)); + TRACE("Unimplemented interface %s\n", shdebugstr_guid(riid)); return E_NOINTERFACE; }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
90
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 July 2010