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

Hugh McMaster : comctl32: Improve right-click handling in treeview controls.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 9ee986cce4146fab330b3f7ebafef538eefb581a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee986cce4146fab330b3f7eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 4 12:42:49 2017 +0000 comctl32: Improve right-click handling in treeview controls. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d6a6055bc95b701ccb5b439739b975330a4f67c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 74206bd..9a37cf3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4347,7 +4347,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); - TREEVIEW_HitTest(infoPtr, &ht); + if (TREEVIEW_HitTest(infoPtr, &ht)) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4368,6 +4373,13 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } + if (ht.hItem) + { + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + infoPtr->focusedItem = infoPtr->selectedItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + } + return 0; }

1 0

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

20 Jul '17

Module: wine Branch: stable Commit: d1ea810b28e33aaf5f9efa9fa179aa4da69448ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ea810b28e33aaf5f9efa9fa… 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> (cherry picked from commit 4dc5a764c781fa50530fcec7baf6a1e53256368c) Signed-off-by: Michael Stefaniuc <mstefani(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 08eeec1..74e30f8 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -283,6 +283,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) @@ -359,6 +362,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) { @@ -410,13 +419,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 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 95f2e76bd4bc3bf875ca87414f26d07561efef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f2e76bd4bc3bf875ca87414… 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> (cherry picked from commit ab0d0c6ee4325670f66a68af4f06fbd9acbb6151) Signed-off-by: Michael Stefaniuc <mstefani(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 74e30f8..b24e358 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -363,9 +363,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

Sebastian Lackner : ntdll: Do not cast unaligned pointer to M128A in set_context_reg.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 86b4c74aa63bce8824c64326f79b0b3f498c6c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b4c74aa63bce8824c64326f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:50:48 2017 +0200 ntdll: Do not cast unaligned pointer to M128A in set_context_reg. GCC 7.x will assume 'val' is properly aligned when using a cast. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2ec61105d47543ae5bddf393d384b5165795ab5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f33fe4c..6bd51ea 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) case 14: context->R14 = *(ULONG64 *)val; break; case 15: context->R15 = *(ULONG64 *)val; break; case 16: context->Rip = *(ULONG64 *)val; break; - case 17: context->u.s.Xmm0 = *(M128A *)val; break; - case 18: context->u.s.Xmm1 = *(M128A *)val; break; - case 19: context->u.s.Xmm2 = *(M128A *)val; break; - case 20: context->u.s.Xmm3 = *(M128A *)val; break; - case 21: context->u.s.Xmm4 = *(M128A *)val; break; - case 22: context->u.s.Xmm5 = *(M128A *)val; break; - case 23: context->u.s.Xmm6 = *(M128A *)val; break; - case 24: context->u.s.Xmm7 = *(M128A *)val; break; - case 25: context->u.s.Xmm8 = *(M128A *)val; break; - case 26: context->u.s.Xmm9 = *(M128A *)val; break; - case 27: context->u.s.Xmm10 = *(M128A *)val; break; - case 28: context->u.s.Xmm11 = *(M128A *)val; break; - case 29: context->u.s.Xmm12 = *(M128A *)val; break; - case 30: context->u.s.Xmm13 = *(M128A *)val; break; - case 31: context->u.s.Xmm14 = *(M128A *)val; break; - case 32: context->u.s.Xmm15 = *(M128A *)val; break; - case 33: context->u.s.Legacy[0] = *(M128A *)val; break; - case 34: context->u.s.Legacy[1] = *(M128A *)val; break; - case 35: context->u.s.Legacy[2] = *(M128A *)val; break; - case 36: context->u.s.Legacy[3] = *(M128A *)val; break; - case 37: context->u.s.Legacy[4] = *(M128A *)val; break; - case 38: context->u.s.Legacy[5] = *(M128A *)val; break; - case 39: context->u.s.Legacy[6] = *(M128A *)val; break; - case 40: context->u.s.Legacy[7] = *(M128A *)val; break; + case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break; + case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break; + case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break; + case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break; + case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break; + case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break; + case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break; + case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break; + case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break; + case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break; + case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break; + case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break; + case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break; + case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break; + case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break; + case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break; + case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break; + case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break; + case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break; + case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break; + case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break; + case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break; + case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break; + case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break; } }

1 0

Piotr Caban : msvcr: Add _get_dstbias implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 0be8e5ca5d3dff1627fbe92c42e68b76f713bc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be8e5ca5d3dff1627fbe92c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 18:23:38 2017 +0100 msvcr: Add _get_dstbias implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17186413fe81ab8cb13692d2b34808d89df48f55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 463ad7f..f5d4275 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -23,7 +23,7 @@ @ cdecl _futime32(long ptr) ucrtbase._futime32 @ cdecl _futime64(long ptr) ucrtbase._futime64 @ cdecl _get_daylight(ptr) ucrtbase._get_daylight -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) ucrtbase._get_dstbias @ cdecl _get_timezone(ptr) ucrtbase._get_timezone @ cdecl _get_tzname(ptr str long long) ucrtbase._get_tzname @ cdecl _getsystime(ptr) ucrtbase._getsystime diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4e0a5e7..7f0ad2d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -874,7 +874,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 25811f3..229bb7a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b6fafbb..30c7479 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1221,7 +1221,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0799aca..91a4785 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1149,7 +1149,7 @@ @ cdecl _get_current_locale() msvcr120._get_current_locale @ cdecl _get_daylight(ptr) msvcr120._get_daylight @ cdecl _get_doserrno(ptr) msvcr120._get_doserrno -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) msvcr120._get_dstbias @ cdecl _get_errno(ptr) msvcr120._get_errno @ cdecl _get_fmode(ptr) msvcr120._get_fmode @ cdecl _get_heap_handle() msvcr120._get_heap_handle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d488651..10d4d5a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -541,7 +541,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0157f42..0957db0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -524,7 +524,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c390df6..480d533 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -891,6 +891,16 @@ int * CDECL MSVCRT___p__dstbias(void) } /********************************************************************* + * _get_dstbias (MSVCR80.@) + */ +int CDECL MSVCRT__get_dstbias(int *seconds) +{ + if (!MSVCRT_CHECK_PMT(seconds != NULL)) return MSVCRT_EINVAL; + *seconds = MSVCRT__dstbias; + return 0; +} + +/********************************************************************* * __p__timezone (MSVCRT.@) */ MSVCRT_long * CDECL MSVCRT___p__timezone(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a3dcf9c..2239f03 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -361,7 +361,7 @@ @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -@ stub _get_dstbias +@ cdecl _get_dstbias(ptr) MSVCRT__get_dstbias @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle()

1 0

Alistair Leslie-Hughes : include: Add mfreadwrite.idl.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: e3f35a674bd38995448a3daf5893ce8b120dc0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f35a674bd38995448a3daf5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:23 2017 -0700 include: Add mfreadwrite.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f45f088d865c6fd341a6648742566098a36fb95d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/mfreadwrite.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f615cd..0b5e6ad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -88,6 +88,7 @@ IDL_SRCS = \ mediaobj.idl \ metahost.idl \ mfobjects.idl \ + mfreadwrite.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl new file mode 100644 index 0000000..3f53ff9 --- /dev/null +++ b/include/mfreadwrite.idl @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * 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 + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; +import "mfobjects.idl"; + +interface IMFMediaSource; + +[ + object, + uuid(70ae66f2-c809-4e4f-8915-bdcb406b7993), + local +] +interface IMFSourceReader : IUnknown +{ + HRESULT GetStreamSelection([in] DWORD index, [out] BOOL *selected); + HRESULT SetStreamSelection([in] DWORD index, [in] BOOL selected); + HRESULT GetNativeMediaType([in] DWORD index, [in] DWORD typeindex, [out] IMFMediaType **type); + HRESULT GetCurrentMediaType([in] DWORD index, [out] IMFMediaType **type); + HRESULT SetCurrentMediaType([in] DWORD index, [in, out] DWORD *reserved, [in] IMFMediaType *type); + HRESULT SetCurrentPosition([in] REFGUID format, [in] REFPROPVARIANT position); + HRESULT ReadSample([in] DWORD index, [in] DWORD flags, [out] DWORD *actualindex, [out] DWORD *sampleflags, + [out] LONGLONG *timestamp, [out] IMFSample **sample); + HRESULT Flush([in] DWORD index); + HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); + HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); +}; + +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) +cpp_quote( " IMFSourceReader **reader);" )

1 0

Alistair Leslie-Hughes : mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: a269f7234a083cbe6b67fa144e62fa00e479e806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a269f7234a083cbe6b67fa144… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:24 2017 -0700 mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0dc677c05fb71ba459ad20711af6637ab92e8847) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfreadwrite/main.c | 14 ++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a72f634..d3feeaf 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -22,6 +22,11 @@ #include "windef.h" #include "winbase.h" +#include "mfreadwrite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +41,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + + +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + FIXME("%p %p %p stub.\n", source, attributes, reader); + + return E_NOTIMPL; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 1f9f30f..70b95a8 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -3,5 +3,5 @@ @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stub MFCreateSourceReaderFromByteStream -@ stub MFCreateSourceReaderFromMediaSource +@ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stub MFCreateSourceReaderFromURL

1 0

Jacek Caban : msvcrt: Added lldiv implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 03c8736d32f6ad2a820c097933f662d7e10b0bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c8736d32f6ad2a820c09793… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 17:43:32 2017 +0100 msvcrt: Added lldiv implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 60c98caa94465799d0868b69149bce29cf767de4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/ucrtbase/tests/misc.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index 12586d8..fe3d04d 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7f0ad2d..a4c944b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 229bb7a..a73f18d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 30c7479..f98c25b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 91a4785..0a7d3e4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 437aa15..323ed2c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1863,6 +1863,19 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +/********************************************************************* + * lldiv (MSVCRT.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + #ifdef __i386__ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 058f999..3caa43c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -448,6 +448,11 @@ typedef struct MSVCRT__ldiv_t { MSVCRT_long rem; /* remainder */ } MSVCRT_ldiv_t; +typedef struct MSVCRT__lldiv_t { + MSVCRT_longlong quot; /* quotient */ + MSVCRT_longlong rem; /* remainder */ +} MSVCRT_lldiv_t; + struct MSVCRT__heapinfo { int* _pentry; MSVCRT_size_t _size; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cc82022..dcc11a4 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -67,6 +67,11 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +typedef struct MSVCRT__lldiv_t { + LONGLONG quot; /* quotient */ + LONGLONG rem; /* remainder */ +} MSVCRT_lldiv_t; + static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); @@ -80,6 +85,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); static void test__initialize_onexit_table(void) { @@ -373,6 +379,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p_lldiv = (void*)GetProcAddress(module, "lldiv"); return TRUE; } @@ -448,6 +455,15 @@ todo_wine { free(tempf); } +static void test_lldiv(void) +{ + MSVCRT_lldiv_t r; + + r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); + ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); +} + START_TEST(misc) { int arg_c; @@ -470,4 +486,5 @@ START_TEST(misc) test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); + test_lldiv(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2239f03..5da253b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl

1 0

Piotr Caban : ucrtbase: Add __initialize_lconv_for_unsigned_char implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: b561a262b26fa53d4db415264e6362ed004603f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b561a262b26fa53d4db415264… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:37:45 2017 +0100 ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b0a58f217db73e3664ca4f7d5adf492ce91d015) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 60c588b..12bbbe6 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl ___lc_locale_name_func() ucrtbase.___lc_locale_name_func @ cdecl ___mb_cur_max_func() ucrtbase.___mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func @ stub __pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5da253b..c75d75e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -91,7 +91,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex

1 0

Piotr Caban : msvcr110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 2ceee36e0185378f336570371773b198ed267942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ceee36e0185378f336570371… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:12 2017 +0100 msvcr110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26d30c63154c5fb3258fd6d24959c12052999c7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcrt/lock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a73f18d..768bf8b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -854,7 +854,7 @@ @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE @ cdecl _IsExceptionObjectToBeDestroyed(ptr) -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 @ stub -arch=i386 _NLG_Return @@ -863,7 +863,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d81967c..308c6fc 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -912,6 +912,27 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock } #endif +#if _MSVCR_VER == 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif + /********************************************************************** * msvcrt_free_locks (internal) *

1 0