wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Nikolay Sivov : scrrun: Fix copy-paste issue in trace message.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 49a1c60c37bddf39c438f1ab9a5a4fa544e525df URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a1c60c37bddf39c438f1ab9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 10:55:52 2015 +0300 scrrun: Fix copy-paste issue in trace message. --- dlls/scrrun/scrrun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 3afcd50..5201f1f 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -215,11 +215,11 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { if(IsEqualGUID(&CLSID_FileSystemObject, rclsid)) { - TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_FileSystemObject %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&FileSystemFactory, riid, ppv); } else if(IsEqualGUID(&CLSID_Dictionary, rclsid)) { - TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_Dictionary %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&DictionaryFactory, riid, ppv); }

1 0

Michael Stefaniuc : ws2_32: Avoid using bitwise operations on BOOLs ( PVS-Studio).
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 58afc397cb27dc9e8790c53cc7e9d5d4bdd6672e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58afc397cb27dc9e8790c53cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 10 10:20:02 2015 +0100 ws2_32: Avoid using bitwise operations on BOOLs (PVS-Studio). --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b4ed865..a9f60cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3938,7 +3938,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID * because BSD returns TRUE if it's in the OOB mark * while Windows returns TRUE if there are NO OOB bytes. */ - (*(WS_u_long *) out_buff) = oob | !atmark; + (*(WS_u_long *) out_buff) = oob || !atmark; } release_sock_fd( s, fd );

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

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

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

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 : 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 : 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 : 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 : 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

← Newer
1
...
53
54
55
56
57
58
59
...
78
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 March 2015