November 2011 - Wine-Commits

Francois Gouget : wintab32: Make the csTablet critical section static.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 148e6c3a3cc1ff084b2447f64c708880cb520d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=148e6c3a3cc1ff084b2447f64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:41:30 2011 +0100 wintab32: Make the csTablet critical section static. --- dlls/wintab32/wintab32.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 53c7523..50daebd 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,7 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; static const WCHAR WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; -CRITICAL_SECTION csTablet; +static CRITICAL_SECTION_DEBUG csTablet_debug = +{ + 0, 0, &csTablet, + { &csTablet_debug.ProcessLocksList, &csTablet_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csTablet") } +}; +CRITICAL_SECTION csTablet = { &csTablet_debug, -1, 0, 0, 0, 0 }; int (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL; int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL; @@ -74,8 +80,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); - InitializeCriticalSection(&csTablet); - csTablet.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": csTablet"); hx11drv = GetModuleHandleA("winex11.drv"); if (hx11drv) { @@ -98,7 +102,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) hwndDefault = 0; } TABLET_Unregister(); - csTablet.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&csTablet); break; }

1 0

Francois Gouget : wineoss.drv: Give a name to the mmdevapi critical sections, make them static and delete them when unloading the dll.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: b6117b68699cc1abd1198e0c6ae29a7f4b4a9be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6117b68699cc1abd1198e0c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:39:45 2011 +0100 wineoss.drv: Give a name to the mmdevapi critical sections, make them static and delete them when unloading the dll. --- dlls/wineoss.drv/mmdevdrv.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 24cd147..ac1b2a3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -155,6 +155,13 @@ typedef struct _SessionMgr { static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; +static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = +{ + 0, 0, &g_sessions_lock, + { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } +}; +static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); @@ -223,14 +230,18 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; + break; - InitializeCriticalSection(&g_sessions_lock); + case DLL_PROCESS_DETACH: + DeleteCriticalSection(&g_sessions_lock); + break; } - return TRUE; } @@ -527,6 +538,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); This->parent = dev; IMMDevice_AddRef(This->parent); @@ -574,6 +586,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); close(This->fd); if(This->initted){ @@ -819,6 +832,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); InitializeCriticalSection(&ret->lock); + ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); session_init_vols(ret, num_channels);

1 0

Francois Gouget : dsound: Give a name to the critical sections, make them static and delete them when unloading the dll.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 68dc1468cbb81271d8c6011e4f9d7550022ceecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dc1468cbb81271d8c6011e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:39:26 2011 +0100 dsound: Give a name to the critical sections, make them static and delete them when unloading the dll. --- dlls/dsound/dsound_main.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index c5b6dce..81e3627 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -67,15 +67,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); struct list DSOUND_renderers = LIST_INIT(DSOUND_renderers); CRITICAL_SECTION DSOUND_renderers_lock; +static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = +{ + 0, 0, &DSOUND_renderers_lock, + { &DSOUND_renderers_lock_debug.ProcessLocksList, &DSOUND_renderers_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": DSOUND_renderers_lock") } +}; +CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; struct list DSOUND_capturers = LIST_INIT(DSOUND_capturers); CRITICAL_SECTION DSOUND_capturers_lock; +static CRITICAL_SECTION_DEBUG DSOUND_capturers_lock_debug = +{ + 0, 0, &DSOUND_capturers_lock, + { &DSOUND_capturers_lock_debug.ProcessLocksList, &DSOUND_capturers_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": DSOUND_capturers_lock") } +}; +CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, 0, 0, 0 }; GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; static IMMDeviceEnumerator *g_devenum; static CRITICAL_SECTION g_devenum_lock; +static CRITICAL_SECTION_DEBUG g_devenum_lock_debug = +{ + 0, 0, &g_devenum_lock, + { &g_devenum_lock_debug.ProcessLocksList, &g_devenum_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_devenum_lock") } +}; +static CRITICAL_SECTION g_devenum_lock = { &g_devenum_lock_debug, -1, 0, 0, 0, 0 }; static HANDLE g_devenum_thread; WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; @@ -867,12 +888,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hInstDLL); /* Increase refcount on dsound by 1 */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hInstDLL, &hInstDLL); - InitializeCriticalSection(&DSOUND_renderers_lock); - InitializeCriticalSection(&DSOUND_capturers_lock); - InitializeCriticalSection(&g_devenum_lock); break; case DLL_PROCESS_DETACH: TRACE("DLL_PROCESS_DETACH\n"); + DeleteCriticalSection(&DSOUND_renderers_lock); + DeleteCriticalSection(&DSOUND_capturers_lock); + DeleteCriticalSection(&g_devenum_lock); break; default: TRACE("UNKNOWN REASON\n");

1 0

Francois Gouget : winecoreaudio.drv: Don't unset Spare[0] when deleting static critical sections.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 1c3617a2c63eef8ab6718667da67431182b56530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3617a2c63eef8ab6718667d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:38:58 2011 +0100 winecoreaudio.drv: Don't unset Spare[0] when deleting static critical sections. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c6f2382..1b0a39e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -247,7 +247,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: - g_sessions_lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&g_sessions_lock); break; }

1 0

Piotr Caban : msvcp90: Don't define empty structure.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9b60ef7e12ceef342a4da99705f956f4f5fd4b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b60ef7e12ceef342a4da9970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 14:33:00 2011 +0100 msvcp90: Don't define empty structure. --- dlls/msvcp90/string.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2dd9f52..6460f02 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -49,6 +49,7 @@ typedef struct { /* allocator class */ typedef struct { + char empty_struct; } allocator; /* char_traits<char> */ @@ -652,7 +653,7 @@ MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, Strin DEFINE_THISCALL_WRAPPER_RETPTR(basic_string_char_get_allocator, 4) allocator __thiscall basic_string_char_get_allocator(const basic_string_char *this) { - allocator ret; + allocator ret = {0}; TRACE("%p\n", this); return ret; } @@ -2316,7 +2317,7 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str DEFINE_THISCALL_WRAPPER(basic_string_wchar_get_allocator, 4) allocator __thiscall basic_string_wchar_get_allocator(const basic_string_wchar *this) { - allocator ret; + allocator ret = {0}; TRACE("%p\n", this); return ret; }

1 0

Francois Gouget : wininet: Add prototypes for a couple of mpr functions.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 37f7089a4a7fbedcd611e5b80c9208c2564fec8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f7089a4a7fbedcd611e5b80… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 15 14:34:41 2011 +0100 wininet: Add prototypes for a couple of mpr functions. --- dlls/wininet/dialogs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 4a24818..9674718 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -170,6 +170,10 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz, BO return TRUE; } +/* These two are not defined in the public headers */ +extern DWORD WINAPI WNetCachePassword(LPSTR,WORD,LPSTR,WORD,BYTE,WORD); +extern DWORD WINAPI WNetGetCachedPassword(LPSTR,WORD,LPSTR,LPWORD,BYTE); + /*********************************************************************** * WININET_GetSetPassword */

1 0

Francois Gouget : crypt32: Move a couple of functions to avoid forward declarations.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9b3bda2b5dca2ba05374a6f327f15999a256d873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3bda2b5dca2ba05374a6f32… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 15 14:37:05 2011 +0100 crypt32: Move a couple of functions to avoid forward declarations. --- dlls/crypt32/oid.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d6b26f7..e5d61f5 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -37,21 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static const WCHAR DllW[] = { 'D','l','l',0 }; -static void init_oid_info(void); -static void free_function_sets(void); -static void free_oid_info(void); - -void crypt_oid_init(void) -{ - init_oid_info(); -} - -void crypt_oid_free(void) -{ - free_function_sets(); - free_oid_info(); -} - static CRITICAL_SECTION funcSetCS; static CRITICAL_SECTION_DEBUG funcSetCSDebug = { @@ -1618,3 +1603,14 @@ DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId) ret = 0; return ret; } + +void crypt_oid_init(void) +{ + init_oid_info(); +} + +void crypt_oid_free(void) +{ + free_function_sets(); + free_oid_info(); +}

1 0

Francois Gouget : winmm: Give a name to the critical sections, make them static and delete them when unloading the dll.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 814c854fd26ea4f8b9ffea30ea4db1533a820d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814c854fd26ea4f8b9ffea30e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:40:30 2011 +0100 winmm: Give a name to the critical sections, make them static and delete them when unloading the dll. --- dlls/winmm/waveform.c | 16 +++++++++++++--- dlls/winmm/winemm.h | 2 +- dlls/winmm/winmm.c | 5 ++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 05641a6..041b63f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -140,6 +140,13 @@ static UINT g_inmmdevices_count; static IMMDeviceEnumerator *g_devenum; static CRITICAL_SECTION g_devthread_lock; +static CRITICAL_SECTION_DEBUG g_devthread_lock_debug = +{ + 0, 0, &g_devthread_lock, + { &g_devthread_lock_debug.ProcessLocksList, &g_devthread_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_devthread_lock") } +}; +static CRITICAL_SECTION g_devthread_lock = { &g_devthread_lock_debug, -1, 0, 0, 0, 0 }; static HANDLE g_devices_thread; static HWND g_devices_hwnd; @@ -167,10 +174,10 @@ static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); static LRESULT WID_Close(HWAVEIN hwave); -BOOL WINMM_InitWaveform(void) +void WINMM_DeleteWaveform(void) { - InitializeCriticalSection(&g_devthread_lock); - return TRUE; + /* FIXME: Free g_(in,out)_mmdevices? */ + DeleteCriticalSection(&g_devthread_lock); } static inline HWAVE WINMM_MakeHWAVE(UINT mmdevice, BOOL is_out, UINT device) @@ -193,6 +200,8 @@ static void WINMM_InitDevice(WINMM_Device *device, WINMM_MMDevice *parent, HWAVE hwave) { InitializeCriticalSection(&device->lock); + device->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); + device->handle = hwave; device->parent = parent; } @@ -449,6 +458,7 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, CoCreateGuid(&dev->session); InitializeCriticalSection(&dev->lock); + dev->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); return S_OK; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 114811c..93c2627 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -152,7 +152,7 @@ void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; -BOOL WINMM_InitWaveform(void) DECLSPEC_HIDDEN; +void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; /* Global variables */ extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index a77d448..6115838 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -79,7 +79,7 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - return WINMM_InitWaveform(); + return TRUE; } /************************************************************************** @@ -89,8 +89,7 @@ static void WINMM_DeleteIData(void) { TIME_MMTimeStop(); - /* FIXME: should also free content and resources allocated - * inside WINMM_IData */ + WINMM_DeleteWaveform(); CloseHandle(psLastEvent); DeleteCriticalSection(&WINMM_cs); }

1 0

Francois Gouget : scrrun: Remove an unneeded include directive in the resource file.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9b3bd3f9177c0b2c297312ef3a16c1c64c250be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3bd3f9177c0b2c297312ef3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 15 14:40:43 2011 +0100 scrrun: Remove an unneeded include directive in the resource file. --- dlls/scrrun/scrrun.rc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.rc b/dlls/scrrun/scrrun.rc index 66dcaa8..abc70a6 100644 --- a/dlls/scrrun/scrrun.rc +++ b/dlls/scrrun/scrrun.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - #define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" #define WINE_FILENAME_STR "scrrun.dll" #define WINE_FILEVERSION 5,8,7600,16385

1 0

Matteo Bruni : wined3d: Disable WINED3DFMT_B8G8R8_UNORM.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 151cf2696bd96095dcc4962de3b58c821c75399f URL: http://source.winehq.org/git/wine.git/?a=commit;h=151cf2696bd96095dcc4962de… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 15:16:56 2011 +0100 wined3d: Disable WINED3DFMT_B8G8R8_UNORM. --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ad79276..8846576 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3406,7 +3406,9 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const /***** * supported: RGB(A) formats */ - case WINED3DFMT_B8G8R8_UNORM: /* Enable for dx7, blacklisted for 8 and 9 above */ + case WINED3DFMT_B8G8R8_UNORM: + TRACE_(d3d_caps)("[FAILED] - Not enumerated on Windows\n"); + return FALSE; case WINED3DFMT_B8G8R8A8_UNORM: case WINED3DFMT_B8G8R8X8_UNORM: case WINED3DFMT_B5G6R5_UNORM: @@ -3677,6 +3679,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, switch (check_format->id) { case WINED3DFMT_B8G8R8_UNORM: + TRACE_(d3d_caps)("[FAILED] - Not enumerated on Windows\n"); + return FALSE; case WINED3DFMT_B8G8R8A8_UNORM: case WINED3DFMT_B8G8R8X8_UNORM: case WINED3DFMT_B5G6R5_UNORM:

1 0