December 2005 - Wine-commits

Jacek Caban : shlwapi: Fix UrlCanonicalize.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: bb8a7478bc2b945bd082a9db8f987a1609c71f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb8a7478bc2b945bd082a9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 12:58:28 2005 +0100 shlwapi: Fix UrlCanonicalize. - Added support for URL_FILE_USE_PATHURL. - Fix handling of '/' and '\'. --- dlls/shlwapi/tests/path.c | 9 ++++++ dlls/shlwapi/url.c | 69 +++++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index eca68b9..1efbe0f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -60,10 +60,19 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"http://www.winehq.org/tests/../?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y"}, {"http://www.winehq.org/tests/..#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests\\../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests/..\\#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org\\tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../#example"}, {"http://www.winehq.org/tests/foo bar", URL_ESCAPE_SPACES_ONLY| URL_DONT_ESCAPE_EXTRA_INFO , S_OK, "http://www.winehq.org/tests/foo%20bar"}, {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar"}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar"} }; typedef struct _TEST_URL_ESCAPE { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d25628e..4e5c691 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -327,9 +327,10 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, root; + LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; + WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -376,23 +377,37 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR *wk2++ = *wk1++; if (*wk1 != L'/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && *wk1 == '/') + wk1++; state = 4; break; case 3: nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; wk1 += nWkLen; wk2 += nWkLen; + + while(mp < wk2) { + if(*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } break; case 4: - if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} - while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.')) *wk2++ = *wk1++; - state = 5; - break; - case 5: - if (*wk1 != L'/') {state = 3; break;} - *wk2++ = *wk1++; - state = 6; + if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.') && (*wk1 != ':')) + {state = 3; break;} + while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;} + while(*wk1 == '/') { + *wk2++ = slash; + wk1++; + } + state = 6; break; case 6: /* Now at root location, cannot back up any more. */ @@ -400,7 +415,11 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR root = wk2-1; while (*wk1) { TRACE("wk1=%c\n", (CHAR)*wk1); - mp = strchrW(wk1, L'/'); + + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if(mp2 && mp2 < mp) + mp = mp2; if (!mp) { nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); @@ -408,35 +427,41 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR wk2 += nWkLen; continue; } - nLen = mp - wk1 + 1; - memcpy(wk2, wk1, nLen * sizeof(WCHAR)); - wk2 += nLen; - wk1 += nLen; + nLen = mp - wk1; + if(nLen) { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + *wk2++ = slash; + wk1++; + if (*wk1 == L'.') { TRACE("found '/.'\n"); - if (*(wk1+1) == L'/') { + if (wk1[1] == '/' || wk1[1] == '\\') { /* case of /./ -> skip the ./ */ wk1 += 2; } - else if (*(wk1+1) == L'.') { + else if (wk1[1] == '.') { /* found /.. look for next / */ TRACE("found '/..'\n"); - if (*(wk1+2) == L'/' || *(wk1+2) == L'?' || *(wk1+2) == L'#' || *(wk1+2) == 0) { + if (wk1[2] == '/' || wk1[2] == '\\' ||wk1[2] == '?' + || wk1[2] == '#' || !wk1[2]) { /* case /../ -> need to backup wk2 */ TRACE("found '/../'\n"); *(wk2-1) = L'\0'; /* set end of string */ - mp = strrchrW(root, L'/'); + mp = strrchrW(root, slash); if (mp && (mp >= root)) { /* found valid backup point */ wk2 = mp + 1; - if(*(wk1+2) != L'/') + if(wk1[2] != '/' && wk1[2] != '\\') wk1 += 2; else wk1 += 3; } else { - /* did not find point, restore '/' */ - *(wk2-1) = L'/'; + /* did not find point, restore '/' */ + *(wk2-1) = slash; } } } @@ -458,7 +483,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR while ((nLen > 0) && ((lpszUrlCpy[nLen-1] == '\r')||(lpszUrlCpy[nLen-1] == '\n'))) lpszUrlCpy[--nLen]=0; - if(dwFlags & URL_UNESCAPE) + if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

Rolf Kalbermatter : msrle32: Spelling fix.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: f989f620760bd6e11d677dbe90295f7e5ce1de83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f989f620760bd6e11d677db… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Mon Dec 26 12:58:11 2005 +0100 msrle32: Spelling fix. --- dlls/msrle32/msrle32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5376688..7a4deca 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -18,7 +18,7 @@ /* TODO: * - some improvements possible - * - implement DecompressSetPalette? -- does we need it for anything? + * - implement DecompressSetPalette? -- do we need it for anything? */ #include <assert.h>

1 0

Eric Pouech : dbghelp: Internal search routines can now be case sensitive/insensitive.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: a959732fffda2455b349b8610e9f9f3ac82d10f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a959732fffda2455b349b86… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 26 12:57:26 2005 +0100 dbghelp: Internal search routines can now be case sensitive/insensitive. - Now handling option SYMOPT_CASE_INSENSITIVE for symbol search. - Quick implementation of SymSearch on top of SymEnumSymbols (should be the other way around). --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 51 +++++++++++++++++++++++++++++++++++++++++---- include/dbghelp.h | 5 ++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0d7106b..92ccd49 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -86,7 +86,7 @@ @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) -@ stub SymSearch +@ stdcall SymSearch(long double long long str double ptr ptr long) @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 74634d1..2e840e2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -738,7 +738,8 @@ static BOOL symt_enum_locals(struct proc BOOL ret; regex_t preg; - compile_regex(mask ? mask : "*", -1, &preg, FALSE); + compile_regex(mask ? mask : "*", -1, &preg, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); ret = symt_enum_locals_helper(pcs, module, &preg, EnumSymbolsCallback, UserContext, sym_info, &((struct symt_function*)sym)->vchildren); @@ -785,8 +786,10 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex, FALSE); - compile_regex(bang + 1, -1, &sym_regex, FALSE); + compile_regex(Mask, bang - Mask, &mod_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); + compile_regex(bang + 1, -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); for (module = pcs->lmodules; module; module = module->next) { @@ -829,7 +832,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce Mask = bang + 1; } - compile_regex(Mask ? Mask : "*", -1, &sym_regex, FALSE); + compile_regex(Mask ? Mask : "*", -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); symt_enum_module(module, &sym_regex, EnumSymbolsCallback, UserContext); regfree(&sym_regex); @@ -1311,3 +1315,42 @@ BOOL WINAPI SymMatchString(PCSTR string, return ret; } +/****************************************************************** + * SymSearch (DBGHELP.@) + */ +BOOL WINAPI SymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index, + DWORD SymTag, PCSTR Mask, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext, DWORD Options) +{ + TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask, + wine_dbgstr_longlong(Address), EnumSymbolsCallback, + UserContext, Options); + + if (Index != 0) + { + FIXME("Unsupported searching for a given Index (%lu)\n", Index); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (SymTag != 0) + { + FIXME("Unsupported searching for a given SymTag (%lu)\n", SymTag); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Address != 0) + { + FIXME("Unsupported searching for a given Address (%s)\n", wine_dbgstr_longlong(Address)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Options != SYMSEARCH_GLOBALSONLY) + { + FIXME("Unsupported searching with options (%lx)\n", Options); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return SymEnumSymbols(hProcess, BaseOfDll, Mask, EnumSymbolsCallback, UserContext); +} diff --git a/include/dbghelp.h b/include/dbghelp.h index c08e214..dd2aad8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -800,6 +800,10 @@ typedef struct _TI_FINDCHILDREN_PARAMS #define UNDNAME_NO_ARGUMENTS (0x2000) #define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define SYMSEARCH_MASKOBJS 0x01 +#define SYMSEARCH_RECURSE 0x02 +#define SYMSEARCH_GLOBALSONLY 0x04 + BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); @@ -822,6 +826,7 @@ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD); BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case); BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case); +BOOL WINAPI SymSearch(HANDLE, ULONG64, DWORD, DWORD, PCSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID, DWORD); /************************* * Source Files *

1 0

Dmitry Timoshkov : x11drv: Update Canadian keyboard layout to better match the X11 one
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 328e18c2852b775412a03ffb3c9f71e0e5aa3570 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=328e18c2852b775412a03ff… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 26 12:56:26 2005 +0100 x11drv: Update Canadian keyboard layout to better match the X11 one --- dlls/x11drv/keyboard.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 3c8e591..e011446 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -401,7 +401,7 @@ static const char main_key_ET[MAIN_LEN][ "<>" }; -/*** Canadian French keyboard layout */ +/*** Canadian French keyboard layout (setxkbmap ca_enhanced) */ static const char main_key_CF[MAIN_LEN][4] = { "#|\\","1!�","2\"@","3/�","4$�","5%�","6?�","7&�","8*�","9(�","0)�","-_�","=+�", @@ -411,13 +411,11 @@ static const char main_key_CF[MAIN_LEN][ "��" }; -/*** Canadian CAN/CSA Z243.200-92 keyboard layout - *** Contributed by Jean-Michel Dault <jmdault(a)revolutionlinux.com> */ +/*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { - "/\\","1!��","2@�","3#��","4$��","5%�","6?�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR��","tT","yY","uU","iI","oO��","pP��","^��","��~", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO��","pP��","^��","��~", "aA��","sSߧ","dD��","fF","gG","hH","jJ","kK","lL",";:�","��","��", "zZ","xX","cC��","vV","bB","nN","mM��",",'",".\"��","��", "��" @@ -901,7 +899,7 @@ static const struct { {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian CAN/CSA-Z243.200-92 keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},

1 0

Robert Shearman : Fix detection of V1a prop variant library in test suite.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 85128db39cf1960827ecb39b748c5d190563fc71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85128db39cf1960827ecb39… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 12:56:48 2005 +0100 Fix detection of V1a prop variant library in test suite. --- dlls/ole32/tests/propvariant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index aa630c1..e8619e7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -140,7 +140,7 @@ static void test_validtypes(void) hr = PropVariantClear(&propvar); if (hr == S_OK) { - propvar.vt = VT_I8; + propvar.vt = VT_I8 | VT_ARRAY; hr = PropVariantClear(&propvar); if (hr == S_OK) {

1 0

Maxime Bellengé : msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: def7563526f17c01d61c66f684930bda92334445 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=def7563526f17c01d61c66f… Author: Maxime Bellengé <maxime.bellenge(a)wanadoo.fr> Date: Mon Dec 26 12:57:06 2005 +0100 msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH. --- dlls/msvcrt/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a79d12f..779a293 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,8 +70,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_THREAD_DETACH: /* Free TLS */ tls = TlsGetValue(msvcrt_tls_index); - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + if (tls) + { + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + } HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break;

1 0

Ulrich Czekalla : atl: Implement AtlComPtrAssign.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 9da8128e4f3e0a340752053c03efda749b4126b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9da8128e4f3e0a340752053… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Dec 26 12:55:22 2005 +0100 atl: Implement AtlComPtrAssign. According to MSDN AtlModuleInit should initialize the modules critical sections. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 471a194..9d0b482 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -22,7 +22,7 @@ 27 stub AtlHiMetricToPixel 28 stub AtlPixelToHiMetric 29 stub AtlDevModeW2A -30 stub AtlComPtrAssign +30 stdcall AtlComPtrAssign(ptr ptr) 31 stub AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stub AtlGetVersion diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index bcf25f0..a620f9e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -73,6 +73,10 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULE pM->m_pObjMap = p; pM->m_hHeap = GetProcessHeap(); + InitializeCriticalSection(&pM->u.m_csTypeInfoHolder); + InitializeCriticalSection(&pM->m_csWindowCreate); + InitializeCriticalSection(&pM->m_csObjMap); + /* call mains */ i = 0; if (pM->m_pObjMap != NULL && size > ATLVer1Size) @@ -181,6 +185,17 @@ BOOL WINAPI AtlAxWinInit(void) } +IUnknown* WINAPI AtlComPtrAssign(IUnknown** pp, IUnknown *p) +{ + TRACE("(%p %p)\n", pp, p); + + if (p) IUnknown_AddRef(p); + if (*pp) IUnknown_Release(*pp); + *pp = p; + return p; +} + + HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject) { int i = 0;

1 0

Robert Reif : winecfg: Use hourglass cursor when opening audio drivers.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 35a92c86d537e4824b8f2da8d50c76f5d205b1d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35a92c86d537e4824b8f2da… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Dec 26 12:55:40 2005 +0100 winecfg: Use hourglass cursor when opening audio drivers. Misbehaving drivers can take a while to open so change to the hour glass cursor when opening them. --- programs/winecfg/audio.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 1d0a424..3d78e92 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -181,6 +181,7 @@ static void initAudioDeviceTree(HWND hDl HWND tree = NULL; HIMAGELIST hImageList; HBITMAP hBitMap; + HCURSOR old_cursor; tree = GetDlgItem(hDlg, IDC_AUDIO_TREE); @@ -205,6 +206,11 @@ static void initAudioDeviceTree(HWND hDl insert.u.item.cChildren = 1; root = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + /* iterate over list of loaded drivers */ for (pAudioDrv = loadedAudioDrv, i = 0; *pAudioDrv->szName; i++, pAudioDrv++) { HDRVR hdrv; @@ -433,6 +439,9 @@ static void initAudioDeviceTree(HWND hDl } } + /* restore the original cursor */ + SetCursor(old_cursor); + SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_SELECTITEM, 0, 0); SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_EXPAND, TVE_EXPAND, (LPARAM)root); for (j = 0; j < i; j++) @@ -444,6 +453,7 @@ static void findAudioDrivers(void) { int numFound = 0; const AUDIO_DRIVER *pAudioDrv = NULL; + HCURSOR old_cursor; /* delete an existing list */ if (loadedAudioDrv) @@ -452,6 +462,11 @@ static void findAudioDrivers(void) loadedAudioDrv = 0; } + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + for (pAudioDrv = getAudioDrivers(); *pAudioDrv->szName; pAudioDrv++) { if (strlen(pAudioDrv->szDriver)) @@ -476,6 +491,9 @@ static void findAudioDrivers(void) } } + /* restore the original cursor */ + SetCursor(old_cursor); + /* terminate list with empty driver */ loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER));

1 0

James Hawkins : shell32: Clean up the SHFileOperation tests.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 22ddd114a80854e4240ae0138fe2cad35c6cf56a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22ddd114a80854e4240ae01… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 26 12:56:06 2005 +0100 shell32: Clean up the SHFileOperation tests. - Make sure to create all the files used by the new tests. - Add a couple more SHFileOperation tests. - Fix some of the old tests. --- dlls/shell32/tests/shlfileop.c | 53 +++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 60418ed..fe753b7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -75,8 +75,12 @@ static void init_shfo_tests(void) createTestFile("test1.txt"); createTestFile("test2.txt"); createTestFile("test3.txt"); + createTestFile("test_5.txt"); CreateDirectoryA("test4.txt", NULL); CreateDirectoryA("testdir2", NULL); + CreateDirectoryA("testdir2\\nested", NULL); + createTestFile("testdir2\\one.txt"); + createTestFile("testdir2\\nested\\two.txt"); } /* cleans after tests */ @@ -85,17 +89,22 @@ static void clean_after_shfo_tests(void) DeleteFileA("test1.txt"); DeleteFileA("test2.txt"); DeleteFileA("test3.txt"); + DeleteFileA("test_5.txt"); DeleteFileA("test4.txt\\test1.txt"); DeleteFileA("test4.txt\\test2.txt"); DeleteFileA("test4.txt\\test3.txt"); RemoveDirectoryA("test4.txt"); + DeleteFileA("testdir2\\one.txt"); DeleteFileA("testdir2\\test1.txt"); DeleteFileA("testdir2\\test2.txt"); DeleteFileA("testdir2\\test3.txt"); DeleteFileA("testdir2\\test4.txt\\test1.txt"); + DeleteFileA("testdir2\\nested\\two.txt"); RemoveDirectoryA("testdir2\\test4.txt"); + RemoveDirectoryA("testdir2\\nested"); RemoveDirectoryA("testdir2"); - DeleteFileA("nonexistent\\test2.txt"); + DeleteFileA("nonexistent\\notreal\\test2.txt"); + RemoveDirectoryA("nonexistent\\notreal"); RemoveDirectoryA("nonexistent"); } @@ -180,8 +189,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); /* FOF_FILESONLY only deletes a dir if explicitly specified */ @@ -191,8 +200,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); /* try to delete an invalid filename */ @@ -251,9 +260,9 @@ static void test_delete(void) todo_wine { ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } - ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); - ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */ @@ -332,6 +341,22 @@ static void test_rename(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* pFrom doesn't exist */ + shfo.pFrom = "idontexist\0"; + shfo.pTo = "newfile\0"; + retval = SHFileOperationA(&shfo); + ok(retval == 1026, "Expected 1026, got %ld\n", retval); + ok(!file_exists("newfile"), "Expected newfile to not exist\n"); + + /* pTo already exist */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ALREADY_EXISTS, "Expected ERROR_ALREADY_EXISTS, got %ld\n", retval); + } + /* pFrom is valid, but pTo is empty */ shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; @@ -541,6 +566,18 @@ static void test_copy(void) ok(DeleteFile("testdir2\\b.txt"), "Expected testdir2\\b.txt to exist\n"); ok(RemoveDirectory("testdir2\\c.txt"), "Expected testdir2\\c.txt to exist\n"); + /* try many dest files without FOF_MULTIDESTFILES flag */ + shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; + shfo.pTo = "a.txt\0b.txt\0c.txt\0"; + shfo.fAnyOperationsAborted = FALSE; + shfo.fFlags &= ~FOF_MULTIDESTFILES; + retval = SHFileOperation(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); + /* try a glob */ shfo.pFrom = "test?.txt\0"; shfo.pTo = "testdir2\0"; @@ -660,7 +697,8 @@ static void test_copy(void) retval = SHFileOperation(&shfo); todo_wine { - ok(retval == 113, "Expected 113, got %ld\n", retval); + ok(retval == ERROR_NO_MORE_SEARCH_HANDLES, + "Expected ERROR_NO_MORE_SEARCH_HANDLES, got %ld\n", retval); ok(!shfo.fAnyOperationsAborted, "Expected no operations to be aborted\n"); ok(DeleteFile("b.txt"), "Expected b.txt to exist\n"); } @@ -730,6 +768,7 @@ static void test_copy(void) retval = SHFileOperation(&shfo); ok(retval == 1026, "Expected 1026, got %ld\n", retval); ok(!file_exists("nonexistent\\e.txt"), "Expected nonexistent\\e.txt to not exist\n"); + ok(!file_exists("nonexistent"), "Expected nonexistent to not exist\n"); } /* tests the FO_MOVE action */ @@ -883,7 +922,7 @@ static void test_move(void) { ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); } - ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + ok(!file_exists("dir1"), "Expected dir1 to not exist\n"); /* try to overwrite an existing file */ shfo.pTo = "test3.txt\0";

1 0

lostwages/wwn wn20051223_302.xml
by WineHQ 24 Dec '05

24 Dec '05

ChangeSet ID: 21961 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:39:43 Modified files: wwn : wn20051223_302.xml Log message: fixups in WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21961 Old revision New revision Changes Path 1.1 1.2 +10 -8 lostwages/wwn/wn20051223_302.xml Index: lostwages/wwn/wn20051223_302.xml diff -u -p lostwages/wwn/wn20051223_302.xml:1.1 lostwages/wwn/wn20051223_302.xml:1.2 --- lostwages/wwn/wn20051223_302.xml:1.1 24 Dec 2005 7:39:43 -0000 +++ lostwages/wwn/wn20051223_302.xml 24 Dec 2005 7:39:43 -0000 @@ -168,7 +168,7 @@ going to beta without any real attempt freeze release cycle is not a good thing. At the very minimum I would think that we should know when the releases are going to happen but we do not even know that. -<Rant> +</Rant> </quote> Alexandre replied: @@ -261,12 +261,12 @@ and <a href="http://bugs.winehq.org">Bug and report problems. </section> <section - title="" - subject="" - archive="http://www.winehq.com/pipermail/wine-devel/2005-October/.html" - posts="" + title="OSDL Desktop Summit" + subject="[Desktop_architects] Portland, a w(h)iney comment" + archive="http://lists.osdl.org/pipermail/desktop_architects/2005-December/000354.html" + posts="1" > -<topic></topic> +<topic>Project Management</topic> We mentioned a few weeks ago (WWN <a href="http://www.winehq.com/?issue=299#Desktop%20Summit">#299</a>) there was a desktop summit being sponsored by OSDL. Well, Jeremy White and Dan @@ -297,7 +297,7 @@ and PageMaker. No one seems to care that Wine runs 3 of those 4. -<Rodney Dangerfield> We get no respect! <Rodney Dangerfield> +<Rodney Dangerfield> We get no respect! </Rodney Dangerfield> <grin> @@ -473,7 +473,9 @@ lines of code.</quote> Aric looked into it and noticed on SpecOps' <a href="http://www.specopslabs.com/partners-stratigicpartners.htm">Partners</a> -page that IBM and TurboLinux were both listed. +page that IBM and TurboLinux were both listed. Given their long history with +the community, presumably both of those companies would want to make sure the +licensing was followed. So, anyone out there have TurboLinux FUJI? Do you have the source code changes to Wine?

1 0