January 2013 - Wine-Commits

Rico Schüller : d3dx9: Handle invalid byte code in D3DXFindShaderComment().
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: bc4a4f5f3b1583d076d13d119e45dac1717494d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4a4f5f3b1583d076d13d119… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:07 2013 +0100 d3dx9: Handle invalid byte code in D3DXFindShaderComment(). --- dlls/d3dx9_36/shader.c | 15 ++++++++++----- dlls/d3dx9_36/tests/shader.c | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9137a98..9269237 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -40,6 +40,11 @@ HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); +static inline BOOL is_valid_bytecode(DWORD token) +{ + return (token & 0xfffe0000) == 0xfffe0000; +} + const char * WINAPI D3DXGetPixelShaderProfile(struct IDirect3DDevice9 *device) { D3DCAPS9 caps; @@ -147,17 +152,17 @@ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device) return NULL; } -HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size) +HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const void **data, UINT *size) { - CONST DWORD *ptr = byte_code; + const DWORD *ptr = byte_code; - TRACE("(%p, %x, %p, %p)\n", byte_code, fourcc, data, size); + TRACE("byte_code %p, fourcc %x, data %p, size %p\n", byte_code, fourcc, data, size); if (data) *data = NULL; if (size) *size = 0; - if (!byte_code) - return D3DERR_INVALIDCALL; + if (!byte_code) return D3DERR_INVALIDCALL; + if (!is_valid_bytecode(*byte_code)) return D3DXERR_INVALIDDATA; while (*++ptr != D3DSIO_END) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 223bebf..8ec98ba 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -20,6 +20,12 @@ #include "wine/test.h" #include "d3dx9.h" +static const DWORD shader_zero[] = {0x0}; + +static const DWORD shader_invalid[] = {0xeeee0100}; + +static const DWORD shader_empty[] = {0xfffeffff, 0x0000ffff}; + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ @@ -330,6 +336,21 @@ static void test_find_shader_comment(void) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); ok(size == 28, "Got result %d, expected 28\n", size); + + hr = D3DXFindShaderComment(shader_zero, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); + + hr = D3DXFindShaderComment(shader_invalid, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); + + hr = D3DXFindShaderComment(shader_empty, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == S_FALSE, "Got result %x, expected %x (S_FALSE)\n", hr, S_FALSE); + ok(!data, "Got %p, expected NULL\n", data); + ok(!size, "Got %u, expected 0\n", size); } static void test_get_shader_constant_table_ex(void)

1 0

Alexandre Julliard : krnl386.exe: Retrieve the page size from ntdll.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: ac5319630d7882bb1380240ba1bc3d89314b2416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5319630d7882bb1380240ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 14:00:44 2013 +0100 krnl386.exe: Retrieve the page size from ntdll. --- dlls/krnl386.exe16/global.c | 5 ++++- dlls/krnl386.exe16/int31.c | 14 ++++++++++---- dlls/toolhelp.dll16/toolhelp.c | 4 +++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index d9dcb1b..699463c 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -963,9 +963,12 @@ WORD WINAPI GlobalHandleToSel16( HGLOBAL16 handle ) */ DWORD WINAPI GetFreeMemInfo16(void) { + SYSTEM_BASIC_INFORMATION info; MEMORYSTATUS status; + + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); GlobalMemoryStatus( &status ); - return MAKELONG( status.dwTotalVirtual/getpagesize(), status.dwAvailVirtual/getpagesize() ); + return MAKELONG( status.dwTotalVirtual / info.PageSize, status.dwAvailVirtual / info.PageSize ); } /*********************************************************************** diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index ac9ae1f..5eddcca 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -1312,6 +1312,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) TRACE("get free memory information\n"); { MEMORYSTATUS status; + SYSTEM_BASIC_INFORMATION sbi; /* the layout is just the same as MEMMANINFO, but without * the dwSize entry. @@ -1331,7 +1332,9 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) } *info = CTX_SEG_OFF_TO_LIN( context, context->SegEs, context->Edi ); GlobalMemoryStatus( &status ); - info->wPageSize = getpagesize(); + NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL ); + + info->wPageSize = sbi.PageSize; info->dwLargestFreeBlock = status.dwAvailVirtual; info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; info->dwMaxPagesLockable = info->dwMaxPagesAvailable; @@ -1418,11 +1421,14 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context ) break; case 0x0604: /* Get page size */ + { + SYSTEM_BASIC_INFORMATION info; TRACE("get pagesize\n"); - SET_BX( context, HIWORD(getpagesize()) ); - SET_CX( context, LOWORD(getpagesize()) ); + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); + SET_BX( context, HIWORD(info.PageSize) ); + SET_CX( context, LOWORD(info.PageSize) ); break; - + } case 0x0700: /* Mark pages as paging candidates */ TRACE( "mark pages as paging candidates - ignored (no paging)\n" ); break; diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index fb001ea..4fa1500 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -491,6 +491,7 @@ BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask ) */ BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) { + SYSTEM_BASIC_INFORMATION sbi; MEMORYSTATUS status; /* @@ -498,8 +499,9 @@ BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) * _must_ provide the size in the dwSize field, this function * (under Windows) always fills the structure and returns true. */ + NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL ); GlobalMemoryStatus( &status ); - info->wPageSize = getpagesize(); + info->wPageSize = sbi.PageSize; info->dwLargestFreeBlock = status.dwAvailVirtual; info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; info->dwMaxPagesLockable = info->dwMaxPagesAvailable;

1 0

Alexandre Julliard : configure: Allow pthread_create to be in the C library .
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 02aa14518b30fb3289f1e1c46349f1d18ea6cafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=02aa14518b30fb3289f1e1c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 13:14:11 2013 +0100 configure: Allow pthread_create to be in the C library. --- configure | 10 ++++++++-- configure.ac | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a1caaa4..6dc5b50 100755 --- a/configure +++ b/configure @@ -7255,7 +7255,11 @@ fi if test "$ac_cv_header_pthread_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 + ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" +if test "x$ac_cv_func_pthread_create" = xyes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 @@ -7297,7 +7301,9 @@ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : fi fi -if test "x$LIBPTHREAD" = "x"; then : + +fi +if test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x; then : case "x$with_pthread" in xno) ;; *) as_fn_error $? "pthread ${notice_platform}development files not found. diff --git a/configure.ac b/configure.ac index d14a2df..4b0c360 100644 --- a/configure.ac +++ b/configure.ac @@ -954,9 +954,10 @@ dnl **** Check for pthread **** if test "$ac_cv_header_pthread_h" = "yes" then - AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")]) + AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")])]) fi -WINE_ERROR_WITH(pthread,[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found. +WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x], +[pthread ${notice_platform}development files not found. Wine cannot support threads without libpthread.]) dnl **** Check for X11 ****

1 0

Henri Verbeet : ddraw: Avoid LPD3DLIGHTINGELEMENT.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 09bad83c3a58a3f47bb853eeaeaeeb3ea25aff7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bad83c3a58a3f47bb853eea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:16 2013 +0100 ddraw: Avoid LPD3DLIGHTINGELEMENT. --- include/d3dtypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 59ac720..73c389f 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -597,7 +597,7 @@ typedef struct _D3DLIGHT2 { typedef struct _D3DLIGHTDATA { DWORD dwSize; - LPD3DLIGHTINGELEMENT lpIn; + D3DLIGHTINGELEMENT *lpIn; DWORD dwInSize; D3DTLVERTEX *lpOut; DWORD dwOutSize;

1 0

Henri Verbeet : d3d8/tests: Merge d3d8_main.c into device.c.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 9dbf059c75ab5724c5e1aa3dabf88ffffdc213d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbf059c75ab5724c5e1aa3da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:18 2013 +0100 d3d8/tests: Merge d3d8_main.c into device.c. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/d3d8_main.c | 119 ------------------------------------------- dlls/d3d8/tests/device.c | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dbf059c75ab5724c5e1a…

1 0

Ken Thomases : libwine: Call the Mac Multi-Processing Services lib from the main thread first.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 573436047e93aa911d1ec2a943127df31e61b0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573436047e93aa911d1ec2a94… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:43:31 2013 -0600 libwine: Call the Mac Multi-Processing Services lib from the main thread first. --- libs/wine/Makefile.in | 2 +- libs/wine/loader.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ca93d26..a86e73b 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ DLLFLAGS = @DLLFLAGS@ MODULE = libwine.$(LIBEXT) VERSCRIPT = $(srcdir)/wine.map -EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@ +EXTRALIBS = $(LIBPORT) @LIBDL@ @CRTLIBS@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" VERSION = 1.0 diff --git a/libs/wine/loader.c b/libs/wine/loader.c index df0a6b5..9681381 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -39,21 +39,26 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wine/library.h" - #ifdef __APPLE__ #include <crt_externs.h> #define environ (*_NSGetEnviron()) #include <CoreFoundation/CoreFoundation.h> +#define LoadResource MacLoadResource +#define GetCurrentThread MacGetCurrentThread +#include <CoreServices/CoreServices.h> +#undef LoadResource +#undef GetCurrentThread #include <pthread.h> #else extern char **environ; #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "wine/library.h" + /* argc/argv for the Windows application */ int __wine_main_argc = 0; char **__wine_main_argv = NULL; @@ -756,6 +761,11 @@ static void apple_main_thread( void (*init_func)(void) ) CFRunLoopSourceContext source_context = { 0 }; CFRunLoopSourceRef source; + /* Multi-processing Services can get confused about the main thread if the + * first time it's used is on a secondary thread. Use it here to make sure + * that doesn't happen. */ + MPTaskIsPreemptive(MPCurrentTaskID()); + /* Give ourselves the best chance of having the distributed notification * center scheduled on this thread's run loop. In theory, it's scheduled * in the first thread to ask for it. */

1 0

Alexandre Julliard : vmm.vxd: Hardcode the x86 page size.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: ae9b07fdc0f8b179d87db07c8ecd2c07f67446dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9b07fdc0f8b179d87db07c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 14:02:34 2013 +0100 vmm.vxd: Hardcode the x86 page size. --- dlls/vmm.vxd/vmm.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index ff737dc..7327f78 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -119,6 +119,8 @@ static const char * const VMM_Service_Name[N_VMM_SERVICE] = #define PCC_NOLIN 0x10000000 /* don't map to any linear address */ +static const DWORD page_size = 0x1000; /* we only care about x86 */ + /* Pop a DWORD from the 32-bit stack */ static inline DWORD stack32_pop( CONTEXT *context ) { @@ -141,7 +143,6 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) { LPVOID address; LPVOID ret; - DWORD psize = getpagesize(); ULONG page = stack32_pop( context ); ULONG npages = stack32_pop( context ); ULONG flags = stack32_pop( context ); @@ -157,8 +158,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) address-spaces we now have */ if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ - address = (LPVOID )(page * psize); - ret = VirtualAlloc ( address, ( npages * psize ), MEM_RESERVE, 0 ); + address = (LPVOID )(page * page_size); + ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); TRACE("PageReserve: returning: %p\n", ret ); if ( ret == NULL ) return -1; @@ -171,7 +172,6 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) LPVOID address; LPVOID ret; DWORD virt_perm; - DWORD psize = getpagesize(); ULONG page = stack32_pop( context ); ULONG npages = stack32_pop( context ); ULONG hpd = stack32_pop( context ); @@ -190,8 +190,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) else virt_perm = PAGE_NOACCESS; - address = (LPVOID )(page * psize); - ret = VirtualAlloc ( address, ( npages * psize ), MEM_COMMIT, virt_perm ); + address = (LPVOID )(page * page_size); + ret = VirtualAlloc ( address, npages * page_size, MEM_COMMIT, virt_perm ); TRACE("PageCommit: Returning: %p\n", ret ); return (DWORD )ret; @@ -201,15 +201,14 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) { LPVOID address; BOOL ret; - DWORD psize = getpagesize(); ULONG page = stack32_pop( context ); ULONG npages = stack32_pop( context ); ULONG flags = stack32_pop( context ); TRACE("PageDecommit: page: %08x, npages: %08x, flags: %08x partial stub\n", page, npages, flags ); - address = (LPVOID )( page * psize ); - ret = VirtualFree ( address, ( npages * psize ), MEM_DECOMMIT ); + address = (LPVOID )( page * page_size ); + ret = VirtualFree ( address, npages * page_size, MEM_DECOMMIT ); TRACE("PageDecommit: Returning: %s\n", ret ? "TRUE" : "FALSE" ); return ret; } @@ -222,7 +221,6 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) DWORD virt_new_perm; MEMORY_BASIC_INFORMATION mbi; LPVOID address; - DWORD psize = getpagesize(); ULONG page = stack32_pop ( context ); ULONG npages = stack32_pop ( context ); ULONG permand = stack32_pop ( context ); @@ -230,7 +228,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) TRACE("PageModifyPermissions %08x %08x %08x %08x partial stub\n", page, npages, permand, permor ); - address = (LPVOID )( page * psize ); + address = (LPVOID )( page * page_size ); VirtualQuery ( address, &mbi, sizeof ( MEMORY_BASIC_INFORMATION )); virt_old_perm = mbi.Protect; @@ -265,7 +263,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) virt_new_perm |= PAGE_EXECUTE_READ; } - if ( ! VirtualProtect ( address, ( npages * psize ), virt_new_perm, &virt_old_perm ) ) { + if ( ! VirtualProtect ( address, npages * page_size, virt_new_perm, &virt_old_perm ) ) { ERR("Can't change page permissions for %p\n", address ); return 0xffffffff; }

1 0

Rico Schüller : d3dx9: Always set the table = NULL in D3DXGetShaderConstantTableEx().
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: a847b9dddb3875b4189104f02dbf319be8274803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a847b9dddb3875b4189104f02… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:13 2013 +0100 d3dx9: Always set the table = NULL in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 4 +++- dlls/d3dx9_36/tests/shader.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9269237..e266fe2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1629,7 +1629,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, D3DXSHADER_CONSTANTINFO* constant_info; DWORD i; - TRACE("(%p, %x, %p)\n", byte_code, flags, constant_table); + TRACE("byte_code %p, flags %x, constant_table %p\n", byte_code, flags, constant_table); + + if (constant_table) *constant_table = NULL; if (!byte_code || !constant_table) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8ec98ba..fb8f270 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -355,18 +355,22 @@ static void test_find_shader_comment(void) static void test_get_shader_constant_table_ex(void) { - ID3DXConstantTable *constant_table = NULL; + ID3DXConstantTable *constant_table; HRESULT hr; LPVOID data; DWORD size; D3DXCONSTANTTABLE_DESC desc; + constant_table = (ID3DXConstantTable *)0xdeadbeef; hr = D3DXGetShaderConstantTableEx(NULL, 0, &constant_table); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + ok(constant_table == NULL, "D3DXGetShaderConstantTableEx() failed, got %p\n", constant_table); /* No CTAB data */ + constant_table = (ID3DXConstantTable *)0xdeadbeef; hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(constant_table == NULL, "D3DXGetShaderConstantTableEx() failed, got %p\n", constant_table); /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); @@ -376,6 +380,7 @@ static void test_get_shader_constant_table_ex(void) hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(constant_table != NULL, "D3DXGetShaderConstantTableEx() failed, got NULL\n"); if (constant_table) { @@ -399,8 +404,9 @@ static void test_get_shader_constant_table_ex(void) hr = D3DXGetShaderConstantTableEx(shader_with_ctab_constants, 0, &constant_table); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(constant_table != NULL, "D3DXGetShaderConstantTableEx() failed, got NULL\n"); - if (SUCCEEDED(hr)) + if (constant_table) { D3DXHANDLE constant; D3DXCONSTANT_DESC constant_desc;

1 0

Rico Schüller : d3dx9: Constify some variables.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: e7cd340e8a1292c2f82e52d1537b1009b9464ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cd340e8a1292c2f82e52d15… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:29 2013 +0100 d3dx9: Constify some variables. --- dlls/d3dx9_36/shader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 20fcb26..ea459ce 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1626,7 +1626,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, LPCVOID data; UINT size; const D3DXSHADER_CONSTANTTABLE *ctab_header; - D3DXSHADER_CONSTANTINFO *constant_info; + const D3DXSHADER_CONSTANTINFO *constant_info; DWORD i; TRACE("byte_code %p, flags %x, constant_table %p\n", byte_code, flags, constant_table); @@ -1703,7 +1703,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, goto error; } - constant_info = (LPD3DXSHADER_CONSTANTINFO)(object->ctab + ctab_header->ConstantInfo); + constant_info = (const D3DXSHADER_CONSTANTINFO *)(object->ctab + ctab_header->ConstantInfo); for (i = 0; i < ctab_header->Constants; i++) { DWORD offset = constant_info[i].DefaultValue; @@ -1734,7 +1734,7 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count) +HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { HRESULT hr; UINT i, sampler_count = 0; @@ -1755,14 +1755,14 @@ HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, U ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; if (ctab_header->Size != sizeof(*ctab_header)) return D3D_OK; - constant_info = (D3DXSHADER_CONSTANTINFO *)(data + ctab_header->ConstantInfo); + constant_info = (const D3DXSHADER_CONSTANTINFO *)(data + ctab_header->ConstantInfo); for (i = 0; i < ctab_header->Constants; i++) { const D3DXSHADER_TYPEINFO *type; TRACE("name = %s\n", data + constant_info[i].Name); - type = (D3DXSHADER_TYPEINFO *)(data + constant_info[i].TypeInfo); + type = (const D3DXSHADER_TYPEINFO *)(data + constant_info[i].TypeInfo); if (type->Type == D3DXPT_SAMPLER || type->Type == D3DXPT_SAMPLER1D

1 0

André Hentschel : netstat: Don' t translate strings only translated in German.
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 5263afdb6811317df0149578b502912136a41199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5263afdb6811317df0149578b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 7 23:27:55 2013 +0100 netstat: Don't translate strings only translated in German. --- po/ar.po | 56 +++--------------------------------------- po/bg.po | 56 +++--------------------------------------- po/ca.po | 56 +++--------------------------------------- po/cs.po | 56 +++--------------------------------------- po/da.po | 56 +++--------------------------------------- po/de.po | 56 +++--------------------------------------- po/el.po | 56 +++--------------------------------------- po/en.po | 56 +++--------------------------------------- po/en_US.po | 56 +++--------------------------------------- po/eo.po | 56 +++--------------------------------------- po/es.po | 56 +++--------------------------------------- po/fa.po | 56 +++--------------------------------------- po/fi.po | 56 +++--------------------------------------- po/fr.po | 56 +++--------------------------------------- po/he.po | 56 +++--------------------------------------- po/hi.po | 56 +++--------------------------------------- po/hu.po | 56 +++--------------------------------------- po/it.po | 56 +++--------------------------------------- po/ja.po | 56 +++--------------------------------------- po/ko.po | 56 +++--------------------------------------- po/lt.po | 56 +++--------------------------------------- po/ml.po | 56 +++--------------------------------------- po/nb_NO.po | 56 +++--------------------------------------- po/nl.po | 56 +++--------------------------------------- po/or.po | 56 +++--------------------------------------- po/pa.po | 56 +++--------------------------------------- po/pl.po | 56 +++--------------------------------------- po/pt_BR.po | 56 +++--------------------------------------- po/pt_PT.po | 56 +++--------------------------------------- po/rm.po | 56 +++--------------------------------------- po/ro.po | 56 +++--------------------------------------- po/ru.po | 56 +++--------------------------------------- po/sk.po | 56 +++--------------------------------------- po/sl.po | 56 +++--------------------------------------- po/sr_RS(a)cyrillic.po | 56 +++--------------------------------------- po/sr_RS(a)latin.po | 56 +++--------------------------------------- po/sv.po | 56 +++--------------------------------------- po/te.po | 56 +++--------------------------------------- po/th.po | 56 +++--------------------------------------- po/tr.po | 56 +++--------------------------------------- po/uk.po | 56 +++--------------------------------------- po/wa.po | 56 +++--------------------------------------- po/wine.pot | 56 +++--------------------------------------- po/zh_CN.po | 56 +++--------------------------------------- po/zh_TW.po | 56 +++--------------------------------------- programs/netstat/netstat.c | 18 +++++++++++++- programs/netstat/netstat.h | 23 ++++------------- programs/netstat/netstat.rc | 13 ---------- 48 files changed, 202 insertions(+), 2372 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5263afdb6811317df0149…

1 0