September 2017 - Wine-Commits

Fabian Maurer : api-ms-win-ntuser-rectangle-l1-1-0: Add dll.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 3589b234f5f16e4d2677bc86abfd971bf11a8c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3589b234f5f16e4d2677bc86a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 15:32:32 2017 +0200 api-ms-win-ntuser-rectangle-l1-1-0: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-ntuser-rectangle-l1-1-0/Makefile.in | 1 + .../api-ms-win-ntuser-rectangle-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index fdc78ec..8f20593 100755 --- a/configure +++ b/configure @@ -1041,6 +1041,7 @@ enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +enable_api_ms_win_ntuser_rectangle_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 @@ -18110,6 +18111,7 @@ wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +wine_fn_config_dll api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 diff --git a/configure.ac b/configure.ac index e6d45e3..54c1024 100644 --- a/configure.ac +++ b/configure.ac @@ -2894,6 +2894,7 @@ WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-ntuser-rectangle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) diff --git a/dlls/api-ms-win-ntuser-rectangle-l1-1-0/Makefile.in b/dlls/api-ms-win-ntuser-rectangle-l1-1-0/Makefile.in new file mode 100644 index 0000000..15e7b509 --- /dev/null +++ b/dlls/api-ms-win-ntuser-rectangle-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-ntuser-rectangle-l1-1-0.dll diff --git a/dlls/api-ms-win-ntuser-rectangle-l1-1-0/api-ms-win-ntuser-rectangle-l1-1-0.spec b/dlls/api-ms-win-ntuser-rectangle-l1-1-0/api-ms-win-ntuser-rectangle-l1-1-0.spec new file mode 100644 index 0000000..35b318a --- /dev/null +++ b/dlls/api-ms-win-ntuser-rectangle-l1-1-0/api-ms-win-ntuser-rectangle-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stdcall CopyRect(ptr ptr) user32.CopyRect +@ stdcall EqualRect(ptr ptr) user32.EqualRect +@ stdcall InflateRect(ptr long long) user32.InflateRect +@ stdcall IntersectRect(ptr ptr ptr) user32.IntersectRect +@ stdcall IsRectEmpty(ptr) user32.IsRectEmpty +@ stdcall OffsetRect(ptr long long) user32.OffsetRect +@ stdcall PtInRect(ptr int64) user32.PtInRect +@ stdcall SetRect(ptr long long long long) user32.SetRect +@ stdcall SetRectEmpty(ptr) user32.SetRectEmpty +@ stdcall SubtractRect(ptr ptr ptr) user32.SubtractRect +@ stdcall UnionRect(ptr ptr ptr) user32.UnionRect diff --git a/tools/make_specfiles b/tools/make_specfiles index 2dce619..3d29af8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -330,6 +330,7 @@ my @dll_groups = "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", + "api-ms-win-ntuser-rectangle-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1",

1 0

Fabian Maurer : api-ms-win-core-wow64-l1-1-1: Add dll.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: d8f2e3c0abf7e789e15b3b41da1b72d853f764d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f2e3c0abf7e789e15b3b41d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 15:32:28 2017 +0200 api-ms-win-core-wow64-l1-1-1: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-wow64-l1-1-1/Makefile.in | 1 + dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 246cece..c5def64 100755 --- a/configure +++ b/configure @@ -997,6 +997,7 @@ enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_wow64_l1_1_0 +enable_api_ms_win_core_wow64_l1_1_1 enable_api_ms_win_core_xstate_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_crt_conio_l1_1_0 @@ -18062,6 +18063,7 @@ wine_fn_config_dll api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_c wine_fn_config_dll api-ms-win-core-winrt-roparameterizediid-l1-1-0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-core-wow64-l1-1-0 enable_api_ms_win_core_wow64_l1_1_0 +wine_fn_config_dll api-ms-win-core-wow64-l1-1-1 enable_api_ms_win_core_wow64_l1_1_1 wine_fn_config_dll api-ms-win-core-xstate-l1-1-0 enable_api_ms_win_core_xstate_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_l1_1_0 diff --git a/configure.ac b/configure.ac index 0a9167a..d0406a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2850,6 +2850,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-roparameterizediid-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-wow64-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-wow64-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-xstate-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) diff --git a/dlls/api-ms-win-core-wow64-l1-1-1/Makefile.in b/dlls/api-ms-win-core-wow64-l1-1-1/Makefile.in new file mode 100644 index 0000000..5e2d39f --- /dev/null +++ b/dlls/api-ms-win-core-wow64-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-wow64-l1-1-1.dll diff --git a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec new file mode 100644 index 0000000..08fa02c --- /dev/null +++ b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec @@ -0,0 +1,5 @@ +@ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA +@ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW +@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection +@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/tools/make_specfiles b/tools/make_specfiles index 642a9d8..1f04dbf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -254,6 +254,7 @@ my @dll_groups = "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", "api-ms-win-core-wow64-l1-1-0", + "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2", "api-ms-win-core-processtopology-obsolete-l1-1-0",

1 0

Dmitry Timoshkov : ole32: Add a trace to IDataObject::GetData.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 7ce77b464c6620f60bda6332cbb87be608d04264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce77b464c6620f60bda6332c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 20 13:45:37 2017 +0100 ole32: Add a trace to IDataObject::GetData. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ecae89d..a95d0fb 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1245,6 +1245,8 @@ static HRESULT WINAPI DataCache_GetData( DataCache *This = impl_from_IDataObject(iface); DataCacheEntry *cache_entry; + TRACE("(%p, %s, %p)\n", iface, debugstr_formatetc(pformatetcIn), pmedium); + memset(pmedium, 0, sizeof(*pmedium)); cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetcIn);

1 0

Nikolay Sivov : dwrite: Added IDWriteFontFallbackBuilder stub.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 3acbf5006898f9249e74ecbec87a7772211f94d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acbf5006898f9249e74ecbec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 20 20:24:46 2017 +0300 dwrite: Added IDWriteFontFallbackBuilder stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 110 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 6 ++- dlls/dwrite/tests/layout.c | 34 +++++++++++-- 4 files changed, 144 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3acbf5006898f9249e74e…

1 0

Nikolay Sivov : shell32: Implement Title property using shellfolder API.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: ec42839cd6b3befc142f77eed2b9baf4d2573013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec42839cd6b3befc142f77eed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 19 22:24:23 2017 +0300 shell32: Implement Title property using shellfolder API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 121 +++++++++++++++++++++++++------------ dlls/shell32/tests/shelldispatch.c | 17 ++---- 2 files changed, 88 insertions(+), 50 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 24843f0..da3031b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -35,6 +35,7 @@ #include "debughlp.h" #include "shell32_main.h" +#include "pidl.h" #include "wine/debug.h" @@ -64,6 +65,8 @@ typedef struct { LONG ref; VARIANT dir; IDispatch *application; + IShellFolder2 *folder; + PIDLIST_ABSOLUTE pidl; } FolderImpl; typedef struct { @@ -1350,6 +1353,8 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) if (!ref) { + ILFree(This->pidl); + IShellFolder2_Release(This->folder); IDispatch_Release(This->application); VariantClear(&This->dir); HeapFree(GetProcessHeap(), 0, This); @@ -1411,25 +1416,31 @@ static HRESULT WINAPI FolderImpl_Invoke(Folder3 *iface, DISPID dispIdMember, return hr; } -static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *pbs) +static HRESULT WINAPI FolderImpl_get_Title(Folder3 *iface, BSTR *title) { FolderImpl *This = impl_from_Folder(iface); - WCHAR *p; - int len; + PCUITEMID_CHILD last_part; + IShellFolder2 *parent; + WCHAR buffW[MAX_PATH]; + SHELLDETAILS sd; + HRESULT hr; - TRACE("(%p,%p)\n", iface, pbs); + TRACE("(%p,%p)\n", iface, title); - *pbs = NULL; + *title = NULL; - if (V_VT(&This->dir) == VT_I4) - { - FIXME("special folder constants are not supported\n"); - return E_NOTIMPL; - } - p = PathFindFileNameW(V_BSTR(&This->dir)); - len = lstrlenW(p); - *pbs = SysAllocStringLen(p, p[len - 1] == '\\' ? len - 1 : len); - return *pbs ? S_OK : E_OUTOFMEMORY; + if (FAILED(hr = SHBindToParent(This->pidl, &IID_IShellFolder2, (void **)&parent, &last_part))) + return hr; + + hr = IShellFolder2_GetDetailsOf(parent, last_part, 0, &sd); + IShellFolder2_Release(parent); + if (FAILED(hr)) + return hr; + + StrRetToBufW(&sd.str, NULL, buffW, sizeof(buffW)/sizeof(buffW[0])); + *title = SysAllocString(buffW); + + return *title ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, IDispatch **disp) @@ -1623,43 +1634,33 @@ static const Folder3Vtbl FolderImpl_Vtbl = { FolderImpl_put_ShowWebViewBarricade }; -static HRESULT Folder_Constructor(VARIANT *dir, Folder **ppsdf) +static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDLIST pidl, Folder **ret) { FolderImpl *This; - HRESULT ret; + HRESULT hr; - *ppsdf = NULL; + *ret = NULL; - switch (V_VT(dir)) - { - case VT_I4: - /* FIXME: add some checks */ - break; - case VT_BSTR: - if (PathIsDirectoryW(V_BSTR(dir)) && - !PathIsRelativeW(V_BSTR(dir)) && - PathFileExistsW(V_BSTR(dir))) - break; - default: - return S_FALSE; - } + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderImpl)); - if (!This) return E_OUTOFMEMORY; This->Folder3_iface.lpVtbl = &FolderImpl_Vtbl; This->ref = 1; + This->folder = folder; + This->pidl = pidl; IShellDispatch_Constructor(NULL, &IID_IDispatch, (void **)&This->application); VariantInit(&This->dir); - ret = VariantCopy(&This->dir, dir); - if (FAILED(ret)) + hr = VariantCopy(&This->dir, dir); + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - *ppsdf = (Folder*)&This->Folder3_iface; - return ret; + *ret = (Folder *)&This->Folder3_iface; + return hr; } static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, @@ -1796,11 +1797,53 @@ static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch } static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, - VARIANT vDir, Folder **ppsdf) + VARIANT dir, Folder **ret) { - TRACE("(%p,%p)\n", iface, ppsdf); + IShellFolder2 *folder; + IShellFolder *desktop; + LPITEMIDLIST pidl; + HRESULT hr; + + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&dir), ret); + + *ret = NULL; + + switch (V_VT(&dir)) + { + case VT_I2: + if (FAILED(hr = VariantChangeType(&dir, &dir, 0, VT_I4))) + return hr; + + /* fallthrough */ + case VT_I4: + if (FAILED(hr = SHGetFolderLocation(NULL, V_I4(&dir), NULL, 0, &pidl))) + return S_FALSE; + + break; + case VT_BSTR: + if (FAILED(hr = SHParseDisplayName(V_BSTR(&dir), NULL, &pidl, 0, NULL))) + return S_FALSE; + + break; + default: + WARN("Ignoring directory value %s\n", debugstr_variant(&dir)); + return S_FALSE; + } + + if (FAILED(hr = SHGetDesktopFolder(&desktop))) + return hr; + + if (_ILIsDesktop(pidl)) + hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); + else + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); + + IShellFolder_Release(desktop); + + if (FAILED(hr)) + return S_FALSE; - return Folder_Constructor(&vDir, ppsdf); + return Folder_Constructor(&dir, folder, pidl, ret); } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index a9c5549..21cb6bb 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -156,6 +156,7 @@ static void test_namespace(void) folder = (void*)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); if (special_folders[i] == ssfALTSTARTUP || special_folders[i] == ssfCOMMONALTSTARTUP) + todo_wine ok(r == S_OK || broken(r == S_FALSE) /* winxp */, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); else ok(r == S_OK, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); @@ -165,14 +166,11 @@ static void test_namespace(void) V_VT(&var) = VT_I4; V_I4(&var) = -1; - folder = (void*)0xdeadbeef; + folder = (void *)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); - todo_wine { - ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); - ok(folder == NULL, "got %p\n", folder); - if (r == S_OK) - Folder_Release(folder); -} + ok(r == S_FALSE, "Unexpected hr %#x.\n", r); + ok(folder == NULL, "Unexpected folder instance %p\n", folder); + V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES; r = IShellDispatch_NameSpace(sd, var, &folder); @@ -185,7 +183,6 @@ static void test_namespace(void) ok(r == S_OK, "Failed to get folder path: %#x.\n", r); r = Folder_get_Title(folder, &title); - todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); if (r == S_OK) { @@ -202,9 +199,7 @@ static void test_namespace(void) ok(r == S_OK, "SHGetSpecialFolderLocation failed: %08x\n", r); r = pSHGetNameFromIDList(pidl, SIGDN_NORMALDISPLAY, &name); ok(r == S_OK, "SHGetNameFromIDList failed: %08x\n", r); - todo_wine - ok(!lstrcmpW(title, name), "expected %s, got %s\n", - wine_dbgstr_w(name), wine_dbgstr_w(title)); + ok(!lstrcmpW(title, name), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(title)); CoTaskMemFree(name); CoTaskMemFree(pidl); }

1 0

Michael Stefaniuc : gdiplus: Remove a wrapper around GdipFree().
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 3a42c84e0fc0e975801ed7d1dfc3405840b91c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a42c84e0fc0e975801ed7d1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 20 12:28:01 2017 +0200 gdiplus: Remove a wrapper around GdipFree(). GdipFree() already deals with NULL input. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 651ba53..956ddb0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6225,11 +6225,6 @@ static DWORD* GetBitmapPixelBuffer(HDC hdc, HBITMAP hbmp, int width, int height) return buffer; } -static void ReleaseBitmapPixelBuffer(DWORD* buffer) -{ - if (buffer) GdipFree(buffer); -} - static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) { ARGB color[6] = {0,0,0,0,0,0}; @@ -6279,7 +6274,7 @@ static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, "Expected GdipFillRectangleI take effect!\n" ); - ReleaseBitmapPixelBuffer(pixel); + GdipFree(pixel); SelectObject(hdc, old); DeleteObject(bmp); @@ -6364,7 +6359,7 @@ static void test_GdipFillRectanglesOnMemoryDCTextureBrush(void) ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, "Expected GdipFillRectangleI take effect!\n" ); - ReleaseBitmapPixelBuffer(pixel); + GdipFree(pixel); SelectObject(hdc, old); DeleteObject(bmp); @@ -6521,7 +6516,7 @@ static void test_GdipDrawImagePointsRectOnMemoryDC(void) ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, "Expected GdipDrawImageRectRectI take effect!\n" ); - ReleaseBitmapPixelBuffer(pixel); + GdipFree(pixel); SelectObject(hdc, old); DeleteObject(bmp);

1 0

Fabian Maurer : api-ms-win-core-file-l2-1-2: Add dll.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: a0f09d44c713601f9298d4769205b8edcdcd381b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f09d44c713601f9298d4769… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 15:32:30 2017 +0200 api-ms-win-core-file-l2-1-2: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l2-1-2/Makefile.in | 1 + .../api-ms-win-core-file-l2-1-2.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 19 insertions(+) diff --git a/configure b/configure index f239205..1c463bf 100755 --- a/configure +++ b/configure @@ -910,6 +910,7 @@ enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l1_2_1 enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 +enable_api_ms_win_core_file_l2_1_2 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 @@ -17977,6 +17978,7 @@ wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_ wine_fn_config_dll api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 +wine_fn_config_dll api-ms-win-core-file-l2-1-2 enable_api_ms_win_core_file_l2_1_2 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-1-0 enable_api_ms_win_core_heap_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 diff --git a/configure.ac b/configure.ac index c7c7406..a579f32 100644 --- a/configure.ac +++ b/configure.ac @@ -2763,6 +2763,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) +WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-2) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) diff --git a/dlls/api-ms-win-core-file-l2-1-2/Makefile.in b/dlls/api-ms-win-core-file-l2-1-2/Makefile.in new file mode 100644 index 0000000..8f48fde --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l2-1-2.dll diff --git a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec new file mode 100644 index 0000000..bee3c05 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec @@ -0,0 +1,14 @@ +@ stub CopyFile2 +@ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW +@ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW +@ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW +@ stdcall CreateHardLinkA(str str ptr) kernel32.CreateHardLinkA +@ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW +@ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW +@ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx +@ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW +@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW +@ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById +@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW +@ stub ReOpenFile +@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/tools/make_specfiles b/tools/make_specfiles index cb3b840..24878cd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -211,6 +211,7 @@ my @dll_groups = "api-ms-win-core-file-l1-2-0", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", + "api-ms-win-core-file-l2-1-2", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0",

1 0

Fabian Maurer : comctl32/taskdialog: Initial support for callback procedure.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 583d246a2851921e7ff628cd4422a29466ac5c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583d246a2851921e7ff628cd4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 14:50:01 2017 +0300 comctl32/taskdialog: Initial support for callback procedure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 55 +++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/taskdialog.c | 23 +++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index a14a223..2558174 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -80,6 +80,13 @@ struct taskdialog_button_desc HINSTANCE hinst; }; +struct taskdialog_info +{ + HWND hwnd; + PFTASKDIALOGCALLBACK callback; + LONG_PTR callback_data; +}; + static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) { if (width) @@ -482,20 +489,54 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi return template; } +static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) +{ + return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, + dialog_info->callback_data) : S_OK; +} + +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) +{ + if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) + EndDialog(dialog_info->hwnd, command_id); +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; + struct taskdialog_info *dialog_info; + TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); + if (msg != WM_INITDIALOG) + dialog_info = GetPropW(hwnd, taskdialog_info_propnameW); + switch (msg) { + case TDM_CLICK_BUTTON: + taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + break; + case WM_INITDIALOG: + dialog_info = (struct taskdialog_info *)lParam; + dialog_info->hwnd = hwnd; + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + break; + case WM_SHOWWINDOW: + taskdialog_notify(dialog_info, TDN_CREATED, 0, 0); + break; case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - WORD command_id = LOWORD(wParam); - EndDialog(hwnd, command_id); + taskdialog_on_button_click(dialog_info, LOWORD(wParam)); return TRUE; } break; + case WM_DESTROY: + taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); + RemovePropW(hwnd, taskdialog_info_propnameW); + break; } return FALSE; } @@ -506,13 +547,21 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *button, int *radio_button, BOOL *verification_flag_checked) { + struct taskdialog_info dialog_info; DLGTEMPLATE *template; INT ret; TRACE("%p, %p, %p, %p\n", taskconfig, button, radio_button, verification_flag_checked); + if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) + return E_INVALIDARG; + + dialog_info.callback = taskconfig->pfCallback; + dialog_info.callback_data = taskconfig->lpCallbackData; + template = create_taskdialog_template(taskconfig); - ret = DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, taskdialog_proc, 0); + ret = DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, + taskdialog_proc, (LPARAM)&dialog_info); Free(template); if (button) *button = ret; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index c937127..57f33f3 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -31,6 +31,27 @@ static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, in static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); +static void test_invalid_parameters(void) +{ + TASKDIALOGCONFIG info = { 0 }; + HRESULT hr; + + hr = pTaskDialogIndirect(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + + info.cbSize = 0; + hr = pTaskDialogIndirect(&info, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + + info.cbSize = sizeof(TASKDIALOGCONFIG) - 1; + hr = pTaskDialogIndirect(&info, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); + + info.cbSize = sizeof(TASKDIALOGCONFIG) + 1; + hr = pTaskDialogIndirect(&info, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -62,5 +83,7 @@ START_TEST(taskdialog) ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); + test_invalid_parameters(); + unload_v6_module(ctx_cookie, hCtx); }

1 0

Michael Stefaniuc : msi: Remove redundant NULL checks before msi_free().
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: 4a2809166c4056a73956093f341125f4c3c07f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2809166c4056a73956093f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 20 12:28:00 2017 +0200 msi: Remove redundant NULL checks before msi_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2ccaf62..bc41403 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4309,7 +4309,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) static UINT pending_event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) { dialog->pending_event = event_end_dialog; - if (dialog->pending_argument) msi_free( dialog->pending_argument ); + msi_free( dialog->pending_argument ); dialog->pending_argument = strdupW( argument ); return ERROR_SUCCESS; } @@ -4327,7 +4327,7 @@ static UINT event_new_dialog( msi_dialog *dialog, const WCHAR *argument ) static UINT pending_event_new_dialog( msi_dialog *dialog, const WCHAR *argument ) { dialog->pending_event = event_new_dialog; - if (dialog->pending_argument) msi_free( dialog->pending_argument ); + msi_free( dialog->pending_argument ); dialog->pending_argument = strdupW( argument ); return ERROR_SUCCESS; } @@ -4352,7 +4352,7 @@ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) static UINT pending_event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { dialog->pending_event = event_spawn_dialog; - if (dialog->pending_argument) msi_free( dialog->pending_argument ); + msi_free( dialog->pending_argument ); dialog->pending_argument = strdupW( argument ); return ERROR_SUCCESS; }

1 0

Michael Stefaniuc : kernel32: Remove redundant attributes check.
by Alexandre Julliard Sept. 20, 2017

Sept. 20, 2017

Module: wine Branch: master Commit: c7411a639053565bea476c6dec37f327a4c3fb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7411a639053565bea476c6de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 20 12:27:59 2017 +0200 kernel32: Remove redundant attributes check. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6c0b8eb..7492604 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -1000,8 +1000,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) ctx.insert = !ctx.insert; GetConsoleScreenBufferInfo(ctx.hConOut, &csbi); - if (ctx.csbi.wAttributes != csbi.wAttributes) - ctx.csbi.wAttributes = csbi.wAttributes; + ctx.csbi.wAttributes = csbi.wAttributes; if (func) (func)(&ctx);

1 0