August 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : ws2_32/tests: Fix test failures on Vista.
by Alexandre Julliard Aug. 28, 2009

Aug. 28, 2009

Module: wine Branch: master Commit: 19c572f3dc771ffe5a5ccb8659024eeeb6a6ad43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c572f3dc771ffe5a5ccb865… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 20:45:18 2009 +0200 ws2_32/tests: Fix test failures on Vista. --- dlls/ws2_32/tests/sock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 82c53e2..2127954 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2062,6 +2062,7 @@ static void test_extendedSocketOptions(void) /* IE 3 use 0xffffffff instead of SOL_SOCKET (0xffff) */ SetLastError(0xdeadbeef); optval = 0xdeadbeef; + optlen = sizeof(int); ret = getsockopt(sock, 0xffffffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", @@ -2070,6 +2071,7 @@ static void test_extendedSocketOptions(void) /* more invalid values for level */ SetLastError(0xdeadbeef); optval = 0xdeadbeef; + optlen = sizeof(int); ret = getsockopt(sock, 0x1234ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", @@ -2077,6 +2079,7 @@ static void test_extendedSocketOptions(void) SetLastError(0xdeadbeef); optval = 0xdeadbeef; + optlen = sizeof(int); ret = getsockopt(sock, 0x8000ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", @@ -2084,6 +2087,7 @@ static void test_extendedSocketOptions(void) SetLastError(0xdeadbeef); optval = 0xdeadbeef; + optlen = sizeof(int); ret = getsockopt(sock, 0x00008000, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", @@ -2091,6 +2095,7 @@ static void test_extendedSocketOptions(void) SetLastError(0xdeadbeef); optval = 0xdeadbeef; + optlen = sizeof(int); ret = getsockopt(sock, 0x00000800, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",

1 0

Alexandre Julliard : setupapi: Fix a structure size check for 64-bit.
by Alexandre Julliard Aug. 28, 2009

Aug. 28, 2009

Module: wine Branch: master Commit: aaf908ab323126f2dac09ddfdd053267591e5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf908ab323126f2dac09ddfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 20:23:40 2009 +0200 setupapi: Fix a structure size check for 64-bit. --- dlls/setupapi/devinst.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8a18138..89e3cb6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2916,8 +2916,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( { struct DeviceInfoSet *set = DeviceInfoSet; struct InterfaceInfo *info; - DWORD bytesNeeded = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) - + 1; + DWORD bytesNeeded = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); BOOL ret = FALSE; TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, @@ -2937,8 +2936,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize != - offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char))) + if (DeviceInterfaceDetailData && + DeviceInterfaceDetailData->cbSize != sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A)) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE;

1 0

Alexandre Julliard : ntdll: Define correct address space limits for x86_64.
by Alexandre Julliard Aug. 28, 2009

Aug. 28, 2009

Module: wine Branch: master Commit: fdf191a9e0a43daa5049542a49917bc6e1f5567b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf191a9e0a43daa5049542a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 19:46:45 2009 +0200 ntdll: Define correct address space limits for x86_64. --- dlls/ntdll/virtual.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 77e880a..dc9559e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -122,6 +122,13 @@ static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; 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 */ +#elif defined(__x86_64__) +# define page_mask 0xfff +# define page_shift 12 +# define page_size 0x1000 +static void *address_space_limit = (void *)0x7fffffff0000; +static void *user_space_limit = (void *)0x7fffffff0000; +static void *working_set_limit = (void *)0x7fffffff0000; #else static UINT page_shift; static UINT_PTR page_size;

1 0

Alexandre Julliard : ntdll: Return the expected length in NtQueryInformationProcess.
by Alexandre Julliard Aug. 28, 2009

Aug. 28, 2009

Module: wine Branch: master Commit: 5e30947d0b87e5c1e40ad62f54b408380a5dd9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e30947d0b87e5c1e40ad62f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 19:46:28 2009 +0200 ntdll: Return the expected length in NtQueryInformationProcess. --- dlls/ntdll/process.c | 59 +++++++++++++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6a2c66d..2f86e2d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -181,7 +181,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( if (ProcessInformationLength > sizeof(PROCESS_BASIC_INFORMATION)) ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + { + len = sizeof(PROCESS_BASIC_INFORMATION); + ret = STATUS_INFO_LENGTH_MISMATCH; + } } break; case ProcessIoCounters: @@ -207,7 +211,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( if (ProcessInformationLength > sizeof(IO_COUNTERS)) ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + { + len = sizeof(IO_COUNTERS); + ret = STATUS_INFO_LENGTH_MISMATCH; + } } break; case ProcessVmCounters: @@ -236,7 +244,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( ProcessInformationLength != sizeof(VM_COUNTERS)) ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + { + len = sizeof(pvmi); + ret = STATUS_INFO_LENGTH_MISMATCH; + } } break; case ProcessTimes: @@ -266,25 +278,27 @@ NTSTATUS WINAPI NtQueryInformationProcess( SERVER_END_REQ; memcpy(ProcessInformation, &pti, sizeof(KERNEL_USER_TIMES)); - len = sizeof(KERNEL_USER_TIMES); } if (ProcessInformationLength > sizeof(KERNEL_USER_TIMES)) ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + { + len = sizeof(KERNEL_USER_TIMES); + ret = STATUS_INFO_LENGTH_MISMATCH; + } } break; case ProcessDebugPort: /* "These are not the debuggers you are looking for." * * set it to 0 aka "no debugger" to satisfy copy protections */ - if (ProcessInformationLength == 4) - { + len = 4; + if (ProcessInformationLength == len) memset(ProcessInformation, 0, ProcessInformationLength); - len = 4; - } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + ret = STATUS_INFO_LENGTH_MISMATCH; break; case ProcessHandleCount: if (ProcessInformationLength >= 4) @@ -296,18 +310,21 @@ NTSTATUS WINAPI NtQueryInformationProcess( else { memset(ProcessInformation, 0, 4); - - len = 4; } if (ProcessInformationLength > 4) ret = STATUS_INFO_LENGTH_MISMATCH; - } - else ret = STATUS_INFO_LENGTH_MISMATCH; - break; + } + else + { + len = 4; + ret = STATUS_INFO_LENGTH_MISMATCH; + } + break; case ProcessWow64Information: - if (ProcessInformationLength == sizeof(DWORD)) + len = sizeof(DWORD); + if (ProcessInformationLength == len) { DWORD val = 0; @@ -322,7 +339,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( SERVER_END_REQ; } *(DWORD *)ProcessInformation = val; - len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; break; @@ -350,12 +366,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( SERVER_END_REQ; break; case ProcessExecuteFlags: - if (ProcessInformationLength == sizeof(ULONG)) - { + len = sizeof(ULONG); + if (ProcessInformationLength == len) *(ULONG *)ProcessInformation = execute_flags; - len = sizeof(ULONG); - } - else ret = STATUS_INFO_LENGTH_MISMATCH; + else + ret = STATUS_INFO_LENGTH_MISMATCH; break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n",

1 0

Alexandre Julliard : ntdll: Fix a couple of system information structures for 64-bit.
by Alexandre Julliard Aug. 28, 2009

Aug. 28, 2009

Module: wine Branch: master Commit: 2be006e497ab67d6a625e93049397e128fff370d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be006e497ab67d6a625e9304… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 19:30:50 2009 +0200 ntdll: Fix a couple of system information structures for 64-bit. --- dlls/kernel32/cpu.c | 10 +++++----- dlls/ntdll/nt.c | 24 ++++++++++++------------ dlls/ntdll/virtual.c | 22 +++++++++++----------- include/winternl.h | 31 +++++++++++-------------------- 4 files changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index bc890c6..6648dc4 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -379,11 +379,11 @@ VOID WINAPI GetSystemInfo( memset(PF,0,sizeof(PF)); NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL ); - cachedsi.dwPageSize = sbi.uPageSize; - cachedsi.lpMinimumApplicationAddress = sbi.pLowestUserAddress; - cachedsi.lpMaximumApplicationAddress = sbi.pMmHighestUserAddress; - cachedsi.dwNumberOfProcessors = sbi.uKeActiveProcessors; - cachedsi.dwAllocationGranularity = sbi.uAllocationGranularity; + cachedsi.dwPageSize = sbi.PageSize; + cachedsi.lpMinimumApplicationAddress = sbi.LowestUserAddress; + cachedsi.lpMaximumApplicationAddress = sbi.HighestUserAddress; + cachedsi.dwNumberOfProcessors = sbi.ActiveProcessors; + cachedsi.dwAllocationGranularity = sbi.AllocationGranularity; /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8679da5..279a525 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1038,9 +1038,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( { sppi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - sppi->liIdleTime.QuadPart = idle; - sppi->liKernelTime.QuadPart = sys; - sppi->liUserTime.QuadPart = usr; + sppi->IdleTime.QuadPart = idle; + sppi->KernelTime.QuadPart = sys; + sppi->UserTime.QuadPart = usr; cpus = 1; len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); } @@ -1057,17 +1057,17 @@ NTSTATUS WINAPI NtQuerySystemInformation( out_cpus --; if (name[3]=='0') /* first cpu */ { - sppi->liIdleTime.QuadPart = idle; - sppi->liKernelTime.QuadPart = sys; - sppi->liUserTime.QuadPart = usr; + sppi->IdleTime.QuadPart = idle; + sppi->KernelTime.QuadPart = sys; + sppi->UserTime.QuadPart = usr; } else /* new cpu */ { len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); - sppi[cpus].liIdleTime.QuadPart = idle; - sppi[cpus].liKernelTime.QuadPart = sys; - sppi[cpus].liUserTime.QuadPart = usr; + sppi[cpus].IdleTime.QuadPart = idle; + sppi[cpus].KernelTime.QuadPart = sys; + sppi[cpus].UserTime.QuadPart = usr; cpus++; } } @@ -1090,9 +1090,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( /* many programs expect these values to change so fake change */ len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - sppi->liKernelTime.QuadPart = 1 * i; - sppi->liUserTime.QuadPart = 2 * i; - sppi->liIdleTime.QuadPart = 3 * i; + sppi->KernelTime.QuadPart = 1 * i; + sppi->UserTime.QuadPart = 2 * i; + sppi->IdleTime.QuadPart = 3 * i; i++; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 62176e4..77e880a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1364,17 +1364,17 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { - info->dwUnknown1 = 0; - info->uKeMaximumIncrement = 0; /* FIXME */ - info->uPageSize = page_size; - info->uMmLowestPhysicalPage = 1; - info->uMmHighestPhysicalPage = 0x7fffffff / page_size; - info->uMmNumberOfPhysicalPages = info->uMmHighestPhysicalPage - info->uMmLowestPhysicalPage; - info->uAllocationGranularity = get_mask(0) + 1; - info->pLowestUserAddress = (void *)0x10000; - info->pMmHighestUserAddress = (char *)user_space_limit - 1; - info->uKeActiveProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; - info->bKeNumberProcessors = info->uKeActiveProcessors; + info->unknown = 0; + info->KeMaximumIncrement = 0; /* FIXME */ + info->PageSize = page_size; + info->MmLowestPhysicalPage = 1; + info->MmHighestPhysicalPage = 0x7fffffff / page_size; + info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; + info->AllocationGranularity = get_mask(0) + 1; + info->LowestUserAddress = (void *)0x10000; + info->HighestUserAddress = (char *)user_space_limit - 1; + info->ActiveProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; + info->NumberOfProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; } diff --git a/include/winternl.h b/include/winternl.h index e4d8055..aca74e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1187,19 +1187,17 @@ typedef struct _RTL_RWLOCK { typedef struct _SYSTEM_BASIC_INFORMATION { #ifdef __WINESRC__ - DWORD dwUnknown1; - ULONG uKeMaximumIncrement; - ULONG uPageSize; - ULONG uMmNumberOfPhysicalPages; - ULONG uMmLowestPhysicalPage; - ULONG uMmHighestPhysicalPage; - ULONG uAllocationGranularity; - PVOID pLowestUserAddress; - PVOID pMmHighestUserAddress; - ULONG uKeActiveProcessors; - BYTE bKeNumberProcessors; - BYTE bUnknown2; - WORD wUnknown3; + DWORD unknown; + ULONG KeMaximumIncrement; + ULONG PageSize; + ULONG MmNumberOfPhysicalPages; + ULONG MmLowestPhysicalPage; + ULONG MmHighestPhysicalPage; + ULONG_PTR AllocationGranularity; + PVOID LowestUserAddress; + PVOID HighestUserAddress; + ULONG_PTR ActiveProcessors; + BYTE NumberOfProcessors; #else BYTE Reserved1[24]; PVOID Reserved2[4]; @@ -1260,18 +1258,11 @@ typedef struct _SYSTEM_TIMEOFDAY_INFORMATION { /* System Information Class 0x08 */ typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION { -#ifdef __WINESRC__ - LARGE_INTEGER liIdleTime; - LARGE_INTEGER liKernelTime; - LARGE_INTEGER liUserTime; - DWORD dwSpare[5]; -#else LARGE_INTEGER IdleTime; LARGE_INTEGER KernelTime; LARGE_INTEGER UserTime; LARGE_INTEGER Reserved1[2]; ULONG Reserved2; -#endif } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; /* System Information Class 0x0b */

1 0

Alexandre Julliard : ntdll: Fix handling of the duplicate MxCsr entry in the x86_64 context.
by Alexandre Julliard Aug. 27, 2009

Aug. 27, 2009

Module: wine Branch: master Commit: b8ae3f073bafadf48b8ce0985010a63dfd3ccd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ae3f073bafadf48b8ce0985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 16:38:47 2009 +0200 ntdll: Fix handling of the duplicate MxCsr entry in the x86_64 context. --- dlls/ntdll/signal_x86_64.c | 7 +++---- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/trace.c | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1a0fd88..5cb2c9e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1019,11 +1019,11 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) #else __asm__("movw %%ss,%0" : "=m" (context->SegSs)); #endif - context->MxCsr = 0; /* FIXME */ if (FPU_sig(sigcontext)) { context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); + context->MxCsr = context->u.FltSave.MxCsr; } } @@ -1107,7 +1107,6 @@ void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) to->SegCs = from->SegCs; to->SegSs = from->SegSs; to->EFlags = from->EFlags; - to->MxCsr = from->MxCsr; } if (flags & CONTEXT_INTEGER) { @@ -1135,6 +1134,7 @@ void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) } if (flags & CONTEXT_FLOATING_POINT) { + to->MxCsr = from->MxCsr; to->u.FltSave = from->u.FltSave; } if (flags & CONTEXT_DEBUG_REGISTERS) @@ -1170,7 +1170,6 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->ctl.x86_64_regs.cs = from->SegCs; to->ctl.x86_64_regs.ss = from->SegSs; to->ctl.x86_64_regs.flags = from->EFlags; - to->ctl.x86_64_regs.mxcsr = from->MxCsr; } if (flags & CONTEXT_INTEGER) { @@ -1236,7 +1235,6 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->SegCs = from->ctl.x86_64_regs.cs; to->SegSs = from->ctl.x86_64_regs.ss; to->EFlags = from->ctl.x86_64_regs.flags; - to->MxCsr = from->ctl.x86_64_regs.mxcsr; } if (from->flags & SERVER_CTX_INTEGER) @@ -1269,6 +1267,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { to->ContextFlags |= CONTEXT_FLOATING_POINT; memcpy( &to->u.FltSave, from->fp.x86_64_regs.fpregs, sizeof(from->fp.x86_64_regs.fpregs) ); + to->MxCsr = to->u.FltSave.MxCsr; } if (from->flags & SERVER_CTX_DEBUG_REGISTERS) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6ab1df2..0b18b50 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -143,7 +143,7 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags, mxcsr; } x86_64_regs; + unsigned int cs, ss, flags; } x86_64_regs; struct { unsigned __int64 fir; unsigned int psr; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; @@ -5347,6 +5347,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 389 +#define SERVER_PROTOCOL_VERSION 390 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index d6b282a..9748931 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -159,7 +159,7 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags, mxcsr; } x86_64_regs; + unsigned int cs, ss, flags; } x86_64_regs; struct { unsigned __int64 fir; unsigned int psr; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; diff --git a/server/trace.c b/server/trace.c index 38a20b7..511c460 100644 --- a/server/trace.c +++ b/server/trace.c @@ -457,9 +457,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uint64( ",rip=", &ctx.ctl.x86_64_regs.rip ); dump_uint64( ",rbp=", &ctx.ctl.x86_64_regs.rbp ); dump_uint64( ",rsp=", &ctx.ctl.x86_64_regs.rsp ); - fprintf( stderr, ",cs=%04x,ss=%04x,flags=%08x,mxcsr=%08x", - ctx.ctl.x86_64_regs.cs, ctx.ctl.x86_64_regs.ss, - ctx.ctl.x86_64_regs.flags, ctx.ctl.x86_64_regs.mxcsr ); + fprintf( stderr, ",cs=%04x,ss=%04x,flags=%08x", + ctx.ctl.x86_64_regs.cs, ctx.ctl.x86_64_regs.ss, ctx.ctl.x86_64_regs.flags ); } if (ctx.flags & SERVER_CTX_INTEGER) {

1 0

Huw Davies : include: Add msdadc.idl.
by Alexandre Julliard Aug. 27, 2009

Aug. 27, 2009

Module: wine Branch: master Commit: 0223f71dc7f5c3bfab724aa39d2e7585b379b68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0223f71dc7f5c3bfab724aa39… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 27 12:34:59 2009 +0100 include: Add msdadc.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/dbs.idl | 4 ++ include/msdadc.idl | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 5 files changed, 99 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 78ae433..049657d 100644 --- a/.gitignore +++ b/.gitignore @@ -139,6 +139,7 @@ include/mlang.h include/mmstream.h include/mscoree.h include/msctf.h +include/msdadc.h include/mshtmhst.h include/mshtml.h include/msinkaut.h diff --git a/include/Makefile.in b/include/Makefile.in index cfcfd54..24c392f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -45,6 +45,7 @@ PUBLIC_IDL_H_SRCS = \ mmstream.idl \ mscoree.idl \ msctf.idl \ + msdadc.idl \ mshtmhst.idl \ mshtml.idl \ msinkaut.idl \ diff --git a/include/dbs.idl b/include/dbs.idl index 9909c9d..57ccf27 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -109,3 +109,7 @@ typedef struct tagDBIMPLICITSESSION IID *piid; IUnknown *pSession; } DBIMPLICITSESSION; + +typedef WORD DBTYPE; + +typedef DWORD DBSTATUS; diff --git a/include/msdadc.idl b/include/msdadc.idl new file mode 100644 index 0000000..b1954c2 --- /dev/null +++ b/include/msdadc.idl @@ -0,0 +1,92 @@ +/* + * Copyright 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "oledb.idl"; + +[ + object, + pointer_default(unique), + uuid(0c733a8d-2a1c-11ce-ade5-00aa0044773d) +] +interface IDataConvert : IUnknown +{ + typedef DWORD DBDATACONVERT; + + enum DBDATACONVERTENUM + { + DBDATACONVERT_DEFAULT = 0, + DBDATACONVERT_SETDATABEHAVIOR = 1, + DBDATACONVERT_LENGTHFROMNTS = 2, + DBDATACONVERT_DSTISFIXEDLENGTH = 4, + DBDATACONVERT_DECIMALSCALE = 8 + }; + + [local] HRESULT DataConvert([in] DBTYPE wSrcType, + [in] DBTYPE wDstType, + [in] DBLENGTH cbSrcLength, + [in, out] DBLENGTH *pcbDstLength, + [in] void *pSrc, + [out] void *pDst, + [in] DBLENGTH cbDstMaxLength, + [in] DBSTATUS dbsSrcStatus, + [out] DBSTATUS *pdbsDstStatus, + [in] BYTE bPrecision, + [in] BYTE bScale, + [in] DBDATACONVERT dwFlags); + + + HRESULT CanConvert([in] DBTYPE wSrcType, + [in] DBTYPE wDstType); + + + [local] HRESULT GetConversionSize([in] DBTYPE wSrcType, + [in] DBTYPE wDstType, + [in] DBLENGTH *pcbSrcLength, + [out] DBLENGTH *pcbDstLength, + [in, size_is(*pcbSrcLength)] void *pSrc); +}; + +[ + object, + pointer_default(unique), + uuid(0c733a9c-2a1c-11ce-ade5-00aa0044773d) +] +interface IDCInfo : IUnknown +{ + typedef DWORD DCINFOTYPE; + + enum DCINFOTYPEENUM + { + DCINFOTYPE_VERSION = 1 + }; + + typedef struct tagDCINFO + { + DCINFOTYPE eInfoType; + VARIANT vData; + } DCINFO; + + HRESULT GetInfo([in] ULONG cInfo, + [in, size_is(cInfo)] DCINFOTYPE rgeInfoType[], + [out, size_is(cInfo)] DCINFO **prgInfo); + + HRESULT SetInfo([in] ULONG cInfo, + [in, size_is(cInfo)] DCINFO prgInfo[]); +}; diff --git a/include/oledb.idl b/include/oledb.idl index b973bb9..5c66912 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -30,6 +30,7 @@ import "urlmon.idl"; typedef ULONG DBBYTEOFFSET; typedef ULONG DBCOUNTITEM; +typedef ULONG DBLENGTH; #include "dbs.idl"

1 0

Louis Lenders : psapi: Add version resource.
by Alexandre Julliard Aug. 27, 2009

Aug. 27, 2009

Module: wine Branch: master Commit: 2249f366767924de65035992db43cbc92fb1c559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2249f366767924de65035992d… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 27 12:10:57 2009 +0200 psapi: Add version resource. --- dlls/psapi/Makefile.in | 2 ++ dlls/psapi/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index 557ac12..93da7aa 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = kernel32 ntdll C_SRCS = \ psapi_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/psapi/version.rc b/dlls/psapi/version.rc new file mode 100644 index 0000000..a54d835 --- /dev/null +++ b/dlls/psapi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Process Status Helper" +#define WINE_FILENAME_STR "psapi.dll" +#define WINE_FILEVERSION 5,1,2600,3264 +#define WINE_FILEVERSION_STR "5.1.2600.3264" +#define WINE_PRODUCTVERSION 5,1,2600,3264 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3264" + +#include "wine/wine_common_ver.rc"

1 0

Louis Lenders : dbghelp: Add version resource.
by Alexandre Julliard Aug. 27, 2009

Aug. 27, 2009

Module: wine Branch: master Commit: a6aa4e13577d999e7513b47a51b254e30d5a3494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6aa4e13577d999e7513b47a5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 27 11:57:36 2009 +0200 dbghelp: Add version resource. --- dlls/dbghelp/Makefile.in | 2 ++ dlls/dbghelp/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index b75014d..a44d3c9 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -29,6 +29,8 @@ C_SRCS = \ symbol.c \ type.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dbghelp/version.rc b/dlls/dbghelp/version.rc new file mode 100644 index 0000000..1818010 --- /dev/null +++ b/dlls/dbghelp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Image Helper" +#define WINE_FILENAME_STR "dbghelp.dll" +#define WINE_FILEVERSION 5,1,2600,3264 +#define WINE_FILEVERSION_STR "5.1.2600.3264" +#define WINE_PRODUCTVERSION 5,1,2600,3264 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3264" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dxdiag: Add basic command line parsing.
by Alexandre Julliard Aug. 27, 2009

Aug. 27, 2009

Module: wine Branch: master Commit: 93e7c6b23a3d1e0274b3eef44ad26cfa73c85cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e7c6b23a3d1e0274b3eef44… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 26 15:38:02 2009 -0500 dxdiag: Add basic command line parsing. Based on a patch by Dan Kegel. --- programs/dxdiag/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d8a4866..5334b22 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -20,9 +20,77 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include "wine/debug.h" #include "wine/unicode.h" +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* + Process options [/WHQL:ON|OFF][/X outfile][/T outfile] + Returns TRUE if options were present, FALSE otherwise + FIXME: Native behavior seems to be: + Only one of /X and /T is allowed, /WHQL must come before /X and /T, + quotes are optional around the filename, even if it contains spaces. +*/ + +static BOOL ProcessCommandLine(LPWSTR cmdline) +{ + const WCHAR *s = cmdline; + WCHAR outfile[MAX_PATH+1]; + int opt_t = FALSE; + int opt_x = FALSE; + int opt_help = FALSE; + int opt_given = FALSE; + int want_arg = FALSE; + + outfile[0] = 0; + while (*s) { + /* Skip whitespace before arg */ + while (*s == ' ') + s++; + /* Check for option */ + if (*s != '-' && *s != '/') + return FALSE; + s++; + switch (*s++) { + case 'T': + case 't': opt_t = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 'X': + case 'x': opt_x = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 'W': + case 'w': + opt_given = TRUE; + while (isalphaW(*s) || *s == ':') + s++; + break; + default: opt_help = TRUE; opt_given = TRUE; break; + } + /* Skip any spaces before next option or filename */ + while (*s == ' ') + s++; + if (want_arg) { + int i; + if (*s == '"') + s++; + for (i=0; i < MAX_PATH && *s && *s != '"'; i++, s++) + outfile[i] = *s; + outfile[i] = 0; + break; + } + } + if (opt_help) + WINE_FIXME("help unimplemented\n"); + if (opt_t) + WINE_FIXME("/t unimplemented\n"); + if (opt_x) + WINE_FIXME("/x unimplemented\n"); + return opt_given; +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { + if (ProcessCommandLine(cmdline)) + return 0; + return 0; }

1 0