September 2018 - Wine-Commits

Nikolay Sivov : opcservices: Implement IOpcRelationshipEnumerator.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: b11b9d5a2540e048ce21e8e533abcb56592a3dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b11b9d5a2540e048ce21e8e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:20 2018 +0300 opcservices: Implement IOpcRelationshipEnumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 187 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 163 ++++++++++++++++++++++++++++++ 2 files changed, 348 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b11b9d5a2540e048ce21…

1 0

Alistair Leslie-Hughes : mfplat: Forward IMFStreamDescriptor to IMFAttributes.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 0deba296ed35999aa8f6f5a5f0bcc468894932f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0deba296ed35999aa8f6f5a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:09 2018 +0000 mfplat: Forward IMFStreamDescriptor to IMFAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 164 ++++++++++++----------------------------------------- 1 file changed, 37 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0deba296ed35999aa8f6…

1 0

Henri Verbeet : wined3d: Use a table for colour fixups in apply_format_fixups().
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 39e19d2d217fe312ba32764c81621919c6d1dd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e19d2d217fe312ba32764c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:46 2018 +0430 wined3d: Use a table for colour fixups in apply_format_fixups(). This ends up being slightly more code, but I think the table is much more readable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 200 ++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 --- 2 files changed, 109 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39e19d2d217fe312ba32…

1 0

Alexandre Julliard : server: Remove unnecessary structure names.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 3a5292eba7c99c0ae75d268d4ec35bf1a8b44f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a5292eba7c99c0ae75d268d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 16:17:06 2018 +0200 server: Remove unnecessary structure names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 52c6d1f..0b61b91 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1776,27 +1776,27 @@ struct console_renderer_event short event; union { - struct update + struct { short top; short bottom; } update; - struct resize + struct { short width; short height; } resize; - struct cursor_pos + struct { short x; short y; } cursor_pos; - struct cursor_geom + struct { short visible; short size; } cursor_geom; - struct display + struct { short left; short top; diff --git a/server/protocol.def b/server/protocol.def index 936eb36..8bff5d8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1413,27 +1413,27 @@ struct console_renderer_event short event; union { - struct update + struct { short top; short bottom; } update; - struct resize + struct { short width; short height; } resize; - struct cursor_pos + struct { short x; short y; } cursor_pos; - struct cursor_geom + struct { short visible; short size; } cursor_geom; - struct display + struct { short left; short top;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: cbbbb70cf2780f8981aff9cccbafcfa3adfb3732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbbbb70cf2780f8981aff9cc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 12 22:42:15 2018 +0300 shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes. 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/shell32/autocomplete.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6f97665..9f35ff7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -134,10 +134,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; - WCHAR hwndText[255]; + WCHAR *hwndText; + UINT len, size, cpt; RECT r; BOOL displayall = FALSE; - int cpt, height, sel; + int height, sel; if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -154,10 +155,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: - { - int len; - - GetWindowTextW(hwnd, hwndText, ARRAY_SIZE(hwndText)); + len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + size = len + 1; + if (!(hwndText = heap_alloc(size * sizeof(WCHAR)))) + return 0; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)hwndText); switch(wParam) { case VK_RETURN: @@ -165,7 +167,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) { WCHAR *buf; - size_t len = strlenW(hwndText); size_t sz = strlenW(This->quickComplete) + 1 + len; if ((buf = heap_alloc(sz * sizeof(WCHAR)))) { @@ -178,9 +179,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->options & ACO_AUTOSUGGEST) ShowWindow(This->hwndListBox, SW_HIDE); + heap_free(hwndText); return 0; case VK_LEFT: case VK_RIGHT: + heap_free(hwndText); return 0; case VK_UP: case VK_DOWN: @@ -196,6 +199,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* We must display all the entries */ displayall = TRUE; } else { + heap_free(hwndText); if (IsWindowVisible(This->hwndListBox)) { int count; @@ -231,21 +235,23 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case VK_BACK: case VK_DELETE: if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) { + heap_free(hwndText); ShowWindow(This->hwndListBox, SW_HIDE); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } break; } + if (len + 1 != size) + hwndText = heap_realloc(hwndText, (len + 1) * sizeof(WCHAR)); + SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); + /* Set txtbackup to point to hwndText itself (which must not be released) */ heap_free(This->txtbackup); - len = strlenW(hwndText); - This->txtbackup = heap_alloc((len + 1)*sizeof(WCHAR)); - lstrcpyW(This->txtbackup, hwndText); + This->txtbackup = hwndText; - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) + if (!displayall && !len) break; IEnumString_Reset(This->enumstr); @@ -297,7 +303,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } break; - } case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc;

1 0

Nikolay Sivov : opcservices: Implement IOpcPartEnumerator.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: bacc74158e9f3f455aefdcc921519c01567ad6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bacc74158e9f3f455aefdcc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:19 2018 +0300 opcservices: Implement IOpcPartEnumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 187 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 163 ++++++++++++++++++++++++++++++ include/opcbase.idl | 2 + 3 files changed, 350 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bacc74158e9f3f455aef…

1 0

Nikolay Sivov : opcservices/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 29f52ac57619cd78f8024b2653490ba94bd02004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f52ac57619cd78f8024b26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:18 2018 +0300 opcservices/tests: Fix some leaks in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a9c25a5..0258bf2 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -75,6 +75,7 @@ static void test_package(void) hr = IOpcPackage_GetPartSet(package, &partset2); ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); ok(partset == partset2, "Expected same part set instance.\n"); + IOpcPartSet_Release(partset2); /* CreatePart */ hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); @@ -161,6 +162,7 @@ todo_wine { IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); + IOpcPartSet_Release(partset); IOpcPackage_Release(package); /* Root uri */ @@ -322,6 +324,8 @@ static void test_relationship(void) hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel); todo_wine ok(hr == OPC_E_INVALID_RELATIONSHIP_TARGET, "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IOpcRelationship_Release(rel); hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr);

1 0

Nikolay Sivov : opcservices: Fix underlying uri object leak (Valgrind).
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 2f2a5a2ea1898780698a8b056c412cd133532b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2a5a2ea1898780698a8b05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:17 2018 +0300 opcservices: Fix underlying uri object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 1a98f3f..45e7ad7 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -331,7 +331,9 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, return hr; } - return opc_part_uri_create(part_uri, NULL, out); + hr = opc_part_uri_create(part_uri, NULL, out); + IUri_Release(part_uri); + return hr; } static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename,

1 0

Nikolay Sivov : opcservices: Fix uri path leak (Valgrind).
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: 397517bee2a9ace0e7216e86b5ef500e520732eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=397517bee2a9ace0e7216e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:16 2018 +0300 opcservices: Fix uri path leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/uri.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index e461eba..ddb2c05 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -476,6 +476,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#x.\n", hr); heap_free(ret); + SysFreeString(path); return rels_uri; }

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateSample.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: master Commit: b0826c016142ba669f5836bb34685147fdd4a697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0826c016142ba669f5836bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:11 2018 +0000 mfplat: Implement MFCreateSample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0826c016142ba669f58…

1 0