October 2010 - Wine-commits

Piotr Caban : shlwapi: Added SKDeleteValueW implementation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 6aa94942456230154663680f476f653d64cdf0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa94942456230154663680f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 16:37:18 2010 +0200 shlwapi: Added SKDeleteValueW implementation. --- dlls/shlwapi/ordinal.c | 20 ++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8cd9eaa..aad8475 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4641,6 +4641,26 @@ HRESULT WINAPI SKAllocValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD * } /*********************************************************************** + * SKDeleteValueW (SHLWAPI.518) + */ +HRESULT WINAPI SKDeleteValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value) +{ + DWORD ret; + HKEY hkey; + + TRACE("(0x%x, %s %s)\n", flags, debugstr_w(subkey), debugstr_w(value)); + + hkey = SHGetShellKey(flags, subkey, FALSE); + if (!hkey) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + ret = RegDeleteValueW(hkey, value); + + RegCloseKey(hkey); + return HRESULT_FROM_WIN32(ret); +} + +/*********************************************************************** * SKGetValueW (SHLWAPI.516) */ HRESULT WINAPI SKGetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD *type, diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index dcd9989..04609b0 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -511,7 +511,7 @@ 515 stdcall -noname SHGetViewStatePropertyBag(ptr wstr long ptr ptr) 516 stdcall -noname SKGetValueW(long wstr wstr long long long) 517 stub -noname SKSetValueW -518 stub -noname SKDeleteValueW +518 stdcall -noname SKDeleteValueW(long wstr wstr) 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) 520 stub -noname SHPropertyBag_ReadBSTR 521 stub -noname SHPropertyBag_ReadPOINTL

1 0

Piotr Caban : shlwapi: Added SKSetValueW implementation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 52bd8542b7d22b5093f67dacd79e92e35d07fec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bd8542b7d22b5093f67dacd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 16:37:28 2010 +0200 shlwapi: Added SKSetValueW implementation. --- dlls/shlwapi/ordinal.c | 25 +++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index aad8475..b04fd9e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4673,9 +4673,34 @@ HRESULT WINAPI SKGetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD *ty debugstr_w(value), type, data, count); hkey = SHGetShellKey(flags, subkey, FALSE); + if (!hkey) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + ret = SHQueryValueExW(hkey, value, NULL, type, data, count); + RegCloseKey(hkey); + return HRESULT_FROM_WIN32(ret); +} + +/*********************************************************************** + * SKSetValueW (SHLWAPI.516) + */ +HRESULT WINAPI SKSetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, + DWORD type, void *data, DWORD count) +{ + DWORD ret; + HKEY hkey; + TRACE("(0x%x, %s, %s, %x, %p, %d)\n", flags, debugstr_w(subkey), + debugstr_w(value), type, data, count); + + hkey = SHGetShellKey(flags, subkey, TRUE); + if (!hkey) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + ret = RegSetValueExW(hkey, value, 0, type, data, count); + + RegCloseKey(hkey); return HRESULT_FROM_WIN32(ret); } diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 04609b0..4a4f594 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -509,8 +509,8 @@ 513 stub -noname IStream_WritePidl 514 stdcall -noname IUnknown_ProfferService(ptr ptr ptr ptr) 515 stdcall -noname SHGetViewStatePropertyBag(ptr wstr long ptr ptr) -516 stdcall -noname SKGetValueW(long wstr wstr long long long) -517 stub -noname SKSetValueW +516 stdcall -noname SKGetValueW(long wstr wstr ptr ptr ptr) +517 stdcall -noname SKSetValueW(long wstr wstr long ptr long) 518 stdcall -noname SKDeleteValueW(long wstr wstr) 519 stdcall -noname SKAllocValueW(long wstr wstr ptr ptr ptr) 520 stub -noname SHPropertyBag_ReadBSTR

1 0

Piotr Caban : shlwapi/tests: Add more tests.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: fd10f47de4e46ebe81fcea63078f0a1c0eac12c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd10f47de4e46ebe81fcea630… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 16:37:37 2010 +0200 shlwapi/tests: Add more tests. --- dlls/shlwapi/tests/ordinal.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 1937cb0..17ff367 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -62,6 +62,10 @@ static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONT static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPCWSTR, BOOL); +static HRESULT (WINAPI *pSKGetValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void*, DWORD*); +static HRESULT (WINAPI *pSKSetValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD, void*, DWORD); +static HRESULT (WINAPI *pSKDeleteValueW)(DWORD, LPCWSTR, LPCWSTR); +static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2701,7 +2705,9 @@ static void test_SHGetShellKey(void) static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); + DWORD *alloc_data, data, size; HKEY hkey; + HRESULT hres; if (!pSHGetShellKey) { @@ -2754,6 +2760,50 @@ static void test_SHGetShellKey(void) ok(hkey != NULL, "Can't create key\n"); ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); RegCloseKey(hkey); + + if (!pSKGetValueW || !pSKSetValueW || !pSKDeleteValueW || !pSKAllocValueW) + { + win_skip("SKGetValueW, SKSetValueW, SKDeleteValueW or SKAllocValueW not available\n"); + return; + } + + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + data = 1234; + hres = pSKSetValueW(SHKEY_Root_HKLM, WineTestW, NULL, REG_DWORD, &data, sizeof(DWORD)); + ok(hres == S_OK, "hres = %x\n", hres); + + size = 1; + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, NULL, &size); + ok(hres == S_OK, "hres = %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + + data = 0xdeadbeef; + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == S_OK, "hres = %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + ok(data == 1234, "data = %d\n", data); + + hres = pSKAllocValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, (void**)&alloc_data, &size); + ok(hres == S_OK, "hres= %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + ok(*alloc_data == 1234, "*alloc_data = %d\n", *alloc_data); + LocalFree(alloc_data); + + hres = pSKDeleteValueW(SHKEY_Root_HKLM, WineTestW, NULL); + ok(hres == S_OK, "hres = %x\n", hres); + + hres = pSKDeleteValueW(SHKEY_Root_HKLM, WineTestW, NULL); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); + ok(hkey != NULL, "Can't create key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); + RegCloseKey(hkey); } static void init_pointers(void) @@ -2782,6 +2832,10 @@ static void init_pointers(void) MAKEFUNC(SHGetShellKey, 491); MAKEFUNC(SHPropertyBag_ReadLONG, 496); MAKEFUNC(IUnknown_ProfferService, 514); + MAKEFUNC(SKGetValueW, 516); + MAKEFUNC(SKSetValueW, 517); + MAKEFUNC(SKDeleteValueW, 518); + MAKEFUNC(SKAllocValueW, 519); #undef MAKEFUNC }

1 0

Paul Vriens : notepad: Add WS_EX_LAYOUTRTL to some RTL resources.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: b66e6d5cc437921c57bdac79694b5e2e58cffbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66e6d5cc437921c57bdac796… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 12 15:48:04 2010 +0200 notepad: Add WS_EX_LAYOUTRTL to some RTL resources. --- programs/notepad/Ar.rc | 2 ++ programs/notepad/Fa.rc | 2 ++ programs/notepad/He.rc | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ar.rc b/programs/notepad/Ar.rc index 124b427..125785e 100644 --- a/programs/notepad/Ar.rc +++ b/programs/notepad/Ar.rc @@ -70,6 +70,7 @@ POPUP "&مساعدة" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "إعداد الصفحة" { @@ -95,6 +96,7 @@ PUSHBUTTON "&مساعدة", IDHELP, 180, 39, 40, 15, WS_ IDD_OFN_TEMPLATE DIALOG 50,50,300,15 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN LTEXT "الترميز:", -1, 5,0, 50,12 diff --git a/programs/notepad/Fa.rc b/programs/notepad/Fa.rc index 3fe0f6f..1570c9f 100644 --- a/programs/notepad/Fa.rc +++ b/programs/notepad/Fa.rc @@ -70,6 +70,7 @@ POPUP "&کمک" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "تنظیمات صفحه" { @@ -95,6 +96,7 @@ PUSHBUTTON "&کمک", IDHELP, 180, 39, 40, 15, WS_TABSTO IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN LTEXT "کدگذاری:", -1, 5,0, 50,12 diff --git a/programs/notepad/He.rc b/programs/notepad/He.rc index 1b9f506..7140116 100644 --- a/programs/notepad/He.rc +++ b/programs/notepad/He.rc @@ -70,6 +70,7 @@ POPUP "ע&זרה" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "הגדרות עמוד" { @@ -95,6 +96,7 @@ PUSHBUTTON "ע&זרה", IDHELP, 180, 39, 40, 15, WS_TABS IDD_OFN_TEMPLATE DIALOG 50,50,300,15 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN LTEXT "קידוד:", -1, 5,0, 50,12

1 0

Piotr Caban : shlwapi: Improved SHGetShellKey implementation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: c2f25a2206d4786888fbd2191952cf3d80da6689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f25a2206d4786888fbd2191… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 16:35:35 2010 +0200 shlwapi: Improved SHGetShellKey implementation. --- dlls/shlwapi/ordinal.c | 127 +++++++++++++++++++++++++++++++++++++----- dlls/shlwapi/tests/ordinal.c | 65 ++++++++++++++------- 2 files changed, 156 insertions(+), 36 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3edb116..63fffb2 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4406,36 +4406,135 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { enum _shellkey_flags { - SHKEY_Explorer = 0x00, - SHKEY_Root_HKCU = 0x01 + SHKEY_Root_HKCU = 0x1, + SHKEY_Root_HKLM = 0x2, + SHKEY_Key_Explorer = 0x00, + SHKEY_Key_Shell = 0x10, + SHKEY_Key_ShellNoRoam = 0x20, + SHKEY_Key_Classes = 0x30, + SHKEY_Subkey_Default = 0x0000, + SHKEY_Subkey_ResourceName = 0x1000, + SHKEY_Subkey_Handlers = 0x2000, + SHKEY_Subkey_Associations = 0x3000, + SHKEY_Subkey_Volatile = 0x4000, + SHKEY_Subkey_MUICache = 0x5000, + SHKEY_Subkey_FileExts = 0x6000 }; static const WCHAR explorerW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r',0}; - HKEY hroot, hkey = NULL; + 'E','x','p','l','o','r','e','r','\\'}; + static const WCHAR shellW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'S','h','e','l','l','\\'}; + static const WCHAR shell_no_roamW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'S','h','e','l','l','N','o','R','o','a','m','\\'}; + static const WCHAR classesW[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\'}; + + static const WCHAR localized_resource_nameW[] = {'L','o','c','a','l','i','z','e','d', + 'R','e','s','o','u','r','c','e','N','a','m','e','\\'}; + static const WCHAR handlersW[] = {'H','a','n','d','l','e','r','s','\\'}; + static const WCHAR associationsW[] = {'A','s','s','o','c','i','a','t','i','o','n','s','\\'}; + static const WCHAR volatileW[] = {'V','o','l','a','t','i','l','e','\\'}; + static const WCHAR mui_cacheW[] = {'M','U','I','C','a','c','h','e','\\'}; + static const WCHAR file_extsW[] = {'F','i','l','e','E','x','t','s','\\'}; + + WCHAR *path; + const WCHAR *key, *subkey; + int size_key, size_subkey, size_user; + HKEY hkey = NULL; TRACE("(0x%08x, %s, %d)\n", flags, debugstr_w(sub_key), create); - switch (flags) - { - case SHKEY_Explorer | SHKEY_Root_HKCU: - RegOpenKeyExW(HKEY_CURRENT_USER, explorerW, 0, MAXIMUM_ALLOWED, &hroot); + /* For compatibility with Vista+ */ + if(flags == 0x1ffff) + flags = 0x21; + + switch(flags&0xff0) { + case SHKEY_Key_Explorer: + key = explorerW; + size_key = sizeof(explorerW); + break; + case SHKEY_Key_Shell: + key = shellW; + size_key = sizeof(shellW); + break; + case SHKEY_Key_ShellNoRoam: + key = shell_no_roamW; + size_key = sizeof(shell_no_roamW); + break; + case SHKEY_Key_Classes: + key = classesW; + size_key = sizeof(classesW); break; - case 0: + default: + FIXME("unsupported flags (0x%08x)\n", flags); return NULL; + } + + switch(flags&0xff000) { + case SHKEY_Subkey_Default: + subkey = NULL; + size_subkey = 0; + break; + case SHKEY_Subkey_ResourceName: + subkey = localized_resource_nameW; + size_subkey = sizeof(localized_resource_nameW); + break; + case SHKEY_Subkey_Handlers: + subkey = handlersW; + size_subkey = sizeof(handlersW); + break; + case SHKEY_Subkey_Associations: + subkey = associationsW; + size_subkey = sizeof(associationsW); + break; + case SHKEY_Subkey_Volatile: + subkey = volatileW; + size_subkey = sizeof(volatileW); + break; + case SHKEY_Subkey_MUICache: + subkey = mui_cacheW; + size_subkey = sizeof(mui_cacheW); + break; + case SHKEY_Subkey_FileExts: + subkey = file_extsW; + size_subkey = sizeof(file_extsW); + break; default: FIXME("unsupported flags (0x%08x)\n", flags); - return (HKEY)0xdeadbeef; + return NULL; } - if (create) - RegCreateKeyExW(hroot, sub_key, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hkey, NULL); + if(sub_key) + size_user = lstrlenW(sub_key)*sizeof(WCHAR); + else + size_user = 0; + + path = HeapAlloc(GetProcessHeap(), 0, size_key+size_subkey+size_user); + if(!path) { + ERR("Out of memory\n"); + return NULL; + } + + memcpy(path, key, size_key); + if(subkey) + memcpy(path+size_key/sizeof(WCHAR), subkey, size_subkey); + if(sub_key) + memcpy(path+(size_key+size_subkey)/sizeof(WCHAR), sub_key, size_user); + path[(size_key+size_subkey+size_user)/sizeof(WCHAR)] = '\0'; + + if(create) + RegCreateKeyExW((flags&0xf)==SHKEY_Root_HKLM?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER, + path, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hkey, NULL); else - RegOpenKeyExW(hroot, sub_key, 0, MAXIMUM_ALLOWED, &hkey); + RegOpenKeyExW((flags&0xf)==SHKEY_Root_HKLM?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER, + path, 0, MAXIMUM_ALLOWED, &hkey); - RegCloseKey(hroot); + HeapFree(GetProcessHeap(), 0, path); return hkey; } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index dfee9bf..1937cb0 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -61,7 +61,7 @@ static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); -static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPWSTR, BOOL); +static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPCWSTR, BOOL); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2680,15 +2680,28 @@ static void test_SHSetIniString(void) } enum _shellkey_flags { - SHKEY_Explorer = 0x00, - SHKEY_Root_HKCU = 0x01 + SHKEY_Root_HKCU = 0x1, + SHKEY_Root_HKLM = 0x2, + SHKEY_Key_Explorer = 0x00, + SHKEY_Key_Shell = 0x10, + SHKEY_Key_ShellNoRoam = 0x20, + SHKEY_Key_Classes = 0x30, + SHKEY_Subkey_Default = 0x0000, + SHKEY_Subkey_ResourceName = 0x1000, + SHKEY_Subkey_Handlers = 0x2000, + SHKEY_Subkey_Associations = 0x3000, + SHKEY_Subkey_Volatile = 0x4000, + SHKEY_Subkey_MUICache = 0x5000, + SHKEY_Subkey_FileExts = 0x6000 }; static void test_SHGetShellKey(void) { + static const WCHAR ShellFoldersW[] = { 'S','h','e','l','l',' ','F','o','l','d','e','r','s',0 }; + static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; + void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); - HKEY hkey, hkey2; - DWORD ret; + HKEY hkey; if (!pSHGetShellKey) { @@ -2709,30 +2722,38 @@ static void test_SHGetShellKey(void) return; } - /* marking broken cause latest Vista+ versions fail here */ + /* Vista+ limits SHKEY enumeration values */ SetLastError(0xdeadbeef); - hkey = pSHGetShellKey(SHKEY_Explorer, NULL, FALSE); - ok(hkey == NULL || broken(hkey != NULL), "got %p\n", hkey); + hkey = pSHGetShellKey(SHKEY_Key_Explorer, ShellFoldersW, FALSE); if (hkey) { - hkey2 = 0; - ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ok(hkey2 != NULL, "got %p\n", hkey2); - RegCloseKey( hkey2 ); - RegCloseKey( hkey ); + /* Tests not working on Vista+ */ + RegCloseKey(hkey); + + hkey = pSHGetShellKey(SHKEY_Root_HKLM|SHKEY_Key_Classes, NULL, FALSE); + ok(hkey != NULL, "hkey = NULL\n"); + RegCloseKey(hkey); } - hkey = pSHGetShellKey(SHKEY_Explorer | SHKEY_Root_HKCU, NULL, FALSE); - ok(hkey != NULL, "got %p\n", hkey); + hkey = pSHGetShellKey(SHKEY_Root_HKCU|SHKEY_Key_Explorer, ShellFoldersW, FALSE); + ok(hkey != NULL, "hkey = NULL\n"); + RegCloseKey(hkey); + + hkey = pSHGetShellKey(SHKEY_Root_HKLM|SHKEY_Key_Explorer, ShellFoldersW, FALSE); + ok(hkey != NULL, "hkey = NULL\n"); + RegCloseKey(hkey); + + hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, FALSE); + ok(hkey == NULL, "hkey != NULL\n"); - hkey2 = 0; - ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); - ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ok(hkey2 != NULL, "got %p\n", hkey2); - RegCloseKey( hkey2 ); + hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, TRUE); + ok(hkey != NULL, "Can't create key\n"); + RegCloseKey(hkey); - RegCloseKey( hkey ); + hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); + ok(hkey != NULL, "Can't create key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); + RegCloseKey(hkey); } static void init_pointers(void)

1 0

Andrew Talbot : gdi32: Constify some variables.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: bbd355614654ccf49e0180797f565c103c19a1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd355614654ccf49e0180797… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 11 22:25:15 2010 +0100 gdi32: Constify some variables. --- dlls/gdi32/bidi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 4ef0e99..297ce86 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -198,9 +198,9 @@ static int resolveParagraphs(WORD *types, int cch) Breaks a paragraph into lines - Input: Character count + Input: Array of line break flags + Character count In/Out: Array of characters - Array of line break flags Returns the count of characters on the first line @@ -209,7 +209,7 @@ static int resolveParagraphs(WORD *types, int cch) occurs after the character in pszInput[n]. Breaks before the first character are not allowed. ------------------------------------------------------------------------*/ -static int resolveLines(LPCWSTR pszInput, BOOL * pbrk, int cch) +static int resolveLines(LPCWSTR pszInput, const BOOL * pbrk, int cch) { /* skip characters not of type LS */ int ich = 0; @@ -289,14 +289,14 @@ static void resolveWhitespace(int baselevel, const WORD *pcls, BYTE *plevel, int Implements the Line-by-Line phases of the Unicode Bidi Algorithm Input: Count of characters + Array of character directions Inp/Out: Input text - Array of character directions Array of levels ------------------------------------------------------------------------*/ -static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, WORD * pclsLine, - BYTE * plevelLine, int cchPara, BOOL * pbrk) +static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, const WORD * pclsLine, + BYTE * plevelLine, int cchPara, const BOOL * pbrk) { int cchLine = 0; int done = 0;

1 0

Frédéric Delanoy : taskkill: Update French translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 7acdc0a8ea41e53ab834aba18050d4f8bd52c72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acdc0a8ea41e53ab834aba18… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 12 00:37:16 2010 +0200 taskkill: Update French translation. --- programs/taskkill/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Fr.rc b/programs/taskkill/Fr.rc index 51bfe85..89c031d 100644 --- a/programs/taskkill/Fr.rc +++ b/programs/taskkill/Fr.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Erreur : processus \"%s\" introuvable.\n" STRING_ENUM_FAILED, "Erreur : impossible d'énumérer la liste de processus.\n" STRING_TERMINATE_FAILED, "Erreur : impossible de terminer le processus \"%s\".\n" + STRING_SELF_TERMINATION, "Erreur : un processus ne peut pas s'auto-terminer.\n" }

1 0

Austin Lund : riched32/tests: Correct error messages in EM_POSFROMCHAR tests.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 12c964be68e69696876b659b1e139227bcd93dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c964be68e69696876b659b1… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Oct 12 10:25:46 2010 +1000 riched32/tests: Correct error messages in EM_POSFROMCHAR tests. --- dlls/riched32/tests/editor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 6b1f721..f11e3b5 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -776,13 +776,13 @@ static void test_EM_POSFROMCHAR(void) else if (i == 1) { ok(pl.y > 0, "EM_POSFROMCHAR reports y=%d, expected > 0\n", pl.y); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); height = pl.y; } else { ok(pl.y == i * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, i * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } } @@ -790,13 +790,13 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ @@ -809,20 +809,20 @@ static void test_EM_POSFROMCHAR(void) ok(pl.y == (i - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (i - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } /* Testing position at end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text);

1 0

Krzysztof Nowicki : ntdll: Fix possible deadlock in vectored exception handling.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: eb0e82a75568db095df5f78be703987147f00f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0e82a75568db095df5f78be… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Fri Oct 8 20:03:14 2010 +0200 ntdll: Fix possible deadlock in vectored exception handling. --- dlls/ntdll/exception.c | 29 ++++++++++++++++------------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 63fd281..4d2f759 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -48,14 +48,17 @@ typedef struct static struct list vectored_handlers = LIST_INIT(vectored_handlers); -static RTL_CRITICAL_SECTION vectored_handlers_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +static RTL_RWLOCK vectored_handlers_lock; + +/********************************************************************** + * exceptions_init + * + * Initialize read/write lock used by the vectored exception handling. + */ +void exceptions_init(void) { - 0, 0, &vectored_handlers_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": vectored_handlers_section") } -}; -static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + RtlInitializeResource(&vectored_handlers_lock); +} /********************************************************************** * wait_suspend @@ -162,7 +165,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceShared( &vectored_handlers_lock, TRUE ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -172,7 +175,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "handler at %p returned %x\n", handler->func, ret ); if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); return ret; } @@ -214,10 +217,10 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); } return handler; } @@ -231,7 +234,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) struct list *ptr; ULONG ret = FALSE; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -242,7 +245,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) break; } } - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); return ret; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 212edf5..3c35251 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,6 +71,7 @@ extern void virtual_init(void); extern void virtual_init_threading(void); extern void fill_cpu_info(void); extern void heap_set_debug_flags( HANDLE handle ); +extern void exceptions_init(void); /* server support */ extern timeout_t server_start_time; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index df6c3e2..bd24aa0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -296,6 +296,7 @@ HANDLE thread_init(void) user_shared_data->TickCountMultiplier = 1 << 24; fill_cpu_info(); + exceptions_init(); return exe_file; }

1 0

Hwang YunSong : taskkill: Update Korean resource.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 80a06a92a9a4465c9cb3960de9c7b48d423d44b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a06a92a9a4465c9cb3960de… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Oct 12 11:25:50 2010 +0900 taskkill: Update Korean resource. --- programs/taskkill/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Ko.rc b/programs/taskkill/Ko.rc index 5e22785..02b1011 100644 --- a/programs/taskkill/Ko.rc +++ b/programs/taskkill/Ko.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "에러: 프로세스 \"%s\"를 찾을 수 없습니다.\n" STRING_ENUM_FAILED, "에러: 프로세스 목록을 열거 할 수 업습니다.\n" STRING_TERMINATE_FAILED, "에러: \"%s\" 프로세스를 중단시킬 수 없습니다.\n" + STRING_SELF_TERMINATION, "에러: 프로세스 자가 종료는 허용되지 않습니다.\n" }

1 0