February 2019 - Wine-devel - list.winehq.org

[PATCH v2] mfplat: Implement MFGetSystemTime
by Alistair Leslie-Hughes 12 Feb '19

12 Feb '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46300 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 11 +++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c3465..1625c58 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -248,6 +248,17 @@ HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) return S_OK; } +MFTIME WINAPI MFGetSystemTime() +{ + MFTIME mf; + + TRACE("()\n"); + + GetSystemTimeAsFileTime( (FILETIME*)&mf); + + return mf; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c828aea..349b926 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -98,7 +98,7 @@ @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader -@ stub MFGetSystemTime +@ stdcall MFGetSystemTime() @ stub MFGetTimerPeriodicity @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass diff --git a/include/mfidl.idl b/include/mfidl.idl index 124ae3c..6c81694 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -313,6 +313,7 @@ cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") +cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") [ object, -- 1.9.1

1 0

[PATCH] mfplat: Implement MFGetSystemTime
by Alistair Leslie-Hughes 12 Feb '19

12 Feb '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46300 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 17 +++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c3465..1e8e2ea 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -248,6 +248,23 @@ HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) return S_OK; } +MFTIME WINAPI MFGetSystemTime() +{ + SYSTEMTIME st; + FILETIME ft; + MFTIME mf; + + TRACE("()\n"); + + GetSystemTime(&st); + + SystemTimeToFileTime(&st, &ft); + + memcpy(&mf, &ft, sizeof(FILETIME)); + + return mf; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c828aea..349b926 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -98,7 +98,7 @@ @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader -@ stub MFGetSystemTime +@ stdcall MFGetSystemTime() @ stub MFGetTimerPeriodicity @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass diff --git a/include/mfidl.idl b/include/mfidl.idl index 124ae3c..6c81694 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -313,6 +313,7 @@ cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") +cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") [ object, -- 1.9.1

2 1

[PATCH] d3dxof: Remove useless casts to self
by Michael Stefaniuc 11 Feb '19

11 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dxof/parsing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f7724ec191..a152763a00 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1213,7 +1213,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value); + *((DWORD*)(buf->pdata + buf->cur_pos_data)) = *(DWORD*)buf->value; buf->cur_pos_data += 4; } else @@ -1230,7 +1230,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value); + *((float*)(buf->pdata + buf->cur_pos_data)) = *(float*)buf->value; buf->cur_pos_data += 4; } else -- 2.20.1

1 0

[PATCH] crypt32: Remove useless cast to self
by Michael Stefaniuc 11 Feb '19

11 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d886abb503..9c4719690e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2585,7 +2585,7 @@ static BOOL CRYPT_AsnDecodeUnicodeString(const BYTE *pbEncoded, if (dataLen) { DWORD i; - LPWSTR str = *(LPWSTR *)pStr; + LPWSTR str = *pStr; assert(str); switch (pbEncoded[0]) -- 2.20.1

1 0

[PATCH] amstream: Remove useless cast to self
by Michael Stefaniuc 11 Feb '19

11 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/mediastream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index bc61597502..4463eaafe7 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1543,7 +1543,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object->parent = (IMediaStream*)parent; object->audio_data = audio_data; - *audio_stream_sample = (IAudioStreamSample*)&object->IAudioStreamSample_iface; + *audio_stream_sample = &object->IAudioStreamSample_iface; return S_OK; } -- 2.20.1

1 0

[PATCH 1/5] comctl32/listbox: Resize the entire item array at once in SetCount
by Gabriel Ivăncescu 11 Feb '19

11 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This has been carefully done so that it matches the previous behavior when LBS_NODATA was used, since SetCount only works with it (so that means it also implies LBS_OWNERDRAWFIXED and so on). count was changed to unsigned so that it passes the last test in the patch series, apparently Windows treats it as unsigned. dlls/comctl32/listbox.c | 45 +++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index c92c2a2..787fc88 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1742,24 +1742,47 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_SetCount */ -static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) +static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) { - LRESULT ret; + UINT orig_num = descr->nb_items; if (!(descr->style & LBS_NODATA)) return LB_ERR; - /* FIXME: this is far from optimal... */ - if (count > descr->nb_items) + if (count > orig_num) { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; + if (!resize_storage(descr, count)) + return LB_ERRSPACE; + memset(&descr->items[orig_num], 0, (count - orig_num) * sizeof(LB_ITEMDATA)); + descr->nb_items = count; + + LISTBOX_UpdateScroll(descr); + LISTBOX_InvalidateItems(descr, orig_num); + + /* If listbox was empty, set focus to the first item */ + if (orig_num == 0) LISTBOX_SetCaretIndex(descr, 0, FALSE); } - else if (count < descr->nb_items) + else if (count < orig_num) { - while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + LISTBOX_InvalidateItems(descr, count); + descr->nb_items = count; + + if (count == 0) SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); + else + { + descr->anchor_item = min(descr->anchor_item, count - 1); + + resize_storage(descr, count); + if (descr->selected_item >= count) + descr->selected_item = -1; + + LISTBOX_UpdateScroll(descr); + + /* If we removed the scrollbar, reset the top of the list */ + if (count <= descr->page_size && orig_num > descr->page_size) + LISTBOX_SetTopItem(descr, 0, TRUE); + + descr->focus_item = min(descr->focus_item, count - 1); + } } InvalidateRect( descr->self, NULL, TRUE ); -- 2.19.1

2 13

[PATCH] msi: Remove duplicate condition in msi_dialog_destroy().
by Andrey Gusev 11 Feb '19

11 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b6de1f5a9e..a3e54815c0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4129,10 +4129,10 @@ void msi_dialog_destroy( msi_dialog *dialog ) } if( dialog->hwnd ) + { ShowWindow( dialog->hwnd, SW_HIDE ); - - if( dialog->hwnd ) DestroyWindow( dialog->hwnd ); + } /* unsubscribe events */ event_cleanup_subscriptions( dialog->package, dialog->name ); -- 2.20.1

2 1

[PATCH] uiautomationcore: Return success from UiaRaiseAutomationEvent().
by Nikolay Sivov 11 Feb '19

11 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- OneNote 2016 depends on this. dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 31b7d3e7aa..07308461e3 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -91,5 +91,5 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id) { FIXME("(%p, %d): stub\n", provider, id); - return E_NOTIMPL; + return S_OK; } -- 2.20.1

1 0

[PATCH] crypt32: Remove duplicate condition in CRYPT_AsnDecodeNameValueInternal().
by Andrey Gusev 11 Feb '19

11 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/crypt32/decode.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d886abb503..27f48707b2 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1588,15 +1588,12 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_VISIBLESTRING: case ASN_GENERALSTRING: value->Value.cbData = dataLen; - if (dataLen) - { - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - else - value->Value.pbData = (LPBYTE)pbEncoded + 1 + - lenBytes; - } + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; break; case ASN_BMPSTRING: { -- 2.20.1

1 0

[PATCH vkd3d 6/7] vkd3d: Do not enable depth bias unconditionally.
by Józef Kucia 11 Feb '19

11 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5c7d30393211..065d93c1250c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1538,7 +1538,7 @@ static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk vk_desc->polygonMode = vk_polygon_mode_from_d3d12(d3d12_desc->FillMode); vk_desc->cullMode = vk_cull_mode_from_d3d12(d3d12_desc->CullMode); vk_desc->frontFace = d3d12_desc->FrontCounterClockwise ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; - vk_desc->depthBiasEnable = VK_TRUE; + vk_desc->depthBiasEnable = d3d12_desc->DepthBias || d3d12_desc->SlopeScaledDepthBias; vk_desc->depthBiasConstantFactor = d3d12_desc->DepthBias; vk_desc->depthBiasClamp = d3d12_desc->DepthBiasClamp; vk_desc->depthBiasSlopeFactor = d3d12_desc->SlopeScaledDepthBias; -- 2.19.2

2 1