June 2017 - Wine-Commits - list.winehq.org

Piotr Caban : include: Add __EXCEPT_CTX/__FINALLY_CTX macros.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 3eae4807dcee36341eeaf0a89a1ded7b51a0c4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eae4807dcee36341eeaf0a89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 12:39:29 2017 +0200 include: Add __EXCEPT_CTX/__FINALLY_CTX macros. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ include/wine/exception.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index c81c821..0e00f73 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -99,6 +99,31 @@ DWORD __wine_exception_handler( EXCEPTION_RECORD *record, unwind_frame( record, frame ); } +DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter_ctx( &ptrs, wine_frame->ctx )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + unwind_frame( record, frame ); +} + DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -133,3 +158,16 @@ DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + wine_frame->u.finally_func_ctx( FALSE, wine_frame->ctx ); + } + return ExceptionContinueSearch; +} diff --git a/include/wine/exception.h b/include/wine/exception.h index f275568..5bc4d1c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -81,7 +81,9 @@ extern "C" { #define __TRY __try #define __EXCEPT(func) __except((func)(GetExceptionInformation())) +#define __EXCEPT_CTX(func, ctx) __except((func)(GetExceptionInformation(), ctx)) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } +#define __FINALLY_CTX(func, ctx) __finally { (func)(!AbnormalTermination(), ctx); } #define __ENDTRY /*nothing*/ #define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) @@ -100,6 +102,10 @@ extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; extern DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -112,6 +118,10 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; #define __TRY \ do { __WINE_FRAME __f; \ @@ -131,6 +141,18 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { +#define __EXCEPT_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_ctx_handler; \ + __f.u.filter_ctx = (func); \ + __f.ctx = context; \ + if (sigsetjmp( __f.jmp, 0 )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT \ } while(0); \ @@ -175,9 +197,25 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } \ } while (0); +#define __FINALLY_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + (func)(1, context); \ + break; \ + } else { \ + __f.frame.Handler = __wine_finally_ctx_handler; \ + __f.u.finally_func_ctx = (func); \ + __f.ctx = context; \ + __wine_push_frame( &__f.frame ); \ + __first = 0; \ + } \ + } while (0); + typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (CALLBACK *__WINE_FILTER_CTX)(PEXCEPTION_POINTERS, void*); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +typedef void (CALLBACK *__WINE_FINALLY_CTX)(BOOL, void*); #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -190,9 +228,12 @@ typedef struct __tagWINE_FRAME { /* exception data */ __WINE_FILTER filter; + __WINE_FILTER_CTX filter_ctx; /* finally data */ __WINE_FINALLY finally_func; + __WINE_FINALLY_CTX finally_func_ctx; } u; + void *ctx; sigjmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode;

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu items.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: f0949baafc4c63ab5796eff0e9c4fe30d1659d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0949baafc4c63ab5796eff0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:24 2017 +0000 regedit: Update handling of the 'Modify' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d3dffdc..9853810 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -137,10 +137,11 @@ static void update_modify_items(HMENU hMenu, int index) { unsigned int state = MF_ENABLED; - if (!g_pChildWnd->nFocusPanel || index == -1) + if (index == -1) state = MF_GRAYED; EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_MODIFY_BIN, state | MF_BYCOMMAND); } static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index)

1 0

Hugh McMaster : regedit: Only show the 'Modify' menu items when the listview has focus.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: adf298685f97e3d8faaee2f7440d5d417d360da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf298685f97e3d8faaee2f74… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:14 2017 +0000 regedit: Only show the 'Modify' menu items when the listview has focus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 164 ++++++++++++++++++++++---------------------- po/bg.po | 162 +++++++++++++++++++++---------------------- po/ca.po | 164 ++++++++++++++++++++++---------------------- po/cs.po | 164 ++++++++++++++++++++++---------------------- po/da.po | 164 ++++++++++++++++++++++---------------------- po/de.po | 164 ++++++++++++++++++++++---------------------- po/el.po | 162 +++++++++++++++++++++---------------------- po/en.po | 164 ++++++++++++++++++++++---------------------- po/en_US.po | 164 ++++++++++++++++++++++---------------------- po/eo.po | 164 ++++++++++++++++++++++---------------------- po/es.po | 164 ++++++++++++++++++++++---------------------- po/fa.po | 162 +++++++++++++++++++++---------------------- po/fi.po | 164 ++++++++++++++++++++++---------------------- po/fr.po | 164 ++++++++++++++++++++++---------------------- po/he.po | 164 ++++++++++++++++++++++---------------------- po/hi.po | 162 +++++++++++++++++++++---------------------- po/hr.po | 162 +++++++++++++++++++++---------------------- po/hu.po | 164 ++++++++++++++++++++++---------------------- po/it.po | 164 ++++++++++++++++++++++---------------------- po/ja.po | 164 ++++++++++++++++++++++---------------------- po/ko.po | 164 ++++++++++++++++++++++---------------------- po/lt.po | 164 ++++++++++++++++++++++---------------------- po/ml.po | 162 +++++++++++++++++++++---------------------- po/nb_NO.po | 164 ++++++++++++++++++++++---------------------- po/nl.po | 164 ++++++++++++++++++++++---------------------- po/or.po | 162 +++++++++++++++++++++---------------------- po/pa.po | 162 +++++++++++++++++++++---------------------- po/pl.po | 164 ++++++++++++++++++++++---------------------- po/pt_BR.po | 164 ++++++++++++++++++++++---------------------- po/pt_PT.po | 164 ++++++++++++++++++++++---------------------- po/rm.po | 162 +++++++++++++++++++++---------------------- po/ro.po | 164 ++++++++++++++++++++++---------------------- po/ru.po | 164 ++++++++++++++++++++++---------------------- po/sk.po | 162 +++++++++++++++++++++---------------------- po/sl.po | 164 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 162 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 162 +++++++++++++++++++++---------------------- po/sv.po | 164 ++++++++++++++++++++++---------------------- po/te.po | 162 +++++++++++++++++++++---------------------- po/th.po | 162 +++++++++++++++++++++---------------------- po/tr.po | 164 ++++++++++++++++++++++---------------------- po/uk.po | 164 ++++++++++++++++++++++---------------------- po/wa.po | 162 +++++++++++++++++++++---------------------- po/wine.pot | 162 +++++++++++++++++++++---------------------- po/zh_CN.po | 164 ++++++++++++++++++++++---------------------- po/zh_TW.po | 164 ++++++++++++++++++++++---------------------- programs/regedit/framewnd.c | 22 +++++- programs/regedit/regedit.rc | 6 +- programs/regedit/resource.h | 2 + 49 files changed, 3810 insertions(+), 3732 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf298685f97e3d8faaee…

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetTransportAddress.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: a4ee1b2675074b795054c6174b27a3ae11c2c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee1b2675074b795054c6174… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:40 2017 +0100 wsdapi/tests: Add tests for Get/SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/address.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index a4a2821..e2f6642 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 +IMPORTS = wsdapi ole32 user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 8b16b06..c1bf3ba 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <winsock2.h> #include <windows.h> #include "wine/test.h" @@ -72,11 +73,71 @@ static void CreateUdpAddress_tests(void) ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); } +static void GetSetTransportAddress_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + const WCHAR ipv4Address[] = {'1','0','.','2','0','.','3','0','.','4','0',0}; + const WCHAR ipv6Address[] = {'a','a','b','b',':','c','d',':',':','a','b','c',0}; + const WCHAR invalidAddress[] = {'n','o','t','/','v','a','l','i','d',0}; + LPCWSTR returnedAddress = NULL; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + + /* Try setting a null address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + /* Try setting an invalid address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); + todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + + /* Try setting an IPv4 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Try setting an IPv6 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); + GetSetTransportAddress_udp_tests(); CoUninitialize(); }

1 0

Daniel Lehman : msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 4aa813867cbd6ead4e1a66cdd0b5c8f3b6372fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa813867cbd6ead4e1a66cdd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 19 10:16:07 2017 -0700 msvcrt: Translate SEH exception on each call to __CxxFrameHandler. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 46 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index e891567..57fce93 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -108,6 +108,14 @@ typedef struct __cxx_function_descr UINT flags; } cxx_function_descr; +typedef struct +{ + ULONG64 dest_frame; + ULONG64 orig_frame; + DISPATCHER_CONTEXT *dispatch; + const cxx_function_descr *descr; +} se_translator_ctx; + static inline void* rva_to_ptr(UINT rva, ULONG64 base) { return rva ? (void*)(base+rva) : NULL; @@ -429,6 +437,26 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("no matching catch block found\n"); } +static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) +{ + se_translator_ctx *ctx = (se_translator_ctx *)c; + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + cxx_exception_type *exc_type; + + if (rec->ExceptionCode != CXX_EXCEPTION) + { + TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + MSVCRT_terminate(); + } + + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + ctx->descr, exc_type, ctx->orig_frame); + + __DestructExceptionObject(rec); + return ExceptionContinueSearch; +} + static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) @@ -554,10 +582,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (data->se_translator) { EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - data->se_translator(rec->ExceptionCode, &except_ptrs); + ctx.dest_frame = frame; + ctx.orig_frame = orig_frame; + ctx.dispatch = dispatch; + ctx.descr = descr; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } }

1 0

André Hentschel : ntdll: Fix Cpsr value in CONTEXT_ARM64.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 99db4c697d0349f31879126adcb9d365383513c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db4c697d0349f31879126ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 4 18:51:59 2017 +0200 ntdll: Fix Cpsr value in CONTEXT_ARM64. The CPU can be configured to not allow reading DAIF in EL0t (User Mode), and for debugging purpose NZCV might be more interesting. Reported by Stefan Dösinger Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 14c5260..ca169a1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -185,7 +185,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ - "mrs x1, DAIF\n\t" + "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ "ldp x0, x1, [sp], #32\n\t" "str x0, [x0, #0x8]\n\t" /* context->X0 */

1 0

Hugh McMaster : regedit: Re-implement favourite registry key handling.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 27b2519ca47192349fdcb5e09fe9eee10d00526f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b2519ca47192349fdcb5e09… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:57:53 2017 +0000 regedit: Re-implement favourite registry key handling. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 77 +++++++++++++++++++++++++++------------------ programs/regedit/regproc.c | 13 -------- programs/regedit/regproc.h | 9 ++++++ 3 files changed, 56 insertions(+), 43 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index cd7dad0..e654d48 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -198,38 +198,55 @@ static void UpdateMenuItems(HMENU hMenu) { HeapFree(GetProcessHeap(), 0, keyName); } -static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) +static void add_favourite_key_menu_items(HMENU hMenu) { - if (wItem == 3) { - HKEY hKey; - while(GetMenuItemCount(hMenu)>2) + HKEY hkey; + LONG rc; + DWORD num_values, max_value_len, value_len, type, i; + WCHAR *value_name; + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); + if (rc != ERROR_SUCCESS) return; + + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, + &max_value_len, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + goto exit; + } + + if (!num_values) goto exit; + + max_value_len++; + value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(value_name); + + AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + + for (i = 0; i < num_values; i++) + { + value_len = max_value_len; + rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); + if (rc == ERROR_SUCCESS && type == REG_SZ) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + } + + HeapFree(GetProcessHeap(), 0, value_name); +exit: + RegCloseKey(hkey); +} + +static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) +{ + if (hMenu == GetSubMenu(hMenuFrame, ID_FAVORITES_MENU)) + { + while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - int i = 0; - BOOL sep = FALSE; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - if (!sep) { - AppendMenuW(hMenu, MF_SEPARATOR, -1, NULL); - sep = TRUE; - } - AppendMenuW(hMenu, MF_STRING, ID_FAVORITE_FIRST+i, namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } + + add_favourite_key_menu_items(hMenu); } + UpdateMenuItems(hMenu); } @@ -1056,7 +1073,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_INITMENUPOPUP: if (!HIWORD(lParam)) - OnInitMenuPopup(hWnd, (HMENU)wParam, LOWORD(lParam)); + OnInitMenuPopup(hWnd, (HMENU)wParam); break; case WM_MENUSELECT: OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 10b4a38..d5be72f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -50,19 +50,6 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -/* return values */ -#define NOT_ENOUGH_MEMORY 1 - -/* processing macros */ - -/* common check of memory allocation results */ -#define CHECK_ENOUGH_MEMORY(p) \ -if (!(p)) \ -{ \ - output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ - exit(NOT_ENOUGH_MEMORY); \ -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index aff4bee..72e6b38 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,15 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 +#define NOT_ENOUGH_MEMORY 1 + +#define CHECK_ENOUGH_MEMORY(p) \ +if (!(p)) \ +{ \ + output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ + exit(NOT_ENOUGH_MEMORY); \ +} + void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 37d7c519053b0cf30334acf087db67f804892ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7c519053b0cf30334acf08… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Jun 3 20:42:16 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/po/pl.po b/po/pl.po index 50231bc..de2a989 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,20 +2,20 @@ # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. -# Marcin Mikołajczak <marcin123407(a)vivaldi.net>, 2017. +# Marcin Mikołajczak <me(a)m4sk.in>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-05 21:48+0200\n" -"Last-Translator: Marcin Mikołajczak <marcin123407(a)vivaldi.net>\n" +"PO-Revision-Date: 2017-06-03 20:40+0200\n" +"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -11807,11 +11807,8 @@ msgid "&About Registry Editor" msgstr "Edytor rejestru - i&nformacje" #: regedit.rc:91 regedit.rc:98 regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "rozwinięty" +msgstr "Rozwiń" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -11914,13 +11911,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Zawiera polecenia dla dostępu do często używanych klawiszy" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "Zawiera polecenia wyświetlające informacje o programie" +msgstr "" +"Zawiera polecenia wyświetlające pomoc i informacje dotyczące edytora rejestru" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12161,14 +12155,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Nie rozpoznano linii '%1'.\n" +msgstr "regedit: Wiersz zawiera nieprawidłową składnię.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Kończy działanie edytora rejestru" @@ -12185,10 +12175,8 @@ msgid "Shows or hides the status bar" msgstr "Pokazuje lub ukrywa pasek stanu" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Zmienia pozycję podziału pomiędzy dwoma okienkami" +msgstr "Zmienia pozycję podziału pomiędzy dwoma oknami" #: regedit.rc:194 msgid "Refreshes the window" @@ -12232,10 +12220,8 @@ msgid "Adds a new binary value" msgstr "Dodaje nową wartość binarną" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Dodaje nową wartość binarną" +msgstr "Dodaje nową wartość 32-bitową" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12250,10 +12236,8 @@ msgid "Prints all or part of the registry" msgstr "Drukuje całość lub część rejestru" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Edytor rejestru" +msgstr "Otwiera pomoc edytora rejestru" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12296,26 +12280,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nie można odnaleźć klucza rejestru '%1'." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Umożliwia zmianę wartości danej" +msgstr "Modyfikuje wartość rejestru w formie binarnej" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Dodaje nową wartość ciągu rozwijalnego" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuje zaznaczoną gałąź rejestru do pliku tekstowego" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Dodaje nową wartość ciągu" +msgstr "Dodaje nową rozwiniętą wartość ciągu" #: regedit.rc:213 msgid "Confirm Key Delete" @@ -12328,11 +12306,8 @@ msgstr "" "Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" #: regedit.rc:232 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "zwinięty" +msgstr "Zwiń" #: regsvr32.rc:32 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: e6f225fc5f36a22a709d2cb0dfe0a53a722309ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f225fc5f36a22a709d2cb0d… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 3 07:44:47 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/po/lt.po b/po/lt.po index 651dce7..33e1718 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 08:05+0300\n" +"PO-Revision-Date: 2017-06-03 07:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11027,7 +11027,7 @@ msgstr "&Sistemos konfigūracija" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "Paleisti &registro tvarkytuvę" +msgstr "Paleisti &Registro tvarkytuvę" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11199,7 +11199,7 @@ msgstr "Keisti paskirstytojo COM kompiuterio nustatymus" #: oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Paleisti „Wine“ registro tvarkytuvę" +msgstr "Paleisti „Wine“ Registro tvarkytuvę" #: oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -11871,14 +11871,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Pateikiamos komandos dažnai naudojamų raktų prieigai" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Pateikiamos komandos žinyno ir informacijos apie registro tvarkytuvę rodymui" +"Pateikiamos komandos žinyno ir informacijos apie Registro tvarkytuvę rodymui" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12119,10 +12115,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Išeina iš registro tvarkytuvės" +msgstr "Išeina iš Registro tvarkytuvės" #: regedit.rc:190 msgid "Adds keys to the favorites list" @@ -12137,8 +12131,6 @@ msgid "Shows or hides the status bar" msgstr "Parodo arba paslepia būsenos juostą" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Pakeičia polangių skirtuko poziciją tarp polangių" @@ -12183,10 +12175,8 @@ msgid "Adds a new binary value" msgstr "Prideda naują dvejetainę reikšmę" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Prideda naują dvejetainę reikšmę" +msgstr "Prideda naują 32-bitų reikšmę" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12201,10 +12191,8 @@ msgid "Prints all or part of the registry" msgstr "Atspausdina visą ar dalį registro" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registro tvarkytuvė" +msgstr "Atveria Registro tvarkytuvės žinyną" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12247,26 +12235,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifikuoja reikšmės duomenis" +msgstr "Modifikuoja reikšmės duomenis dvejetainiu formatu" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Prideda naują kelių eilučių reikšmę" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Prideda naują eilutės reikšmę" +msgstr "Prideda naują išplečiamos eilutės reikšmę" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Nikolay Sivov : shell32: Avoid zero length allocations when converting path in ExtractIconA() ( Valgrind).
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 1a5561c0cf202805436dd58635f6f61b8254d3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5561c0cf202805436dd5863… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:10:28 2017 +0300 shell32: Avoid zero length allocations when converting path in ExtractIconA() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 15 +++++++-------- dlls/shell32/shell32_main.h | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 04924c0..34b906c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -846,17 +846,16 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) /************************************************************************* * ExtractIconA [SHELL32.@] */ -HICON WINAPI ExtractIconA(HINSTANCE hInstance, LPCSTR lpszFile, UINT nIconIndex) -{ +HICON WINAPI ExtractIconA(HINSTANCE hInstance, const char *file, UINT nIconIndex) +{ + WCHAR *fileW; HICON ret; - INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - TRACE("%p %s %d\n", hInstance, lpszFile, nIconIndex); + TRACE("%p %s %d\n", hInstance, debugstr_a(file), nIconIndex); - MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); - ret = ExtractIconW(hInstance, lpwstrFile, nIconIndex); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + fileW = strdupAtoW(file); + ret = ExtractIconW(hInstance, fileW, nIconIndex); + HeapFree(GetProcessHeap(), 0, fileW); return ret; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 941ca74..fc2a5ba 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -236,4 +236,19 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } +static inline WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret; + DWORD len; + + if (!str) return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #endif

1 0