April 2017 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Replace get_htmldoc_classinfo with more generic helper.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 4632045f9ae92ec3803d9e3c7587061d9ed8a181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4632045f9ae92ec3803d9e3c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:50 2017 +0200 mshtml: Replace get_htmldoc_classinfo with more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index caaf788..6e7f1be 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -188,7 +188,7 @@ void release_typelib(void) DeleteCriticalSection(&cs_dispex_static_data); } -HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) +HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) { HRESULT hres; @@ -197,7 +197,7 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) if (!typelib) return hres; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_HTMLDocument, typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, typeinfo); if(FAILED(hres)) ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4271326..57679fc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4473,7 +4473,7 @@ static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface, { HTMLDocument *This = impl_from_IProvideClassInfo(iface); TRACE("(%p)->(%p)\n", This, ppTI); - return get_htmldoc_classinfo(ppTI); + return get_class_typeinfo(&CLSID_HTMLDocument, ppTI); } static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 89f2fcb..c0b1d29 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -316,7 +316,7 @@ HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; -HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : ntoskrnl.exe: Do not use P* types in IoReportResourceUsage.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 1cab71c788b15e259bd8eca1d8cca1b279148c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cab71c788b15e259bd8eca1d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 20 18:26:04 2017 +0200 ntoskrnl.exe: Do not use P* types in IoReportResourceUsage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f022f4c..c87f105 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1455,12 +1455,13 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, - ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, - ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) +NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, + ULONG drv_size, DRIVER_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, + ULONG dev_size, BOOLEAN overwrite, BOOLEAN *conflict ) { FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name), - drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected ); + drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, conflict ); + return STATUS_NOT_IMPLEMENTED; }

1 0

Austin English : ntoskrnl.exe: Add IoReportResourceForDetection stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 18c94886d7ca3f5c9df71e0b6268b3114ada25e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c94886d7ca3f5c9df71e0b6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 20 18:26:14 2017 +0200 ntoskrnl.exe: Add IoReportResourceForDetection stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c87f105..4b8a005 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1453,6 +1453,20 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceForDetection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, ULONG drv_size, + DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, + BOOLEAN *conflict ) +{ + FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + dev_obj, dev_list, dev_size, conflict ); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7cd5146..25649c9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -441,7 +441,7 @@ @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage -@ stub IoReportResourceForDetection +@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) @ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous

1 0

Louis Lenders : advapi32: Add stubs for RegSaveKeyEx{A,W}.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 6c7760f2175e241b330cde0a902c96d9007922e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7760f2175e241b330cde0a9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 13 18:00:22 2017 +0200 advapi32: Add stubs for RegSaveKeyEx{A,W}. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/registry.c | 19 +++++++++++++++++++ .../api-ms-win-core-localregistry-l1-1-0.spec | 4 ++-- .../api-ms-win-core-registry-l1-1-0.spec | 4 ++-- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- include/winreg.h | 3 +++ 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 078bb8f..7922c37 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -680,8 +680,8 @@ @ stdcall RegRestoreKeyA(long str long) @ stdcall RegRestoreKeyW(long wstr long) @ stdcall RegSaveKeyA(long ptr ptr) -# @ stub RegSaveKeyExA -# @ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) +@ stdcall RegSaveKeyExW(long wstr ptr long) @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) @ stdcall RegSetKeyValueA(long str str long ptr long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e32f48a..7a26fff 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2427,6 +2427,25 @@ LSTATUS WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa ) return RegSaveKeyW(hkey, fileW->Buffer, sa); } +/****************************************************************************** + * RegSaveKeyExA [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegSaveKeyExA( HKEY hkey, LPCSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) +{ + FIXME( "(%p,%s,%p,%d) flags not handled\n", hkey, debugstr_a(file), sa, flags ); + return RegSaveKeyA(hkey, file, sa); +} + +/****************************************************************************** + * RegSaveKeyExW [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) +{ + FIXME( "(%p,%s,%p,%d) flags not handled\n", hkey, debugstr_w(file), sa, flags ); + return RegSaveKeyW(hkey, file, sa); +} /****************************************************************************** * RegRestoreKeyW [ADVAPI32.@] diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec index fcf4f00..114d5a9 100644 --- a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec @@ -31,8 +31,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec index 91b1a94..7a48e3b 100644 --- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec +++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec @@ -34,8 +34,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index d5bc3e6..d0660eb 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -120,8 +120,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e8cf502..cf6ceef 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1307,8 +1307,8 @@ @ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) kernel32.RegQueryValueExW @ stdcall -private RegRestoreKeyA(long str long) kernel32.RegRestoreKeyA @ stdcall -private RegRestoreKeyW(long wstr long) kernel32.RegRestoreKeyW -# @ stub RegSaveKeyExA -# @ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall -private RegSetKeySecurity(long long ptr) kernel32.RegSetKeySecurity @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW diff --git a/include/winreg.h b/include/winreg.h index cf6bd47..42b7725 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -168,6 +168,9 @@ WINADVAPI LSTATUS WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD); WINADVAPI LSTATUS WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); WINADVAPI LSTATUS WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); #define RegSaveKey WINELIB_NAME_AW(RegSaveKey) +WINADVAPI LSTATUS WINAPI RegSaveKeyExA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES,DWORD); +WINADVAPI LSTATUS WINAPI RegSaveKeyExW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES,DWORD); +#define RegSaveKeyEx WINELIB_NAME_AW(RegSaveKeyEx) WINADVAPI LSTATUS WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); WINADVAPI LSTATUS WINAPI RegSetKeyValueA(HKEY,LPCSTR,LPCSTR,DWORD,const void*,DWORD); WINADVAPI LSTATUS WINAPI RegSetKeyValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD);

1 0

Hugh McMaster : regedit: Call TrackPopupMenu() from WM_CONTEXTMENU.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 4dc5a764c781fa50530fcec7baf6a1e53256368c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc5a764c781fa50530fcec7b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:25 2017 +0000 regedit: Call TrackPopupMenu() from WM_CONTEXTMENU. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2211d68..4d184c3 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -292,6 +292,9 @@ static void set_last_key(HWND hwndTV) } } +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + /******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) @@ -368,6 +371,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa draw_splitbar(hWnd, last_split); break; + case WM_CONTEXTMENU: { + int x = GET_X_LPARAM(lParam); + int y = GET_Y_LPARAM(lParam); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + } + case WM_KEYDOWN: if (wParam == VK_ESCAPE) if (GetCapture() == hWnd) { @@ -419,13 +428,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case NM_SETFOCUS: g_pChildWnd->nFocusPanel = 0; break; - case NM_RCLICK: { - POINT pt; - GetCursorPos(&pt); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), - TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); - break; - } case TVN_BEGINLABELEDITW: { HKEY hRootKey; LPWSTR path;

1 0

Hugh McMaster : regedit: Select the targeted treeview item on right mouse click.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: ab0d0c6ee4325670f66a68af4f06fbd9acbb6151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0d0c6ee4325670f66a68af4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:36 2017 +0000 regedit: Select the targeted treeview item on right mouse click. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 4d184c3..df7c640 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -372,9 +372,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_CONTEXTMENU: { - int x = GET_X_LPARAM(lParam); - int y = GET_Y_LPARAM(lParam); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + TVHITTESTINFO ht; + ht.pt = pt; + ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt); + if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) + SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hFrameWnd, NULL); } case WM_KEYDOWN:

1 0

Hugh McMaster : regedit: Only show the context menu if the mouse is over a treeitem.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 6f667d1c428bf2589eab4b177d6b1a798cc4a102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f667d1c428bf2589eab4b177… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:46 2017 +0000 regedit: Only show the context menu if the mouse is over a treeitem. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index df7c640..6ee0cdb 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -376,10 +376,11 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TVHITTESTINFO ht; ht.pt = pt; ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt); - if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) + if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) { SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, - pt.x, pt.y, 0, hFrameWnd, NULL); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hFrameWnd, NULL); + } } case WM_KEYDOWN:

1 0

Nikolay Sivov : dwrite: Handle allocation failure when duplicating reference key.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 5b07cfc13ec3ddbb3092e2e5fd1a613a97fb2b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b07cfc13ec3ddbb3092e2e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 12:50:07 2017 +0300 dwrite: Handle allocation failure when duplicating reference key. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c1b2286..3b265cb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2,7 +2,7 @@ * Font and collections * * Copyright 2011 Huw Davies - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -4212,23 +4212,32 @@ static const IDWriteFontFileVtbl dwritefontfilevtbl = { dwritefontfile_Analyze, }; -HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) +HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, + IDWriteFontFile **ret) { - struct dwrite_fontfile *This; + struct dwrite_fontfile *file; + void *key; - This = heap_alloc(sizeof(struct dwrite_fontfile)); - if (!This) return E_OUTOFMEMORY; + *ret = NULL; - This->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; - This->ref = 1; + file = heap_alloc(sizeof(*file)); + key = heap_alloc(key_size); + if (!file || !key) { + heap_free(file); + heap_free(key); + return E_OUTOFMEMORY; + } + + file->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; + file->ref = 1; IDWriteFontFileLoader_AddRef(loader); - This->loader = loader; - This->stream = NULL; - This->reference_key = heap_alloc(key_size); - memcpy(This->reference_key, reference_key, key_size); - This->key_size = key_size; + file->loader = loader; + file->stream = NULL; + file->reference_key = key; + memcpy(file->reference_key, reference_key, key_size); + file->key_size = key_size; - *font_file = &This->IDWriteFontFile_iface; + *ret = &file->IDWriteFontFile_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite: Added a helper to avoid extra traces from one method calling another.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 9bf9a9590a2f35ac3fd98d1f1b9f88d9792bc127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf9a9590a2f35ac3fd98d1f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 12:50:08 2017 +0300 dwrite: Added a helper to avoid extra traces from one method calling another. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3b265cb..c74b2bb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -605,25 +605,31 @@ static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace4 *ifa return S_OK; } -static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace4 *iface, UINT32 const *codepoints, - UINT32 count, UINT16 *glyph_indices) +static HRESULT fontface_get_glyphs(struct dwrite_fontface *fontface, UINT32 const *codepoints, + UINT32 count, UINT16 *glyphs) { - struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - - TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - - if (!glyph_indices) + if (!glyphs) return E_INVALIDARG; if (!codepoints) { - memset(glyph_indices, 0, count*sizeof(UINT16)); + memset(glyphs, 0, count * sizeof(*glyphs)); return E_INVALIDARG; } - freetype_get_glyphs(iface, This->charmap, codepoints, count, glyph_indices); + freetype_get_glyphs(&fontface->IDWriteFontFace4_iface, fontface->charmap, codepoints, count, glyphs); return S_OK; } +static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace4 *iface, UINT32 const *codepoints, + UINT32 count, UINT16 *glyphs) +{ + struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + + TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyphs); + + return fontface_get_glyphs(This, codepoints, count, glyphs); +} + static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace4 *iface, UINT32 table_tag, const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { @@ -1161,13 +1167,11 @@ static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace4 *iface, UINT32 { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); UINT16 index; - HRESULT hr; TRACE("(%p)->(0x%08x)\n", This, ch); index = 0; - hr = IDWriteFontFace4_GetGlyphIndices(iface, &ch, 1, &index); - if (FAILED(hr)) + if (FAILED(fontface_get_glyphs(This, &ch, 1, &index))) return FALSE; return index != 0;

1 0

Nikolay Sivov : include: Added DB_MODE_* constants.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 479811169272e2805f30cc4400d6ccb8c026f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479811169272e2805f30cc440… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:05:31 2017 +0300 include: Added DB_MODE_* constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 00e16f9..53caded 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -519,6 +519,13 @@ cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)" cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") +cpp_quote("#define DB_MODE_READ 0x01") +cpp_quote("#define DB_MODE_WRITE 0x02") +cpp_quote("#define DB_MODE_READWRITE 0x03") +cpp_quote("#define DB_MODE_SHARE_DENY_READ 0x04") +cpp_quote("#define DB_MODE_SHARE_DENY_WRITE 0x08") +cpp_quote("#define DB_MODE_SHARE_EXCLUSIVE 0x0c") +cpp_quote("#define DB_MODE_SHARE_DENY_NONE 0x10") typedef struct tagDBCOLUMNACCESS {

1 0