wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Sam Edwards : winex11: Cache XRandR 1.2 display mode.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 3a5eef4eed44cb342d3d35d73fe19d2e0109f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5eef4eed44cb342d3d35d73… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 10:03:42 2013 -0600 winex11: Cache XRandR 1.2 display mode. --- dlls/winex11.drv/xrandr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 36b9fe9..fc09020 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -278,6 +278,9 @@ static int xrandr12_get_current_mode(void) XRRCrtcInfo *crtc_info; int i, ret = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); @@ -310,9 +313,10 @@ static int xrandr12_get_current_mode(void) if (ret == -1) { ERR("Unknown mode, returning default.\n"); - ret = 0; + return 0; } + xrandr_current_mode = ret; return ret; } @@ -354,6 +358,7 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_FAILED; } + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Sam Edwards : winex11: Cache XRandR 1.0 display mode.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 3fc2bccac25c93f820afab53bddd5b228c169b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc2bccac25c93f820afab53b… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 09:51:21 2013 -0600 winex11: Cache XRandR 1.0 display mode. --- dlls/winex11.drv/xrandr.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5ec8842..36b9fe9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; static struct x11drv_mode_info *dd_modes; static SizeID *xrandr10_modes; static unsigned int xrandr_mode_count; +static int xrandr_current_mode = -1; static int load_xrandr(void) { @@ -125,6 +126,9 @@ static int xrandr10_get_current_mode(void) unsigned int i; int res = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + sc = pXRRGetScreenInfo (gdi_display, DefaultRootWindow( gdi_display )); size = pXRRConfigCurrentConfiguration (sc, &rot); rate = pXRRConfigCurrentRate (sc); @@ -141,8 +145,10 @@ static int xrandr10_get_current_mode(void) if (res == -1) { ERR("In unknown mode, returning default\n"); - res = 0; + return 0; } + + xrandr_current_mode = res; return res; } @@ -177,6 +183,7 @@ static LONG xrandr10_set_current_mode( int mode ) if (stat == RRSetConfigSuccess) { + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Alexandre Julliard : configure: Add explicit install targets in libs/ wine for make_makefiles.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: ce4b6451aabbe83809c7483c748cfa009cc090d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4b6451aabbe83809c7483c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 22:01:44 2013 +0200 configure: Add explicit install targets in libs/wine for make_makefiles. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d4c1f8e..ef38bfd 100755 --- a/configure +++ b/configure @@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader install-lib,manpage wine_fn_config_program aspnet_regiis enable_aspnet_regiis install diff --git a/configure.ac b/configure.ac index 6dd2348..b44673e 100644 --- a/configure.ac +++ b/configure.ac @@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine]) +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8dc385..7de7799 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -111,4 +111,8 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) +# Make sure that make_makefiles sees the install rules +install install-lib:: +install install-dev:: + @LIBWINE_RULES@

1 0

André Hentschel : Wine 1.5.30 freigegeben
by Jeremy Newman 13 May '13

13 May '13

Module: website Branch: master Commit: eb1836f1a9d912fd4555607ff3f597f00be143fe URL: http://source.winehq.org/git/website.git/?a=commit;h=eb1836f1a9d912fd455560… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 15:55:55 2013 +0200 Wine 1.5.30 freigegeben --- news/de/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013051001.xml b/news/de/2013051001.xml new file mode 100644 index 0000000..b444868 --- /dev/null +++ b/news/de/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>10. Mai 2013</date> +<title>Wine 1.5.30 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.30 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.30">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erfassung von Mausbewegungen im Mac Treiber.</li> + <li>NTLM und Negotiate Authentifikation in WinHTTP.</li> + <li>Unterstützung für Proxy Umgehung in WinInet.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.30
by Jeremy Newman 13 May '13

13 May '13

Module: website Branch: master Commit: 3957b0d0121716373bcbd2471074ed43e92d491c URL: http://source.winehq.org/git/website.git/?a=commit;h=3957b0d0121716373bcbd2… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat May 11 13:04:54 2013 +0800 Simplified Chinese translation for release 1.5.30 --- news/zh-cn/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013051001.xml b/news/zh-cn/2013051001.xml new file mode 100644 index 0000000..b9db394 --- /dev/null +++ b/news/zh-cn/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>五月 10, 2013</date> +<title>Wine 1.5.30 发布</title> +<body> + Wine 开发版 1.5.30 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.30">更新</a>： +<ul> + <li>Mac 后端驱动对鼠标捕获的支持。</li> + <li>WinHTTP 的 NTLM 和 Negotiate 认证。</li> + <li>WinInet 对代理旁路的支持。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.30
by Jeremy Newman 13 May '13

13 May '13

Module: website Branch: master Commit: 59f5869340caa7eedc4b167859809522a24e998f URL: http://source.winehq.org/git/website.git/?a=commit;h=59f5869340caa7eedc4b16… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 10 21:50:21 2013 +0200 French translation for release 1.5.30 --- news/fr/2013051001.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013051001.xml b/news/fr/2013051001.xml new file mode 100644 index 0000000..1c3945d --- /dev/null +++ b/news/fr/2013051001.xml @@ -0,0 +1,14 @@ +<news> +<date>10 mai 2013</date> +<title>Sortie de Wine 1.5.30</title> +<body> + La version de développement 1.5.30 de Wine est disponible. + <a href="{$root}/announce/1.5.30">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la capture de la souris dans le pilote Mac.</li> + <li>Authentification NTLM et Negotiate dans WinHTTP.</li> + <li>Prise en charge du contournement de proxy dans WinInet.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.30
by Alexandre Julliard 10 May '13

10 May '13

Module: website Branch: master Commit: 43580ef26ccb6ba611d6106f47814dc67952153c URL: http://source.winehq.org/git/website.git/?a=commit;h=43580ef26ccb6ba611d610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:40:47 2013 +0200 Wine release 1.5.30 --- news/en/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013051001.xml b/news/en/2013051001.xml new file mode 100644 index 0000000..a3ae900 --- /dev/null +++ b/news/en/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>May 10, 2013</date> +<title>Wine 1.5.30 Released</title> +<body> + The Wine development release 1.5.30 is now available. + <a href="{$root}/announce/1.5.30">What's new</a> in this release: +<ul> + <li>Mouse capture support in the Mac driver.</li> + <li>NTLM and Negotiate authentication in WinHTTP.</li> + <li>Support for proxy bypass in WinInet.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.30 : Alexandre Julliard : Release 1.5.30
by Alexandre Julliard 10 May '13

10 May '13

Module: wine Branch: refs/tags/wine-1.5.30 Tag: 4476473ea9cffcb5fd8dd18fa608122e2d6d861c URL: http://source.winehq.org/git/wine.git/?a=tag;h=4476473ea9cffcb5fd8dd18fa608… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:30:10 2013 +0200 Release 1.5.30

1 0

Alexandre Julliard : Release 1.5.30.
by Alexandre Julliard 10 May '13

10 May '13

Module: wine Branch: master Commit: 35aaa42669f0e5048b0f3b7583ec8230a5f4d7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=35aaa42669f0e5048b0f3b758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:30:10 2013 +0200 Release 1.5.30. --- ANNOUNCE | 633 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 298 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35aaa42669f0e5048b0f3…

1 0

Christian Costa : d3dx9_36: Add tests for D3DXGetImageInfoFromFileInMemory with bmp with 1 to 8 bpp.
by Alexandre Julliard 10 May '13

10 May '13

Module: wine Branch: master Commit: 2fc4b953d84b0ba510d293cf77452e84bd114978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc4b953d84b0ba510d293cf7… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 10 17:33:23 2013 +0200 d3dx9_36: Add tests for D3DXGetImageInfoFromFileInMemory with bmp with 1 to 8 bpp. --- dlls/d3dx9_36/tests/surface.c | 68 +++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index b46f33b..15707f7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -45,7 +45,7 @@ static inline void _check_release(unsigned int line, IUnknown *obj, int exp) } /* 1x1 bmp (1 bpp) */ -static const unsigned char bmp01[66] = { +static const unsigned char bmp_1bpp[] = { 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, @@ -53,6 +53,33 @@ static const unsigned char bmp01[66] = { 0x00,0x00 }; +/* 1x1 bmp (2 bpp) */ +static const unsigned char bmp_2bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 1x1 bmp (4 bpp) */ +static const unsigned char bmp_4bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 1x1 bmp (8 bpp) */ +static const unsigned char bmp_8bpp[] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x08,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + /* 2x2 A8R8G8B8 pixel data */ static const unsigned char pixdata[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff @@ -340,7 +367,7 @@ static void test_D3DXGetImageInfo(void) hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); - hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */ + hr = create_file("testbitmap.bmp", bmp_1bpp, sizeof(bmp_1bpp)); /* valid image */ testbitmap_ok = SUCCEEDED(hr); /* D3DXGetImageInfoFromFile */ @@ -403,13 +430,13 @@ static void test_D3DXGetImageInfo(void) /* D3DXGetImageInfoFromFileInMemory */ - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)+5, &info); /* too large size */ + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp)+5, &info); /* too large size */ ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01), NULL); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXGetImageInfoFromFileInMemory(noimage, sizeof(noimage), NULL); @@ -419,17 +446,17 @@ static void test_D3DXGetImageInfo(void) ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); todo_wine { - hr = D3DXGetImageInfoFromFileInMemory(bmp01, sizeof(bmp01)-1, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp)-1, &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); } - hr = D3DXGetImageInfoFromFileInMemory(bmp01+1, sizeof(bmp01)-1, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp+1, sizeof(bmp_1bpp)-1, &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, &info); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, 0, &info); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXGetImageInfoFromFileInMemory(bmp01, 0, NULL); + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXGetImageInfoFromFileInMemory(noimage, 0, &info); @@ -450,6 +477,21 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* test BMP support */ + hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_2bpp, sizeof(bmp_2bpp), &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + hr = D3DXGetImageInfoFromFileInMemory(bmp_4bpp, sizeof(bmp_4bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_8bpp, sizeof(bmp_8bpp), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); @@ -590,7 +632,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); - hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */ + hr = create_file("testbitmap.bmp", bmp_1bpp, sizeof(bmp_1bpp)); /* valid image */ testbitmap_ok = SUCCEEDED(hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL); @@ -640,16 +682,16 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, 0, NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, 0, NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 8, NULL, D3DX_DEFAULT, 0, NULL);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
50
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 May 2013