wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Martin Storsjo : ucrtbase: Implement _get_stream_buffer_pointers.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 8cc5b07e9d0aedffd4251d2e8942cb8368920bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc5b07e9d0aedffd4251d2e8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:25:27 2015 +0200 ucrtbase: Implement _get_stream_buffer_pointers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 2db8222..30570da 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl _get_fmode(ptr) ucrtbase._get_fmode @ cdecl _get_osfhandle(long) ucrtbase._get_osfhandle @ cdecl _get_printf_count_output() ucrtbase._get_printf_count_output -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) ucrtbase._get_stream_buffer_pointers @ cdecl _getc_nolock(ptr) ucrtbase._getc_nolock @ cdecl _getcwd(str long) ucrtbase._getcwd @ cdecl _getdcwd(long str long) ucrtbase._getdcwd diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f1de534..22bb925 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5303,3 +5303,18 @@ int CDECL MSVCRT__setmaxstdio(int newmax) MSVCRT_max_streams = newmax; return MSVCRT_max_streams; } + +/********************************************************************* + * _get_stream_buffer_pointers (UCRTBASE.@) + */ +int CDECL MSVCRT__get_stream_buffer_pointers(MSVCRT_FILE *file, char*** base, + char*** ptr, int** count) +{ + if (base) + *base = &file->_base; + if (ptr) + *ptr = &file->_ptr; + if (count) + *count = &file->_cnt; + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6877bef..4e8b3bb 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -373,7 +373,7 @@ @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ stub _get_purecall_handler -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ stub _get_thread_local_invalid_parameter_handler @ cdecl _get_timezone(ptr)

1 0

Sebastian Lackner : server: Wake up APC if we fail to allocate a handle in target process.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 41f7f19cb578c60d65dd8321d1de63aa9c09e271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f7f19cb578c60d65dd8321d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:58 2015 +0100 server: Wake up APC if we fail to allocate a handle in target process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index d65ea89..bad2231 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1500,10 +1500,10 @@ DECL_HANDLER(select) /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. */ - if (apc->call.type != APC_NONE) + if (apc->call.type != APC_NONE && + (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { - if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - reply->call = apc->call; + reply->call = apc->call; release_object( apc ); break; }

1 0

Sebastian Lackner : kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 659e585166d3440665588de939652294a5fd2e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659e585166d3440665588de93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:43 2015 +0100 kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 1065d5e..4ac6a99 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -56,6 +56,9 @@ static VOID (WINAPI *pReleaseSRWLockExclusive)(PSRWLOCK); static VOID (WINAPI *pReleaseSRWLockShared)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockExclusive)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); + +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) @@ -2394,8 +2397,105 @@ static void test_alertable_wait(void) CloseHandle(semaphores[1]); } +struct apc_deadlock_info +{ + PROCESS_INFORMATION *pi; + HANDLE event; + BOOL running; +}; + +static DWORD WINAPI apc_deadlock_thread(void *param) +{ + struct apc_deadlock_info *info = param; + PROCESS_INFORMATION *pi = info->pi; + NTSTATUS status; + SIZE_T size; + void *base; + + while (info->running) + { + base = NULL; + size = 0x1000; + status = pNtAllocateVirtualMemory(pi->hProcess, &base, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + ok(base != NULL, "expected base != NULL, got %p\n", base); + SetEvent(info->event); + + size = 0; + status = pNtFreeVirtualMemory(pi->hProcess, &base, &size, MEM_RELEASE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + SetEvent(info->event); + } + + return 0; +} + +static void test_apc_deadlock(void) +{ + struct apc_deadlock_info info; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + char cmdline[MAX_PATH]; + HANDLE event, thread; + DWORD result; + BOOL success; + char **argv; + int i; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" sync apc_deadlock", argv[0]); + success = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(success, "CreateProcess failed with %u\n", GetLastError()); + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed with %u\n", GetLastError()); + + info.pi = π + info.event = event; + info.running = TRUE; + + thread = CreateThread(NULL, 0, apc_deadlock_thread, &info, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + result = WaitForSingleObject(event, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + for (i = 0; i < 1000 && info.running; i++) + { + result = SuspendThread(pi.hThread); + ok(result == 0, "expected 0, got %u\n", result); + + WaitForSingleObject(event, 0); /* reset event */ + result = WaitForSingleObject(event, 1000); + if (result == WAIT_TIMEOUT) + { + todo_wine + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + info.running = FALSE; + } + else + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + result = ResumeThread(pi.hThread); + ok(result == 1, "expected 1, got %u\n", result); + Sleep(1); + } + + info.running = FALSE; + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + CloseHandle(thread); + CloseHandle(event); + + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + START_TEST(sync) { + char **argv; + int argc; HMODULE hdll = GetModuleHandleA("kernel32.dll"); HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2424,8 +2524,21 @@ START_TEST(sync) pReleaseSRWLockShared = (void *)GetProcAddress(hdll, "ReleaseSRWLockShared"); pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "TryAcquireSRWLockExclusive"); pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); + pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory"); + pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + if (!strcmp(argv[2], "apc_deadlock")) + { + HANDLE handle = GetCurrentThread(); + for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + } + return; + } + test_signalandwait(); test_mutex(); test_slist(); @@ -2442,4 +2555,5 @@ START_TEST(sync) test_srwlock_base(); test_srwlock_example(); test_alertable_wait(); + test_apc_deadlock(); }

1 0

Austin English : fltmgr.sys: Add FltInitializePushLock stub.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: f91a7b2cfe5b44fea333ed70b9fc38a509b7798a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91a7b2cfe5b44fea333ed70b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 4 10:46:50 2015 -0800 fltmgr.sys: Add FltInitializePushLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ include/ddk/ntifs.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 5310269..ea84d81 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -97,7 +97,7 @@ @ stub FltGetVolumeProperties @ stub FltInitializeFileLock @ stub FltInitializeOplock -@ stub FltInitializePushLock +@ stdcall FltInitializePushLock(ptr) @ stub FltIs32bitProcess @ stub FltIsCallbackDataDirty @ stub FltIsDirectory diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 7341ef2..70ee307 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -25,6 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "wine/debug.h" @@ -36,3 +38,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) return STATUS_SUCCESS; } + +void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index a8d90a1..32c9e30 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,6 +19,8 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; + typedef struct _KQUEUE { DISPATCHER_HEADER Header;

1 0

Bruno Jesus : include: Add definitions related to WSAPoll().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: d4664c132392e8bcd2ec565f5feae7330752eebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4664c132392e8bcd2ec565f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 4 21:59:00 2015 +0800 include: Add definitions related to WSAPoll(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/winsock2.h b/include/winsock2.h index d871a23..461b90c 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -112,6 +112,33 @@ extern "C" { #define SD_SEND 0x01 #define SD_BOTH 0x02 +/* Constants for WSAPoll() */ +#ifndef __WINE_WINE_PORT_H +#ifndef USE_WS_PREFIX +#define POLLERR 0x0001 +#define POLLHUP 0x0002 +#define POLLNVAL 0x0004 +#define POLLWRNORM 0x0010 +#define POLLWRBAND 0x0020 +#define POLLRDNORM 0x0100 +#define POLLRDBAND 0x0200 +#define POLLPRI 0x0400 +#define POLLIN (POLLRDNORM|POLLRDBAND) +#define POLLOUT (POLLWRNORM) +#else +#define WS_POLLERR 0x0001 +#define WS_POLLHUP 0x0002 +#define WS_POLLNVAL 0x0004 +#define WS_POLLWRNORM 0x0010 +#define WS_POLLWRBAND 0x0020 +#define WS_POLLRDNORM 0x0100 +#define WS_POLLRDBAND 0x0200 +#define WS_POLLPRI 0x0400 +#define WS_POLLIN (WS_POLLRDNORM|WS_POLLRDBAND) +#define WS_POLLOUT (WS_POLLWRNORM) +#endif +#endif + /* Constants for WSAIoctl() */ #ifdef USE_WS_PREFIX #define WS_IOC_UNIX 0x00000000 @@ -286,6 +313,13 @@ typedef struct _WSAPROTOCOLCHAIN #define SECURITY_PROTOCOL_NONE 0x0000 +typedef struct /*WS(pollfd)*/ +{ + SOCKET fd; + SHORT events; + SHORT revents; +} WSAPOLLFD; + #define WSAPROTOCOL_LEN 255 typedef struct _WSAPROTOCOL_INFOA { @@ -689,6 +723,7 @@ INT WINAPI WSALookupServiceNextW(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); int WINAPI WSANSPIoctl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); int WINAPI WSANtohl(SOCKET,ULONG,ULONG*); int WINAPI WSANtohs(SOCKET,WS(u_short),WS(u_short)*); +int WINAPI WSAPoll(WSAPOLLFD*,ULONG,int); INT WINAPI WSAProviderConfigChange(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); int WINAPI WSARecv(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); int WINAPI WSARecvDisconnect(SOCKET,LPWSABUF); @@ -763,6 +798,7 @@ typedef int (WINAPI *LPFN_WSANSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LP typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET,WS(u_short),WS(u_short)*); typedef INT (WINAPI *LPFN_WSAPROVIDERCONFIGCHANGE)(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); +typedef int (WINAPI *LPFN_WSAPOLL)(WSAPOLLFD*,ULONG,int); typedef int (WINAPI *LPFN_WSARECV)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef int (WINAPI *LPFN_WSARECVDISCONNECT)(SOCKET,LPWSABUF); typedef int (WINAPI *LPFN_WSARECVFROM)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,struct WS(sockaddr)*,LPINT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);

1 0

Jacek Caban : ntdll: Added NtOpenKeyEx implementation.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 4269423ee49046886fa21167f58c325c85fb6be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4269423ee49046886fa21167f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 4 15:28:49 2015 +0100 ntdll: Added NtOpenKeyEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/reg.c | 25 ++++++++++++++++++------- dlls/ntdll/tests/reg.c | 14 ++++++++++++++ include/winternl.h | 1 + 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38422ae..464b233 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -213,6 +213,7 @@ @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) +@ stdcall NtOpenKeyEx(ptr long ptr long) @ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @@ -1128,6 +1129,7 @@ @ stdcall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall ZwOpenKey(ptr long ptr) NtOpenKey +@ stdcall ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx @ stdcall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a104c2e..c0fc641 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -106,14 +106,10 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC } /****************************************************************************** - * NtOpenKey [NTDLL.@] - * ZwOpenKey [NTDLL.@] - * - * OUT HANDLE retkey (returns 0 when failure) - * IN ACCESS_MASK access - * IN POBJECT_ATTRIBUTES attr + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] */ -NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; DWORD len; @@ -123,6 +119,8 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR len = attr->ObjectName->Length; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); + if (options) + FIXME("options %x not implemented\n", options); if (len > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW; @@ -141,6 +139,19 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR } /****************************************************************************** + * NtOpenKey [NTDLL.@] + * ZwOpenKey [NTDLL.@] + * + * OUT HANDLE retkey (returns 0 when failure) + * IN ACCESS_MASK access + * IN POBJECT_ATTRIBUTES attr + */ +NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + return NtOpenKeyEx( retkey, access, attr, 0 ); +} + +/****************************************************************************** * RtlpNtOpenKey [NTDLL.@] * * See NtOpenKey. diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 6d04668..ecfe1b2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -123,6 +123,7 @@ static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_Q static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI * pNtOpenKeyEx)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); @@ -195,6 +196,7 @@ static BOOL InitFunctionPtrs(void) /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); + pNtOpenKeyEx = (void *)GetProcAddress(hntdll, "NtOpenKeyEx"); return TRUE; } @@ -351,6 +353,18 @@ static void test_NtOpenKey(void) attr.Length *= 2; status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + + if (!pNtOpenKeyEx) + { + win_skip("NtOpenKeyEx not available\n"); + return; + } + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKeyEx(&key, KEY_WRITE|KEY_READ, &attr, 0); + ok(status == STATUS_SUCCESS, "NtOpenKeyEx Failed: 0x%08x\n", status); + + pNtClose(key); } static void test_NtCreateKey(void) diff --git a/include/winternl.h b/include/winternl.h index 5420391..f3de636 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_ NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); NTSYSAPI NTSTATUS WINAPI NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Alex Henrie : opengl32: Define the 2D identity matrix once, at the top of the file.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 56c045c68e37583414c175199e01644751e76e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c045c68e37583414c175199… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:03:47 2015 -0700 opengl32: Define the 2D identity matrix once, at the top of the file. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ee2ae25..42bf920 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -92,6 +92,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; + static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); @@ -1212,7 +1214,6 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); for (glyph = first; glyph < first + count; glyph++) { - static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; unsigned int needed_size, height, width, width_int; if (unicode) @@ -1479,7 +1480,6 @@ static BOOL wglUseFontOutlines_common(HDC hdc, { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; - const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; GLUtesselator *tess = NULL; LOGFONTW lf; HFONT old_font, unscaled_font;

1 0

Alex Henrie : opengl32: Avoid double initialization of variables in WGL functions.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 268070d9a8fc3210ac3ffe2e6a9943dbd89c042b URL: http://source.winehq.org/git/wine.git/?a=commit;h=268070d9a8fc3210ac3ffe2e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:06:13 2015 -0700 opengl32: Avoid double initialization of variables in WGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index acfb243..ee2ae25 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1057,7 +1057,7 @@ BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int format, int layer, UINT c */ HPBUFFERARB WINAPI wglCreatePbufferARB( HDC hdc, int format, int width, int height, const int *attribs ) { - HPBUFFERARB ret = 0; + HPBUFFERARB ret; struct wgl_pbuffer *pbuffer; struct opengl_funcs *funcs = get_dc_funcs( hdc ); @@ -1749,7 +1749,7 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) static GLubyte *filter_extensions_list(const char *extensions, const char *disabled) { - char *p, *str = NULL; + char *p, *str; const char *end; p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); @@ -1785,7 +1785,7 @@ static GLuint *filter_extensions_index(const char *disabled) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *ext, *end, *gl_ext; - GLuint *disabled_exts = NULL, *new_disabled_exts; + GLuint *disabled_exts, *new_disabled_exts; unsigned int i = 0, j, disabled_size; GLint extensions_count;

1 0

Alex Henrie : winex11: Avoid double initialization of variables in OpenGL functions.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 6479e32cf0ee235d7dcbd4c353785367c39ca12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6479e32cf0ee235d7dcbd4c35… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 3 22:15:15 2015 -0700 winex11: Avoid double initialization of variables in OpenGL functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7b8ba82..99befde 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -997,7 +997,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) { - int render_type=0, render_type_bit; + int render_type, render_type_bit; pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); switch(render_type_bit) { @@ -1015,6 +1015,7 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) break; default: ERR("Unknown render_type: %x\n", render_type_bit); + render_type = 0; } return render_type; } @@ -1787,7 +1788,7 @@ static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d */ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) @@ -2037,7 +2038,7 @@ static const GLubyte *wglGetString(GLenum name) static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, const int* attribList ) { - struct wgl_context *ret = NULL; + struct wgl_context *ret; struct gl_drawable *gl; int err = 0; @@ -2134,8 +2135,8 @@ static const char *X11DRV_wglGetExtensionsStringARB(HDC hdc) static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList ) { - struct wgl_pbuffer* object = NULL; - const struct wgl_pixel_format *fmt = NULL; + struct wgl_pbuffer* object; + const struct wgl_pixel_format *fmt; int attribs[256]; int nAttribs = 0; @@ -2507,7 +2508,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c { int attribs[256]; int nAttribs = 0; - GLXFBConfig* cfgs = NULL; + GLXFBConfig* cfgs; int nCfgs = 0; int it; int fmt_id; @@ -2613,7 +2614,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int UINT nAttributes, const int *piAttributes, int *piValues ) { UINT i; - const struct wgl_pixel_format *fmt = NULL; + const struct wgl_pixel_format *fmt; int hTest; int tmp; int curGLXAttr = 0; @@ -3029,7 +3030,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) { struct wgl_context *ctx = NtCurrentTeb()->glContext; struct gl_drawable *gl; - BOOL ret = TRUE; + BOOL ret; TRACE("(%d)\n", interval);

1 0

Alexandre Julliard : x3daudio1_7: Remove unused debug channel.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 97e7affe32b9c25e43d86775ee70703031ab21cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e7affe32b9c25e43d86775e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 18:54:24 2015 +0900 x3daudio1_7: Remove unused debug channel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/x3daudio1_7/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 7f64112..5d1a5a5 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include <stdarg.h> @@ -22,10 +23,6 @@ #include "winbase.h" #include "x3daudio.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x3daudio); - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015