wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

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 15 Nov '11

15 Nov '11

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 15 Nov '11

15 Nov '11

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 15 Nov '11

15 Nov '11

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

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

15 Nov '11

Module: wine Branch: master Commit: 97283f8b8d5f7c0a5757e3f047d676534f172efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=97283f8b8d5f7c0a5757e3f04… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 14:38:50 2011 +0100 winealsa.drv: Don't unset Spare[0] when deleting static critical sections. --- dlls/winealsa.drv/mmdevdrv.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index bc1ca94..3cebd4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -228,7 +228,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

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

15 Nov '11

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 : wininet: Add prototypes for a couple of mpr functions.
by Alexandre Julliard 15 Nov '11

15 Nov '11

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

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

15 Nov '11

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

Piotr Caban : msvcr90: Added __vswprintf_l implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 6aea3dcf25a23438d4f08b67a4c6fd97daeb0c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aea3dcf25a23438d4f08b67a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 14:20:49 2011 +0100 msvcr90: Added __vswprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0925c1f..4b5b525 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -480,7 +480,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4cde658..5de5586 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -304,7 +304,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9d0d9e6..77e0e45 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -296,7 +296,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c3a837d..b6ae4c3 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -98,6 +98,8 @@ static int* (__cdecl *p_fpecode)(void); static int (__cdecl *p_configthreadlocale)(int); static void* (__cdecl *p_get_terminate)(void); static void* (__cdecl *p_get_unexpected)(void); +static int (__cdecl *p__vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); +static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); /* type info */ @@ -264,6 +266,8 @@ static BOOL init(void) SET(p_configthreadlocale, "_configthreadlocale"); SET(p_get_terminate, "_get_terminate"); SET(p_get_unexpected, "_get_unexpected"); + SET(p__vswprintf_l, "__vswprintf_l"); + SET(p_vswprintf_l, "_vswprintf_l"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -981,6 +985,46 @@ static void test_getptd(void) ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); } +static int __cdecl __vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p_vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static void test__vswprintf_l(void) +{ + static const wchar_t format[] = {'t','e','s','t',0}; + + wchar_t buf[32]; + int ret; + + ret = __vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); + + ret = _vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); +} + START_TEST(msvcr90) { if(!init()) @@ -1001,4 +1045,5 @@ START_TEST(msvcr90) test__realloc_crt(); test_typeinfo(); test_getptd(); + test__vswprintf_l(); }

1 0

Andrew Eikum : urlmon: Improve parsing of SCHEME_MK URIs.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 31853fc203c175db96f70440b2ee5593f2dec6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=31853fc203c175db96f70440b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 15 08:32:26 2011 -0600 urlmon: Improve parsing of SCHEME_MK URIs. --- dlls/urlmon/tests/uri.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 15 +++++- 2 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3483878..327b9a2 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4316,7 +4316,32 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_WILDCARD,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } - } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, }; typedef struct _invalid_uri { @@ -6336,6 +6361,87 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::\\subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir\\file.txt",0, + "relative\\path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9fd0fe0..8f0e7e7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3086,6 +3086,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_mk = data->scheme_type == URL_SCHEME_MK; if(!data->path) { uri->path_start = -1; @@ -3095,6 +3096,12 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_start = uri->canon_len; + if(is_mk){ + /* hijack this flag for SCHEME_MK to tell the function when to start + * converting slashes */ + flags |= Uri_CREATE_FILE_USE_DOS_PATH; + } + /* For javascript: URIs, simply copy path part without any canonicalization */ if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { if(!computeOnly) @@ -3137,13 +3144,15 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla ++uri->canon_len; do_default_action = FALSE; } else if(*ptr == '\\') { - if(is_file && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if((data->is_relative || is_mk || is_file) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert to a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; do_default_action = FALSE; } + } else if(is_mk && *ptr == ':' && ptr + 1 < data->path + data->path_len && *(ptr + 1) == ':') { + flags &= ~Uri_CREATE_FILE_USE_DOS_PATH; } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { @@ -3161,7 +3170,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } } - if(data->scheme_type == URL_SCHEME_MK && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { + if(is_mk && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { DWORD new_len = remove_dot_segments(uri->canon_uri + uri->path_start, uri->canon_len - uri->path_start); uri->canon_len = uri->path_start + new_len; @@ -5165,7 +5174,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU memset(&data, 0, sizeof(parse_data)); data.uri = ret->raw_uri; - /* Validate and parse the URI into it's components. */ + /* Validate and parse the URI into its components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ IUri_Release(&ret->IUri_iface);

1 0

Michael Mc Donnell : d3dx9: Return error if D3DXMESH_VB_SHARE and new declaration.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 8f5543c34e8b6d2c2480696744cf17fa2e712cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5543c34e8b6d2c248069674… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 13:50:38 2011 -0500 d3dx9: Return error if D3DXMESH_VB_SHARE and new declaration. --- dlls/d3dx9_36/mesh.c | 5 ++++- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d1693c4..ec77a37 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -707,7 +707,10 @@ static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, C same_declaration = declaration_equals(declaration, orig_declaration); if (options & D3DXMESH_VB_SHARE) { - if (!same_declaration) goto error; + if (!same_declaration) { + hr = D3DERR_INVALIDCALL; + goto error; + } IDirect3DVertexBuffer9_AddRef(This->vertex_buffer); /* FIXME: refactor to avoid creating a new vertex buffer */ IDirect3DVertexBuffer9_Release(cloned_this->vertex_buffer); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 838e406..50e0e6b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9916,9 +9916,9 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[2].create_options | D3DXMESH_VB_SHARE, tc[2].new_declaration, test_context->device, &mesh_clone); - todo_wine ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" - " declaration. Got %x, expected D3DERR_INVALIDCALL\n", - hr); + ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" + " declaration. Got %x, expected D3DERR_INVALIDCALL\n", + hr); mesh->lpVtbl->Release(mesh); mesh = NULL; mesh_clone = NULL;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
86
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 2011