wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Owen Rudge : wsdapi/tests: Add WSDCreateUdpAddress tests.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 30b356337384ca38b00c4273d278a73054233bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b356337384ca38b00c4273d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:37 2017 +0100 wsdapi/tests: Add WSDCreateUdpAddress tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/address.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 77434cf..a4a2821 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 user32 C_SRCS = \ + address.c \ discovery.c \ memory.c \ xml.c diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c new file mode 100644 index 0000000..8b16b06 --- /dev/null +++ b/dlls/wsdapi/tests/address.c @@ -0,0 +1,82 @@ +/* + * Web Services on Devices + * Address tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpAddress_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL, *udpAddress2 = NULL; + IWSDTransportAddress *transportAddress = NULL; + IWSDAddress *address = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpAddress(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUDPAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try to query for objects */ + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpAddress_Release(udpAddress2); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDTransportAddress_Release(transportAddress); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDAddress_Release(address); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpAddress_Release(udpAddress); + ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); +} + +START_TEST(address) +{ + CoInitialize(NULL); + + CreateUdpAddress_tests(); + + CoUninitialize(); +}

1 0

Daniel Lehman : msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Alexandre Julliard 05 Jun '17

05 Jun '17

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

Piotr Caban : include: Add __EXCEPT_CTX/__FINALLY_CTX macros.
by Alexandre Julliard 05 Jun '17

05 Jun '17

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 05 Jun '17

05 Jun '17

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 05 Jun '17

05 Jun '17

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

Hugh McMaster : regedit: Use the treeview item label in the 'Favourites' menu instead of the key path.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 46bff016ab9b6f698a5934d044a7c981704bf72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bff016ab9b6f698a5934d04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:04 2017 +0000 regedit: Use the treeview item label in the 'Favourites' menu instead of the key path. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index e654d48..7e48513 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -646,15 +646,21 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(uMsg) { case WM_INITDIALOG: { - HKEY hKeyRoot = NULL; - LPWSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + HTREEITEM selected; + TVITEMW item; + WCHAR buf[128]; + + selected = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = selected; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); - if(!ItemPath || !*ItemPath) - ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SetWindowTextW(hwndValue, ItemPath); + SetWindowTextW(hwndValue, buf); SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); - HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND:

1 0

Hugh McMaster : regedit: Re-implement favourite registry key handling.
by Alexandre Julliard 05 Jun '17

05 Jun '17

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

Nikolay Sivov : shell32: Avoid zero length allocations when converting path in ExtractIconA() ( Valgrind).
by Alexandre Julliard 05 Jun '17

05 Jun '17

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

Nikolay Sivov : mf: Added IMFMediaSession stub.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 58adb553e4b7181628d2a7e5712fd30ab417ccae URL: http://source.winehq.org/git/wine.git/?a=commit;h=58adb553e4b7181628d2a7e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:09:48 2017 +0300 mf: Added IMFMediaSession stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 6725d5b..9c61d94 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = mf C_SRCS = \ main.c \ + session.c \ topology.c diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index cd6d3dc..3b02bd2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -39,7 +39,7 @@ @ stub MFCreateMP3MediaSink @ stub MFCreateMPEG4MediaSink @ stub MFCreateMediaProcessor -@ stub MFCreateMediaSession +@ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin @ stub MFCreateNetSchemePlugin @ stub MFCreatePMPHost diff --git a/dlls/mf/session.c b/dlls/mf/session.c new file mode 100644 index 0000000..18c5f3b --- /dev/null +++ b/dlls/mf/session.c @@ -0,0 +1,264 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +typedef struct mfsession +{ + IMFMediaSession IMFMediaSession_iface; + LONG ref; +} mfsession; + +static inline mfsession *impl_from_IMFMediaSession(IMFMediaSession *iface) +{ + return CONTAINING_RECORD(iface, mfsession, IMFMediaSession_iface); +} + +static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSession) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSession_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(format), start); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %s, %p)\n", This, flags, wine_dbgstr_longlong(id), topology); + + return E_NOTIMPL; +} + +static const IMFMediaSessionVtbl mfmediasessionvtbl = +{ + mfsession_QueryInterface, + mfsession_AddRef, + mfsession_Release, + mfsession_GetEvent, + mfsession_BeginGetEvent, + mfsession_EndGetEvent, + mfsession_QueueEvent, + mfsession_SetTopology, + mfsession_ClearTopologies, + mfsession_Start, + mfsession_Pause, + mfsession_Stop, + mfsession_Close, + mfsession_Shutdown, + mfsession_GetClock, + mfsession_GetSessionCapabilities, + mfsession_GetFullTopology, +}; + +/*********************************************************************** + * MFCreateTopology (mf.@) + */ +HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session) +{ + mfsession *object; + + TRACE("(%p, %p)\n", config, session); + + if (!session) + return E_POINTER; + + if (config) + FIXME("session configuration ignored\n"); + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; + object->ref = 1; + + *session = &object->IMFMediaSession_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 767ff42..45b4957 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -163,5 +163,6 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

André Hentschel : ntdll: Fix Cpsr value in CONTEXT_ARM64.
by Alexandre Julliard 05 Jun '17

05 Jun '17

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

← Newer
1
...
50
51
52
53
54
55
56
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017