August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA().
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 1be05ff731aa2657d527d9e56441dadae4160eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be05ff731aa2657d527d9e56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:40 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c349acf..2be1900 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5684,26 +5684,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const ch ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); - - resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_a(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(srcmodule, srcresource, (const char *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW().
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 34c70247906ca8fe965ced1e02c72f519e73eb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c70247906ca8fe965ced1e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:41 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2be1900..3c252e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5704,26 +5704,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); - - resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_w(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly)

1 0

Dmitry Timoshkov : kernel32: Add a trace to ClearCommError.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 31727e812842012ce0951d18c0fcbd575c9027ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=31727e812842012ce0951d18c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 26 16:36:46 2013 +0900 kernel32: Add a trace to ClearCommError. --- dlls/kernel32/comm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 30fd44f..c6a8ec2 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -664,6 +664,9 @@ BOOL WINAPI ClearCommError(HANDLE handle, LPDWORD errors, LPCOMSTAT lpStat) &ss, sizeof(ss), &dwBytesReturned, NULL)) return FALSE; + TRACE("=> status %#x,%#x, in %u, out %u, eof %d, wait %d\n", ss.Errors, ss.HoldReasons, + ss.AmountInInQueue, ss.AmountInOutQueue, ss.EofReceived, ss.WaitForImmediate); + if (errors) { *errors = 0;

1 0

George Stephanos : advapi32/tests: Add tests for hkcr handle mask.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 69208b60f887c4beaae7ce8c422551e92e8a4924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69208b60f887c4beaae7ce8c4… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sat Aug 24 05:11:37 2013 +0200 advapi32/tests: Add tests for hkcr handle mask. --- dlls/advapi32/tests/registry.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bd7e4e2..59ef82e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -31,6 +31,8 @@ #include "winerror.h" #include "aclapi.h" +#define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) + static HKEY hkey_main; static DWORD GLE; @@ -2562,6 +2564,37 @@ cleanup: RegCloseKey( hkcr ); } +static void test_classesroot_mask(void) +{ + HKEY hkey; + LSTATUS res; + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + todo_wine ok(IS_HKCR(hkey), "hkcr mask not set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_USERS, ".Default", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_CONFIG, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); +} + static void test_deleted_key(void) { HKEY hkey, hkey2; @@ -2656,6 +2689,7 @@ START_TEST(registry) test_redirection(); test_classesroot(); test_classesroot_enum(); + test_classesroot_mask(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

George Stephanos : advapi32/tests: Add more tests for hkcr handle mask in existent tests.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 96b03962cd9a901d9473e57ae99e8a1506fceae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b03962cd9a901d9473e57ae… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sat Aug 24 05:11:38 2013 +0200 advapi32/tests: Add more tests for hkcr handle mask in existent tests. --- dlls/advapi32/tests/registry.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 59ef82e..fd5d373 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2122,6 +2122,7 @@ static void test_classesroot(void) skip("not enough privileges to add a user class\n"); return; } + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2129,6 +2130,7 @@ static void test_classesroot(void) todo_wine ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), "test key not found in hkcr: %d\n", res); + todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { skip("HKCR key merging not supported\n"); @@ -2192,12 +2194,14 @@ static void test_classesroot(void) skip("not enough privileges to add a system class\n"); return; } + ok(!IS_HKCR(hklm), "hkcr mask set in %p\n", hklm); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { delete_key( hklm ); @@ -2225,12 +2229,14 @@ static void test_classesroot(void) if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); /* set a value in user's classes */ res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2268,9 +2274,11 @@ static void test_classesroot(void) /* create a subkey in hklm */ if (RegCreateKeyExA( hklm, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hklmsub1, NULL )) return; + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); /* try to open that subkey in hkcr */ res = RegOpenKeyExA( hkcr, "subkey1", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcrsub1 ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcrsub1), "hkcr mask not set in %p\n", hkcrsub1); /* set a value in hklm classes */ res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); @@ -2293,6 +2301,7 @@ static void test_classesroot(void) /* create a subkey in user's classes */ if (RegCreateKeyExA( hkey, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkeysub1, NULL )) return; + ok(!IS_HKCR(hkeysub1), "hkcr mask set in %p\n", hkeysub1); /* set a value in user's classes */ res = RegSetValueExA(hkeysub1, "subval1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2330,6 +2339,7 @@ static void test_classesroot(void) /* new subkey in hkcr */ if (RegCreateKeyExA( hkcr, "subkey2", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkcrsub2, NULL )) return; + ok(IS_HKCR(hkcrsub2), "hkcr mask not set in %p\n", hkcrsub2); res = RegSetValueExA(hkcrsub2, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); @@ -2339,6 +2349,7 @@ static void test_classesroot(void) hklmsub2 = 0; res = RegOpenKeyExA( hklm, "subkey2", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hklmsub2 ); ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub2), "hkcr mask set in %p\n", hklmsub2); /* check that the value is present in hklm */ res = RegQueryValueExA(hklmsub2, "subval1", NULL, &type, (LPBYTE)buffer, &size); @@ -2358,6 +2369,7 @@ static void test_classesroot(void) ok(res == ERROR_FILE_NOT_FOUND, "test key found in user's classes: %d\n", res); res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); /* delete subkey1 from hkcr again (which should now point at hklm) */ res = RegDeleteKey(hkcr, "subkey1");

1 0

Frédéric Delanoy : makefiles: Don' t duplicate files lists in every makefile.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: docs Branch: master Commit: 244227520f2c883662397540914009bb6632ea76 URL: http://source.winehq.org/git/docs.git/?a=commit;h=244227520f2c8836623975409… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 20 22:34:45 2013 +0200 makefiles: Don't duplicate files lists in every makefile. --- Make.rules.in | 31 +++++++++++++++++++++++++++++++ en/Makefile.in | 30 ------------------------------ fr/Makefile.in | 16 ---------------- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index fda8e81..7538144 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,6 +16,37 @@ DB2PS = @DB2PS@ DB2TXT = @DB2TXT@ PO4ADIR = $(TOPSRCDIR)/po4a PO4AENV = PERLLIB=$(PO4ADIR)/lib +SGMLDIR = $(TOPSRCDIR)/en + +WINEUSR_SRCS = \ + $(SGMLDIR)/wineusr-bugs.sgml \ + $(SGMLDIR)/wineusr-configuring.sgml \ + $(SGMLDIR)/wineusr-getting.sgml \ + $(SGMLDIR)/wineusr-glossary.sgml \ + $(SGMLDIR)/wineusr-introduction.sgml \ + $(SGMLDIR)/wineusr-running.sgml + +WINELIB_SRCS = \ + $(SGMLDIR)/winelib-bindlls.sgml \ + $(SGMLDIR)/winelib-intro.sgml \ + $(SGMLDIR)/winelib-mfc.sgml \ + $(SGMLDIR)/winelib-porting.sgml \ + $(SGMLDIR)/winelib-toolkit.sgml + +WINEDEV_SRCS = \ + $(SGMLDIR)/winedev-architecture.sgml \ + $(SGMLDIR)/winedev-ddraw.sgml \ + $(SGMLDIR)/winedev-debugger.sgml \ + $(SGMLDIR)/winedev-debugging.sgml \ + $(SGMLDIR)/winedev-documentation.sgml \ + $(SGMLDIR)/winedev-multimedia.sgml \ + $(SGMLDIR)/winedev-ole.sgml \ + $(SGMLDIR)/winedev-opengl.sgml \ + $(SGMLDIR)/winedev-testing.sgml \ + $(SGMLDIR)/winedev-coding.sgml \ + $(SGMLDIR)/winedev-kernel.sgml \ + $(SGMLDIR)/winedev-otherdebug.sgml \ + $(SGMLDIR)/winedev-windowing.sgml all: $(SUBDIRS) diff --git a/en/Makefile.in b/en/Makefile.in index 6d11868..50d7c6e 100644 --- a/en/Makefile.in +++ b/en/Makefile.in @@ -4,36 +4,6 @@ VPATH = @srcdir@ DOCLOCALE = en -WINEUSR_SRCS = \ - wineusr-bugs.sgml \ - wineusr-configuring.sgml \ - wineusr-getting.sgml \ - wineusr-glossary.sgml \ - wineusr-introduction.sgml \ - wineusr-running.sgml - -WINEDEV_SRCS = \ - winedev-architecture.sgml \ - winedev-ddraw.sgml \ - winedev-debugger.sgml \ - winedev-debugging.sgml \ - winedev-documentation.sgml \ - winedev-multimedia.sgml \ - winedev-ole.sgml \ - winedev-opengl.sgml \ - winedev-testing.sgml \ - winedev-coding.sgml \ - winedev-kernel.sgml \ - winedev-otherdebug.sgml \ - winedev-windowing.sgml - -WINELIB_SRCS = \ - winelib-bindlls.sgml \ - winelib-intro.sgml \ - winelib-mfc.sgml \ - winelib-porting.sgml \ - winelib-toolkit.sgml - ALLBOOKS = \ winedev-guide \ wineusr-guide \ diff --git a/fr/Makefile.in b/fr/Makefile.in index 4269ab4..2a5c670 100644 --- a/fr/Makefile.in +++ b/fr/Makefile.in @@ -3,24 +3,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ DOCLOCALE = fr -SGMLDIR = $(TOPSRCDIR)/en MIN_TRANS = 1 -WINEUSR_SRCS = \ - $(SGMLDIR)/wineusr-bugs.sgml \ - $(SGMLDIR)/wineusr-configuring.sgml \ - $(SGMLDIR)/wineusr-getting.sgml \ - $(SGMLDIR)/wineusr-glossary.sgml \ - $(SGMLDIR)/wineusr-introduction.sgml \ - $(SGMLDIR)/wineusr-running.sgml - -WINELIB_SRCS = \ - $(SGMLDIR)/winelib-bindlls.sgml \ - $(SGMLDIR)/winelib-intro.sgml \ - $(SGMLDIR)/winelib-mfc.sgml \ - $(SGMLDIR)/winelib-porting.sgml \ - $(SGMLDIR)/winelib-toolkit.sgml - ALLBOOKS = \ wineusr-guide \ winelib-guide

1 0

Frédéric Delanoy : winedev: Update wine multimedia chapter.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: docs Branch: master Commit: 45f6426a3413f0ae2d476f083f73e63acc5aa466 URL: http://source.winehq.org/git/docs.git/?a=commit;h=45f6426a3413f0ae2d476f083… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 22 19:05:41 2013 +0200 winedev: Update wine multimedia chapter. --- en/winedev-multimedia.sgml | 180 ++++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=45f6426a3413f0ae2d476…

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectFromResourceExA().
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: f60b28138e47564c6edbcff55b0b3197cf192eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60b28138e47564c6edbcff55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:17 2013 +0200 d3dx9: Simplify D3DXCreateEffectFromResourceExA(). --- dlls/d3dx9_36/effect.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 757833b..c4d97a4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5601,29 +5601,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); + TRACE("device %p, srcmodule %p, srcresource %s, defines %p, include %p, skipconstants %s, " + "flags %#x, pool %p, effect %p, compilationerrors %p.\n", + device, srcmodule, debugstr_a(srcresource), defines, include, debugstr_a(skipconstants), + flags, pool, effect, compilationerrors); if (!device) return D3DERR_INVALIDCALL; - resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); - - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(srcmodule, srcresource, (const char *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectEx(device, buffer, size, defines, include, + skipconstants, flags, pool, effect, compilationerrors); } HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HMODULE srcmodule,

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectFromResourceExW().
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 37d67eb629c1d0e7cc7cc698f4a909b4c8eda360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d67eb629c1d0e7cc7cc698f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:18 2013 +0200 d3dx9: Simplify D3DXCreateEffectFromResourceExW(). --- dlls/d3dx9_36/effect.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c4d97a4..c349acf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5571,29 +5571,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(struct IDirect3DDevice9 *device, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); + TRACE("device %p, srcmodule %p, srcresource %s, defines %p, include %p, skipconstants %s, " + "flags %#x, pool %p, effect %p, compilationerrors %p.\n", + device, srcmodule, debugstr_w(srcresource), defines, include, debugstr_a(skipconstants), + flags, pool, effect, compilationerrors); if (!device) return D3DERR_INVALIDCALL; - resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); - - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectEx(device, buffer, size, defines, include, + skipconstants, flags, pool, effect, compilationerrors); } HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,

1 0

Dmitry Timoshkov : ntdll/tests: Add some tests for FILE_USE_FILE_POINTER_POSITION.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 49e31d29ca96892e462f6c4a53582f6796505ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e31d29ca96892e462f6c4a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 13:35:04 2013 +0900 ntdll/tests: Add some tests for FILE_USE_FILE_POINTER_POSITION. --- dlls/ntdll/tests/file.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e30ada0..58bcdb1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2001,7 +2001,8 @@ static void test_read_write(void) iob.Status = -1; iob.Information = -1; - status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, NULL, NULL); + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); @@ -2035,7 +2036,7 @@ todo_wine iob.Status = -1; iob.Information = -1; - offset.QuadPart = sizeof(contents); + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); todo_wine @@ -2139,6 +2140,17 @@ todo_wine iob.Status = -1; iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine @@ -2175,8 +2187,15 @@ todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + iob.Status = -1; + iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; - offset.QuadPart = sizeof(contents); /* magic -2 doen't seem to work under win7 */ + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + offset.QuadPart = sizeof(contents); S(U(ovl)).Offset = offset.u.LowPart; S(U(ovl)).OffsetHigh = offset.u.HighPart; ovl.Internal = -1;

1 0