January 2013 - Wine-commits

Alexandre Julliard : ntdll: Make the page_size variable global.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 90e90e3b6a3087c48bdd559de3686dfb1e03ab96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e90e3b6a3087c48bdd559de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 14:00:06 2013 +0100 ntdll: Make the page_size variable global. --- dlls/ntdll/cdrom.c | 6 +++--- dlls/ntdll/directory.c | 1 - dlls/ntdll/file.c | 2 -- dlls/ntdll/heap.c | 3 ++- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 6 ++++++ dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_sparc.c | 2 +- dlls/ntdll/virtual.c | 17 +++++++---------- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 5ce3f7d..18c7874 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1980,9 +1980,9 @@ static NTSTATUS CDROM_ScsiGetCaps(int fd, PIO_SCSI_CAPABILITIES caps) #ifdef SG_SCATTER_SZ caps->Length = sizeof(*caps); caps->MaximumTransferLength = SG_SCATTER_SZ; /* FIXME */ - caps->MaximumPhysicalPages = SG_SCATTER_SZ / getpagesize(); + caps->MaximumPhysicalPages = SG_SCATTER_SZ / page_size; caps->SupportedAsynchronousEvents = TRUE; - caps->AlignmentMask = getpagesize(); + caps->AlignmentMask = page_size; caps->TaggedQueuing = FALSE; /* we could check that it works and answer TRUE */ caps->AdapterScansDown = FALSE; /* FIXME ? */ caps->AdapterUsesPio = FALSE; /* FIXME ? */ @@ -1997,7 +1997,7 @@ static NTSTATUS CDROM_ScsiGetCaps(int fd, PIO_SCSI_CAPABILITIES caps) if (io != 0) return CDROM_GetStatusCode(io); caps->Length = sizeof(*caps); caps->MaximumTransferLength = bytesr < bytesw ? bytesr : bytesw; - caps->MaximumPhysicalPages = caps->MaximumTransferLength / getpagesize(); + caps->MaximumPhysicalPages = caps->MaximumTransferLength / page_size; caps->SupportedAsynchronousEvents = TRUE; caps->AlignmentMask = align-1; caps->TaggedQueuing = FALSE; /* we could check that it works and answer TRUE */ diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cd2ee90..cc075b7 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1384,7 +1384,6 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) if (!de) { - const size_t page_size = getpagesize(); SIZE_T size = 2 * sizeof(*de) + page_size; void *addr = NULL; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1b292d4..791570e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -765,7 +765,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap PIO_STATUS_BLOCK io_status, FILE_SEGMENT_ELEMENT *segments, ULONG length, PLARGE_INTEGER offset, PULONG key ) { - size_t page_size = getpagesize(); int result, unix_handle, needs_close; unsigned int options; NTSTATUS status; @@ -1097,7 +1096,6 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap PIO_STATUS_BLOCK io_status, FILE_SEGMENT_ELEMENT *segments, ULONG length, PLARGE_INTEGER offset, PULONG key ) { - size_t page_size = getpagesize(); int result, unix_handle, needs_close; unsigned int options; NTSTATUS status; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a9044714..ac78889 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -40,6 +40,7 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" +#include "ntdll_misc.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/server.h" @@ -806,7 +807,7 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui { DWORD flags = heap->flags; - if ((ULONG_PTR)arena % getpagesize()) + if ((ULONG_PTR)arena % page_size) { if (quiet == NOISY) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d00397c..fd63e08 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -773,7 +773,7 @@ static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, WCHAR buffer[16]; if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; - if (nt->OptionalHeader.SectionAlignment < getpagesize()) return TRUE; + if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; if ((imports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 20f1c45..e56d4b4 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -33,6 +33,12 @@ #define MAX_DOS_DRIVES 26 +#if defined(__i386__) || defined(__x86_64__) +static const UINT_PTR page_size = 0x1000; +#else +extern UINT_PTR page_size DECLSPEC_HIDDEN; +#endif + struct drive_info { dev_t dev; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 93a2ff5..5ad4016 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -798,7 +798,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) if (!sigstack_zero_bits) { - size_t min_size = getpagesize(); /* this is just for the TEB, we don't use a signal stack yet */ + size_t min_size = page_size; /* find the first power of two not smaller than min_size */ while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; assert( sizeof(TEB) <= min_size ); diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index f6de65f..3d461ee 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -963,7 +963,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) if (!sigstack_zero_bits) { - size_t min_size = getpagesize(); /* this is just for the TEB, we don't use a signal stack yet */ + size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ /* find the first power of two not smaller than min_size */ while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; assert( sizeof(TEB) <= min_size ); diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 798397d..13fa8f2 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -725,7 +725,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) if (!sigstack_zero_bits) { - size_t min_size = getpagesize(); /* this is just for the TEB, we don't use a signal stack yet */ + size_t min_size = page_size; /* find the first power of two not smaller than min_size */ while ((1u << sigstack_zero_bits) < min_size) sigstack_zero_bits++; assert( sizeof(TEB) <= min_size ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 88bcdbb..4f8b3c9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -112,26 +112,23 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; #ifdef __i386__ -/* These are always the same on an i386, and it will be faster this way */ -# define page_mask 0xfff -# define page_shift 12 -# define page_size 0x1000 +static const UINT page_shift = 12; +static const UINT_PTR page_mask = 0xfff; /* Note: these are Windows limits, you cannot change them. */ static void *address_space_limit = (void *)0xc0000000; /* top of the total available address space */ static void *user_space_limit = (void *)0x7fff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fff0000; /* top of the current working set */ static void *address_space_start = (void *)0x110000; /* keep DOS area clear */ #elif defined(__x86_64__) -# define page_mask 0xfff -# define page_shift 12 -# define page_size 0x1000 +static const UINT page_shift = 12; +static const UINT_PTR page_mask = 0xfff; static void *address_space_limit = (void *)0x7fffffff0000; static void *user_space_limit = (void *)0x7fffffff0000; static void *working_set_limit = (void *)0x7fffffff0000; static void *address_space_start = (void *)0x10000; #else +UINT_PTR page_size = 0; static UINT page_shift; -static UINT_PTR page_size; static UINT_PTR page_mask; static void *address_space_limit; static void *user_space_limit; @@ -1416,8 +1413,8 @@ void virtual_init(void) size_t size; struct file_view *heap_view; -#ifndef page_mask - page_size = getpagesize(); +#if !defined(__i386__) && !defined(__x86_64__) + page_size = sysconf( _SC_PAGESIZE ); page_mask = page_size - 1; /* Make sure we have a power of 2 */ assert( !(page_size & page_mask) );

1 0

Alexandre Julliard : krnl386.exe: Retrieve the page size from ntdll.
by Alexandre Julliard 08 Jan '13

08 Jan '13

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 : vmm.vxd: Hardcode the x86 page size.
by Alexandre Julliard 08 Jan '13

08 Jan '13

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: Handle invalid byte code in D3DXFindShaderComment().
by Alexandre Julliard 08 Jan '13

08 Jan '13

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

Rico Schüller : d3dx9: Always set the table = NULL in D3DXGetShaderConstantTableEx().
by Alexandre Julliard 08 Jan '13

08 Jan '13

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: Handle invalid byte code in D3DXGetShaderConstantTableEx().
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 6cb430102117b21fa96009c774af9e5c99e61777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb430102117b21fa96009c77… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:18 2013 +0100 d3dx9: Handle invalid byte code in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 6 ++++++ dlls/d3dx9_36/tests/shader.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e266fe2..81c8323 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1639,6 +1639,12 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, return D3DERR_INVALIDCALL; } + if (!is_valid_bytecode(*byte_code)) + { + WARN("Invalid byte_code specified.\n"); + return D3D_OK; + } + if (flags) FIXME("Flags (%#x) are not handled, yet!\n", flags); hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index fb8f270..f7be174 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -366,6 +366,21 @@ static void test_get_shader_constant_table_ex(void) 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); + constant_table = (ID3DXConstantTable *)0xdeadbeef; + hr = D3DXGetShaderConstantTableEx(shader_zero, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(constant_table == NULL, "D3DXGetShaderConstantTableEx() failed, got %p\n", constant_table); + + constant_table = (ID3DXConstantTable *)0xdeadbeef; + hr = D3DXGetShaderConstantTableEx(shader_invalid, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(constant_table == NULL, "D3DXGetShaderConstantTableEx() failed, got %p\n", constant_table); + + constant_table = (ID3DXConstantTable *)0xdeadbeef; + hr = D3DXGetShaderConstantTableEx(shader_empty, 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); + /* No CTAB data */ constant_table = (ID3DXConstantTable *)0xdeadbeef; hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table);

1 0

Rico Schüller : d3dx9: Use sizeof variable, not type.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 87ef00fc34ab4269064a1810788dcc864cd5da36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ef00fc34ab4269064a18107… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:24 2013 +0100 d3dx9: Use sizeof variable, not type. --- 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 81c8323..20fcb26 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1625,8 +1625,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, HRESULT hr; LPCVOID data; UINT size; - const D3DXSHADER_CONSTANTTABLE* ctab_header; - D3DXSHADER_CONSTANTINFO* constant_info; + const D3DXSHADER_CONSTANTTABLE *ctab_header; + D3DXSHADER_CONSTANTINFO *constant_info; DWORD i; TRACE("byte_code %p, flags %x, constant_table %p\n", byte_code, flags, constant_table); @@ -1654,14 +1654,14 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, return D3DXERR_INVALIDDATA; } - if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) + if (size < sizeof(*ctab_header)) { WARN("Invalid CTAB size.\n"); return D3DXERR_INVALIDDATA; } ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; - if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) + if (ctab_header->Size != sizeof(*ctab_header)) { WARN("Invalid D3DXSHADER_CONSTANTTABLE size.\n"); return D3DXERR_INVALIDDATA; @@ -1750,7 +1750,7 @@ HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, U hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (LPCVOID *)&data, &size); if (hr != D3D_OK) return D3D_OK; - if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) return D3D_OK; + if (size < sizeof(*ctab_header)) return D3D_OK; ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; if (ctab_header->Size != sizeof(*ctab_header)) return D3D_OK;

1 0

Rico Schüller : d3dx9: Constify some variables.
by Alexandre Julliard 08 Jan '13

08 Jan '13

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

Rico Schüller : d3dx9: Remove unused variable.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 7ff6afd091d51c2df2b2632350a5832fd2c7ee04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff6afd091d51c2df2b263235… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jan 7 21:57:33 2013 +0100 d3dx9: Remove unused variable. --- dlls/d3dx9_36/shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index ea459ce..3e28a03 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1736,10 +1736,9 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { - HRESULT hr; UINT i, sampler_count = 0; UINT size; - LPCSTR data; + const char *data; const D3DXSHADER_CONSTANTTABLE *ctab_header; const D3DXSHADER_CONSTANTINFO *constant_info; @@ -1747,8 +1746,8 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample if (count) *count = 0; - hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (LPCVOID *)&data, &size); - if (hr != D3D_OK) return D3D_OK; + if (D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (const void **)&data, &size) != D3D_OK) + return D3D_OK; if (size < sizeof(*ctab_header)) return D3D_OK;

1 0

André Hentschel : netstat: Don' t translate strings only translated in German.
by Alexandre Julliard 08 Jan '13

08 Jan '13

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