February 2019 - Wine-Commits

Andrey Gusev : ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 0b4ecdebe5d60fb927d790e3735df1c3243bc1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4ecdebe5d60fb927d790e3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:37 2019 +0200 ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-dialogbox-l1-1-0.spec | 21 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 26 insertions(+) diff --git a/configure b/configure index 2dded71..c5c8ab8 100755 --- a/configure +++ b/configure @@ -1273,6 +1273,7 @@ enable_ext_ms_win_gdi_font_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 +enable_ext_ms_win_ntuser_dialogbox_l1_1_0 enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 @@ -19580,6 +19581,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-1 enable_ext_ms_win_gdi_fo wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-dialogbox-l1-1-0 enable_ext_ms_win_ntuser_dialogbox_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 diff --git a/configure.ac b/configure.ac index 29be1d0..d77fa7b 100644 --- a/configure.ac +++ b/configure.ac @@ -3311,6 +3311,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-dialogbox-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in new file mode 100644 index 0000000..e19c95d --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-dialogbox-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec new file mode 100644 index 0000000..6816e5f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec @@ -0,0 +1,21 @@ +@ stdcall CheckDlgButton(long long long) user32.CheckDlgButton +@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) user32.CreateDialogIndirectParamA +@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) user32.CreateDialogIndirectParamW +@ stdcall CreateDialogParamA(long str long ptr long) user32.CreateDialogParamA +@ stdcall CreateDialogParamW(long wstr long ptr long) user32.CreateDialogParamW +@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) user32.DialogBoxIndirectParamA +@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) user32.DialogBoxIndirectParamW +@ stdcall DialogBoxParamW(long wstr long ptr long) user32.DialogBoxParamW +@ stdcall EndDialog(long long) user32.EndDialog +@ stdcall GetDlgCtrlID(long) user32.GetDlgCtrlID +@ stdcall GetDlgItem(long long) user32.GetDlgItem +@ stdcall GetDlgItemTextW(long long ptr long) user32.GetDlgItemTextW +@ stdcall IsDlgButtonChecked(long long) user32.IsDlgButtonChecked +@ stdcall MessageBoxA(long str str long) user32.MessageBoxA +@ stdcall MessageBoxIndirectA(ptr) user32.MessageBoxIndirectA +@ stdcall MessageBoxIndirectW(ptr) user32.MessageBoxIndirectW +@ stdcall MessageBoxW(long wstr wstr long) user32.MessageBoxW +@ stdcall SendDlgItemMessageA(long long long long long) user32.SendDlgItemMessageA +@ stdcall SendDlgItemMessageW(long long long long long) user32.SendDlgItemMessageW +@ stdcall SetDlgItemTextA(long long str) user32.SetDlgItemTextA +@ stdcall SetDlgItemTextW(long long wstr) user32.SetDlgItemTextW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8933ae4..f6cfea1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -376,6 +376,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-dialogbox-l1-1-0", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0",

1 0

Gabriel Ivăncescu : comctl32/listbox: Move the item data insertion into a separate function.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: bd2cc1342b50adb826e254223bf11c9316d0fb32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2cc1342b50adb826e25422… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:58 2019 +0000 comctl32/listbox: Move the item data insertion into a separate function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ba8b7ee..44e3b1c 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -186,6 +186,20 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1563,23 +1577,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; + insert_item_data(descr, index, str, data); descr->nb_items++; /* Get item height */

1 0

Gabriel Ivăncescu : comctl32/tests: Test negative counts in LB_SETCOUNT.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 7ec954988cc37a508049435259baa5a0ad826b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec954988cc37a5080494352… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:05:01 2019 +0000 comctl32/tests: Test negative counts in LB_SETCOUNT. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 0cdcdea..de73ad2 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1996,6 +1996,11 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, -5, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == -5, "got %d\n", ret ); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i)

1 0

Michael Stefaniuc : d3d8/tests: Remove useless casts to self.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 40c994d9065a23cc83b8a95d4301d6a72383b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c994d9065a23cc83b8a95d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:13:59 2019 +0100 d3d8/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7490622..c405f82 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10564,7 +10564,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_SYSTEMMEM, &vb); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer8_Unlock(vb); @@ -10622,7 +10622,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), (BYTE **)&data, 0); + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer8_Unlock(ib); @@ -10651,14 +10651,14 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s0), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s0, sizeof(quad_s0)); hr = IDirect3DVertexBuffer8_Unlock(vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s1), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s1, sizeof(quad_s1)); hr = IDirect3DVertexBuffer8_Unlock(vb_s1);

1 0

Zebediah Figura : user32: Replace the minimize box with a restore box when the window is minimized.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 73b50a24e79b43536364a81d7de263151068cfc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b50a24e79b43536364a81d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 19:10:35 2019 -0600 user32: Replace the minimize box with a restore box when the window is minimized. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 372b1be..0aee137 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -749,13 +749,15 @@ static void NC_DrawMaxButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) static void NC_DrawMinButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) { RECT rect; - UINT flags = DFCS_CAPTIONMIN; + UINT flags; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); /* never draw minimize box when window has WS_EX_TOOLWINDOW style */ if (ex_style & WS_EX_TOOLWINDOW) return; + flags = (style & WS_MINIMIZE) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMIN; + NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); if (style & WS_SYSMENU) rect.right -= GetSystemMetrics(SM_CXSIZE); @@ -1245,7 +1247,8 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam ) return; if (wParam == HTMINBUTTON) - SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, + IsIconic(hwnd) ? SC_RESTORE : SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); else SendMessageW( hwnd, WM_SYSCOMMAND, IsZoomed(hwnd) ? SC_RESTORE:SC_MAXIMIZE, MAKELONG(msg.pt.x,msg.pt.y) );

1 0

Alistair Leslie-Hughes : mf: Add IMFSequencerSource stub.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 19ede86938fd48a9a9ddb08cb102902ffa79d7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ede86938fd48a9a9ddb08c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 08:28:03 2019 +0300 mf: Add IMFSequencerSource stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 19 +++++++ dlls/mf/topology.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 5 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index e356310..b2e0b9b 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -54,7 +54,7 @@ @ stub MFCreateSampleGrabberSinkActivate @ stub MFCreateSecureHttpSchemePlugin @ stub MFCreateSequencerSegmentOffset -@ stub MFCreateSequencerSource +@ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream @ stub MFCreateSimpleTypeHandler @ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index f989baa..f233cff 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf +IMPORTS = mf mfplat C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index acbba2c..6e77f6b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "initguid.h" +#include "mfapi.h" #include "mfidl.h" #include "wine/test.h" @@ -178,8 +179,26 @@ static void test_MFGetService(void) ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); } +static void test_MFCreateSequencerSource(void) +{ + IMFSequencerSource *seq_source; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreateSequencerSource(NULL, &seq_source); + ok(hr == S_OK, "Failed to create sequencer source, hr %#x.\n", hr); + + IMFSequencerSource_Release(seq_source); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); test_MFGetService(); + test_MFCreateSequencerSource(); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 6d7c9f3..308a1e3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -47,6 +47,12 @@ struct topology_node MF_TOPOLOGY_TYPE node_type; }; +struct seq_source +{ + IMFSequencerSource IMFSequencerSource_iface; + LONG refcount; +}; + static inline struct topology *impl_from_IMFTopology(IMFTopology *iface) { return CONTAINING_RECORD(iface, struct topology, IMFTopology_iface); @@ -57,6 +63,11 @@ static struct topology_node *impl_from_IMFTopologyNode(IMFTopologyNode *iface) return CONTAINING_RECORD(iface, struct topology_node, IMFTopologyNode_iface); } +static struct seq_source *impl_from_IMFSequencerSource(IMFSequencerSource *iface) +{ + return CONTAINING_RECORD(iface, struct seq_source, IMFSequencerSource_iface); +} + static HRESULT WINAPI topology_QueryInterface(IMFTopology *iface, REFIID riid, void **out) { struct topology *topology = impl_from_IMFTopology(iface); @@ -1052,3 +1063,122 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return S_OK; } + +static HRESULT WINAPI seq_source_QueryInterface(IMFSequencerSource *iface, REFIID riid, void **out) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFSequencerSource) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &seq_source->IMFSequencerSource_iface; + IMFSequencerSource_AddRef(iface); + return S_OK; + } + + WARN("Unimplemented %s.\n", debugstr_guid(riid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + ULONG refcount = InterlockedIncrement(&seq_source->refcount); + + TRACE("(%p) refcount=%u\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) +{ + struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); + ULONG refcount = InterlockedDecrement(&seq_source->refcount); + + TRACE("(%p) refcount=%u\n", iface, refcount); + + if (!refcount) + { + heap_free(seq_source); + } + + return refcount; +} + +static HRESULT WINAPI seq_source_AppendTopology(IMFSequencerSource *iface, IMFTopology *topology, + DWORD flags, MFSequencerElementId *id) +{ + FIXME("%p, %p, %x, %p\n", iface, topology, flags, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSequencerElementId id) +{ + FIXME("%p, %#x\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *iface, + IMFPresentationDescriptor *descriptor, MFSequencerElementId *id, IMFTopology **topology) +{ + FIXME("%p, %p, %p, %p\n", iface, descriptor, id, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_UpdateTopology(IMFSequencerSource *iface, MFSequencerElementId id, + IMFTopology *topology) +{ + FIXME("%p, %#x, %p\n", iface, id, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, MFSequencerElementId id, DWORD flags) +{ + FIXME("%p, %#x, %#x\n", iface, id, flags); + + return E_NOTIMPL; +} + +static const IMFSequencerSourceVtbl seqsourcevtbl = +{ + seq_source_QueryInterface, + seq_source_AddRef, + seq_source_Release, + seq_source_AppendTopology, + seq_source_DeleteTopology, + seq_source_GetPresentationContext, + seq_source_UpdateTopology, + seq_source_UpdateTopologyFlags, +}; + +/*********************************************************************** + * MFCreateSequencerSource (mf.@) + */ +HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source) +{ + struct seq_source *object; + + TRACE("(%p, %p)\n", reserved, seq_source); + + if (!seq_source) + return E_POINTER; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFSequencerSource_iface.lpVtbl = &seqsourcevtbl; + object->refcount = 1; + + *seq_source = &object->IMFSequencerSource_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 2670c36..82a87ba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -307,6 +307,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);")

1 0

Zebediah Figura : user32: Move iconic windows as their border instead of their icon.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 50bc18201d4ae0c530096950325f754e14e52fb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50bc18201d4ae0c530096950… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 19:10:34 2019 -0600 user32: Move iconic windows as their border instead of their icon. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a938fa9..5837c17 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2709,12 +2709,10 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) HWND parent; LONG hittest = (LONG)(wParam & 0x0f); WPARAM syscommand = wParam & 0xfff0; - HCURSOR hDragCursor = 0, hOldCursor = 0; MINMAXINFO minmax; POINT capturePoint, pt; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL thickframe = HAS_THICKFRAME( style ); - BOOL iconic = style & WS_MINIMIZE; BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); BOOL DragFullWindows = TRUE; @@ -2794,13 +2792,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Retrieve a default cache DC (without using the window style) */ hdc = GetDCEx( parent, 0, DCX_CACHE ); - if( iconic ) /* create a cursor for dragging */ - { - hDragCursor = (HCURSOR)GetClassLongPtrW( hwnd, GCLP_HICON); - if( !hDragCursor ) hDragCursor = (HCURSOR)SendMessageW( hwnd, WM_QUERYDRAGICON, 0, 0L); - if( !hDragCursor ) iconic = FALSE; - } - /* we only allow disabling the full window drag for child windows */ if (parent) SystemParametersInfoW( SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0 ); @@ -2870,20 +2861,14 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if( !moved ) { moved = TRUE; - - if( iconic ) /* ok, no system popup tracking */ - { - hOldCursor = SetCursor(hDragCursor); - ShowCursor( TRUE ); - } - else if(!DragFullWindows) + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; else if (ON_RIGHT_BORDER(hittest)) sizingRect.right += dx; @@ -2903,32 +2888,21 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); - if (!iconic) + if (!DragFullWindows) + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + else { - if(!DragFullWindows) - draw_moving_frame( parent, hdc, &sizingRect, thickframe ); - else - { - RECT rect = sizingRect; - MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); - SetWindowPos( hwnd, 0, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - } + RECT rect = sizingRect; + MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + SetWindowPos( hwnd, 0, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + (hittest == HTCAPTION) ? SWP_NOSIZE : 0 ); } } } } - if( iconic ) - { - if( moved ) /* restore cursors, show icon title later on */ - { - ShowCursor( FALSE ); - SetCursor( hOldCursor ); - } - } - else if (moved && !DragFullWindows) + if (moved && !DragFullWindows) { draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } @@ -2952,7 +2926,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ - if(!DragFullWindows || iconic) + if (!DragFullWindows) SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top,

1 0

Michael Stefaniuc : msxml3/tests: Floating point numeric constants are by default doubles.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 94e76b1b3c49460198c85297d6a07b05da804b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e76b1b3c49460198c85297… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:01 2019 +0100 msxml3/tests: Floating point numeric constants are by default doubles. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9e5116f..f1f3e42 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1371,10 +1371,10 @@ static void test_XDR_datatypes(void) break; case VT_R8: if (!strcmp(ptr->typename, "float")) - ok(V_R8(&v) == (double)3.14159, "got %f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159, "got %f\n", V_R8(&v)); else todo_wine - ok(V_R8(&v) == (double)3.14159265358979323846, "got %.20f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159265358979323846, "got %.20f\n", V_R8(&v)); break; case VT_UI1: ok(V_UI1(&v) == 0xFF, "got %02x\n", V_UI1(&v));

1 0

Nikolay Sivov : mf: Add IMFTopologyNode stub.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 2de2bf6ddfe5cf2bc4575e58694e6ae9ebe64f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de2bf6ddfe5cf2bc4575e58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 20 08:28:02 2019 +0300 mf: Add IMFTopologyNode stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 8 + dlls/mf/topology.c | 538 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 548 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2de2bf6ddfe5cf2bc457…

1 0

Nikolay Sivov : mf: Add attributes store to topology object.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 8d996644de426114898b0490a8fa009a82f77c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d996644de426114898b0490… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 20 08:28:01 2019 +0300 mf: Add attributes store to topology object. 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/topology.c | 459 ++++++++++++++++++++++++++-------------------------- 2 files changed, 226 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d996644de426114898b…

1 0