March 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : wshom.ocx: Implement ProcessID() property.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 2a925eba2006e815218d5ec3790f7f61aff14542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a925eba2006e815218d5ec37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 20:10:47 2015 +0300 wshom.ocx: Implement ProcessID() property. --- dlls/wshom.ocx/shell.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 6d1b80b..dcf1462 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -236,9 +236,13 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) { WshExec *This = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, pid); + TRACE("(%p)->(%p)\n", This, pid); - return E_NOTIMPL; + if (!pid) + return E_INVALIDARG; + + *pid = This->info.dwProcessId; + return S_OK; } static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code)

1 0

Qian Hong : ntdll: Implemented FileNetworkOpenInformation class support in NtQueryInformationFile.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 2a098ab8a8b500362237943770f81c3f063d2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a098ab8a8b50036223794377… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Mar 10 05:17:08 2015 +0800 ntdll: Implemented FileNetworkOpenInformation class support in NtQueryInformationFile. --- dlls/ntdll/file.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b07e5f9..3bd2c31 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2190,7 +2190,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileMoveClusterInformation */ 0, /* FileQuotaInformation */ 0, /* FileReparsePointInformation */ - 0, /* FileNetworkOpenInformation */ + sizeof(FILE_NETWORK_OPEN_INFORMATION), /* FileNetworkOpenInformation */ 0, /* FileAttributeTagInformation */ 0, /* FileTrackingInformation */ 0, /* FileIdBothDirectoryInformation */ @@ -2414,6 +2414,40 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } } break; + case FileNetworkOpenInformation: + { + FILE_NETWORK_OPEN_INFORMATION *info = ptr; + ANSI_STRING unix_name; + + if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) + { + ULONG attributes; + struct stat st; + + if (get_file_info( unix_name.Buffer, &st, &attributes ) == -1) + io->u.Status = FILE_GetNtStatus(); + else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + io->u.Status = STATUS_INVALID_INFO_CLASS; + else + { + FILE_BASIC_INFORMATION basic; + FILE_STANDARD_INFORMATION std; + + fill_file_info( &st, attributes, &basic, FileBasicInformation ); + fill_file_info( &st, attributes, &std, FileStandardInformation ); + + info->CreationTime = basic.CreationTime; + info->LastAccessTime = basic.LastAccessTime; + info->LastWriteTime = basic.LastWriteTime; + info->ChangeTime = basic.ChangeTime; + info->AllocationSize = std.AllocationSize; + info->EndOfFile = std.EndOfFile; + info->FileAttributes = basic.FileAttributes; + } + RtlFreeAnsiString( &unix_name ); + } + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED;

1 0

Francois Gouget : compstui: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 387232e2ac023559072833725cdea72317b8e67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=387232e2ac023559072833725… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:20:54 2015 +0100 compstui: Remove an uneeded NONAMELESSUNION directive. --- dlls/compstui/compstui_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index 41b2441..0225036 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : crypt32: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: fc49e63d71efac9929d83a9b7dc931d87311bdae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49e63d71efac9929d83a9b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:21:02 2015 +0100 crypt32: Remove an uneeded NONAMELESSUNION directive. --- dlls/crypt32/ctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index c18e608..b8b728f 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -20,7 +20,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h"

1 0

Francois Gouget : cryptnet: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 16a77b89e99948690393e4384b6d5d6fe76bd0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a77b89e99948690393e4384… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:21:12 2015 +0100 cryptnet: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/cryptnet/cryptnet_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 90057d9..9d05a91 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -22,7 +22,6 @@ #include "wine/port.h" #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include <stdio.h>

1 0

Francois Gouget : cryptnet/tests: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: d30c037a1e04fb921352620d769eb28bbf401a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30c037a1e04fb921352620d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:25:49 2015 +0100 cryptnet/tests: Remove an uneeded NONAMELESSUNION directive. --- dlls/cryptnet/tests/cryptnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 4ab88ec..8600fda 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -19,7 +19,7 @@ */ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION + #include <windef.h> #include <winbase.h> #include <winerror.h>

1 0

Francois Gouget : d3d8: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: ae7dfe274f7a1a6f2c241eee39c6cef0bae8c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7dfe274f7a1a6f2c241eee3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:26:25 2015 +0100 d3d8: Remove unneeded NONAMELESSXXX directives. --- dlls/d3d8/device.c | 2 -- dlls/d3d8/directx.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a4802d..464aced 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -24,8 +24,6 @@ #include <math.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 23100f2..75c8218 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -24,8 +24,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : dbghelp: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 654657b7151352699152f86c5520197f3c6e1c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=654657b7151352699152f86c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:26:31 2015 +0100 dbghelp: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/dbghelp/symbol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3e7877a..cbe232b 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -20,7 +20,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "config.h"

1 0

Austin English : dxdiagn: Add bNoHardware stub property.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 5f356efa517b99b04a7108badbf0eb57920de935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f356efa517b99b04a7108bad… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 9 01:02:56 2015 -0500 dxdiagn: Add bNoHardware stub property. --- dlls/dxdiagn/provider.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 5831488..3b5fcab 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -918,6 +918,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bNoHardware[] = {'b','N','o','H','a','r','d','w','a','r','e',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; @@ -1063,6 +1064,10 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel); if (FAILED(hr)) goto cleanup; + + hr = add_bool_property(display_adapter, bNoHardware, FALSE); + if (FAILED(hr)) + goto cleanup; } hr = S_OK;

1 0

Sebastian Lackner : ntdll: Move static threadpool variables into a struct.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: ae309c2d00e9abba30bb32fc52be3e571c4f5ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae309c2d00e9abba30bb32fc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 5 14:25:32 2015 +0100 ntdll: Move static threadpool variables into a struct. --- dlls/ntdll/threadpool.c | 99 ++++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index fef26fe..7f2ed65 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -39,32 +39,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(threadpool); #define WORKER_TIMEOUT 30000 /* 30 seconds */ -/* threadpool_cs must be held while modifying the following elements */ -static struct list work_item_list = LIST_INIT(work_item_list); -static LONG num_workers; -static LONG num_busy_workers; -static LONG num_items_processed; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug; +static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug; -static RTL_CONDITION_VARIABLE threadpool_cond = RTL_CONDITION_VARIABLE_INIT; +static struct +{ + /* threadpool_cs must be held while modifying the following four elements */ + struct list work_item_list; + LONG num_workers; + LONG num_busy_workers; + LONG num_items_processed; + RTL_CONDITION_VARIABLE threadpool_cond; + RTL_CRITICAL_SECTION threadpool_cs; + HANDLE compl_port; + RTL_CRITICAL_SECTION threadpool_compl_cs; +} +old_threadpool = +{ + LIST_INIT(old_threadpool.work_item_list), /* work_item_list */ + 0, /* num_workers */ + 0, /* num_busy_workers */ + 0, /* num_items_processed */ + RTL_CONDITION_VARIABLE_INIT, /* threadpool_cond */ + { &critsect_debug, -1, 0, 0, 0, 0 }, /* threadpool_cs */ + NULL, /* compl_port */ + { &critsect_compl_debug, -1, 0, 0, 0, 0 }, /* threadpool_compl_cs */ +}; -static RTL_CRITICAL_SECTION threadpool_cs; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { - 0, 0, &threadpool_cs, + 0, 0, &old_threadpool.threadpool_cs, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } }; -static RTL_CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static HANDLE compl_port = NULL; -static RTL_CRITICAL_SECTION threadpool_compl_cs; static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug = { - 0, 0, &threadpool_compl_cs, + 0, 0, &old_threadpool.threadpool_compl_cs, { &critsect_compl_debug.ProcessLocksList, &critsect_compl_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_compl_cs") } }; -static RTL_CRITICAL_SECTION threadpool_compl_cs = { &critsect_compl_debug, -1, 0, 0, 0, 0 }; struct work_item { @@ -90,18 +104,18 @@ static void WINAPI worker_thread_proc(void * param) LARGE_INTEGER timeout; timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); - RtlEnterCriticalSection( &threadpool_cs ); - num_workers++; + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + old_threadpool.num_workers++; for (;;) { - if ((item = list_head( &work_item_list ))) + if ((item = list_head( &old_threadpool.work_item_list ))) { work_item_ptr = LIST_ENTRY( item, struct work_item, entry ); list_remove( &work_item_ptr->entry ); - num_busy_workers++; - num_items_processed++; - RtlLeaveCriticalSection( &threadpool_cs ); + old_threadpool.num_busy_workers++; + old_threadpool.num_items_processed++; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); /* copy item to stack and do the work */ work_item = *work_item_ptr; @@ -109,15 +123,18 @@ static void WINAPI worker_thread_proc(void * param) TRACE("executing %p(%p)\n", work_item.function, work_item.context); work_item.function( work_item.context ); - RtlEnterCriticalSection( &threadpool_cs ); - num_busy_workers--; + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + old_threadpool.num_busy_workers--; } - else if (RtlSleepConditionVariableCS( &threadpool_cond, &threadpool_cs, &timeout ) != STATUS_SUCCESS) + else if (RtlSleepConditionVariableCS( &old_threadpool.threadpool_cond, + &old_threadpool.threadpool_cs, &timeout ) != STATUS_SUCCESS) + { break; + } } - num_workers--; - RtlLeaveCriticalSection( &threadpool_cs ); + old_threadpool.num_workers--; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); RtlExitUserThread( 0 ); /* never reached */ @@ -161,16 +178,17 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, if (Flags & ~WT_EXECUTELONGFUNCTION) FIXME("Flags 0x%x not supported\n", Flags); - RtlEnterCriticalSection( &threadpool_cs ); - list_add_tail( &work_item_list, &work_item->entry ); - status = (num_workers > num_busy_workers) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - items_processed = num_items_processed; - RtlLeaveCriticalSection( &threadpool_cs ); + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + list_add_tail( &old_threadpool.work_item_list, &work_item->entry ); + status = (old_threadpool.num_workers > old_threadpool.num_busy_workers) ? + STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + items_processed = old_threadpool.num_items_processed; + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); /* FIXME: tune this algorithm to not be as aggressive with creating threads * if WT_EXECUTELONGFUNCTION isn't specified */ if (status == STATUS_SUCCESS) - RtlWakeConditionVariable( &threadpool_cond ); + RtlWakeConditionVariable( &old_threadpool.threadpool_cond ); else { status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, @@ -182,12 +200,15 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, NtClose( thread ); else { - RtlEnterCriticalSection( &threadpool_cs ); - if (num_workers > 0 || num_items_processed != items_processed) + RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); + if (old_threadpool.num_workers > 0 || + old_threadpool.num_items_processed != items_processed) + { status = STATUS_SUCCESS; + } else list_remove( &work_item->entry ); - RtlLeaveCriticalSection( &threadpool_cs ); + RtlLeaveCriticalSection( &old_threadpool.threadpool_cs ); if (status != STATUS_SUCCESS) RtlFreeHeap( GetProcessHeap(), 0, work_item ); @@ -253,12 +274,12 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO if (Flags) FIXME("Unknown value Flags=0x%x\n", Flags); - if (!compl_port) + if (!old_threadpool.compl_port) { NTSTATUS res = STATUS_SUCCESS; - RtlEnterCriticalSection(&threadpool_compl_cs); - if (!compl_port) + RtlEnterCriticalSection(&old_threadpool.threadpool_compl_cs); + if (!old_threadpool.compl_port) { HANDLE cport; @@ -268,16 +289,16 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO /* FIXME native can start additional threads in case of e.g. hung callback function. */ res = RtlQueueWorkItem( iocp_poller, cport, WT_EXECUTEDEFAULT ); if (!res) - compl_port = cport; + old_threadpool.compl_port = cport; else NtClose( cport ); } } - RtlLeaveCriticalSection(&threadpool_compl_cs); + RtlLeaveCriticalSection(&old_threadpool.threadpool_compl_cs); if (res) return res; } - info.CompletionPort = compl_port; + info.CompletionPort = old_threadpool.compl_port; info.CompletionKey = (ULONG_PTR)Function; return NtSetInformationFile( FileHandle, &iosb, &info, sizeof(info), FileCompletionInformation );

1 0