September 2017 - Wine-commits

Michael Stefaniuc : gdiplus: Remove a wrapper around GdipFree().
by Alexandre Julliard 20 Sep '17

20 Sep '17

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

Nikolay Sivov : shell32: Implement Title property using shellfolder API.
by Alexandre Julliard 20 Sep '17

20 Sep '17

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

Nikolay Sivov : dwrite: Added IDWriteFontFallbackBuilder stub.
by Alexandre Julliard 20 Sep '17

20 Sep '17

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

Jacek Caban : fusion: Return S_OK in InitializeFusion.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 21f78807a063fe0df4e911b3bee20b14bdbd1874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f78807a063fe0df4e911b3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 20 19:51:26 2017 +0200 fusion: Return S_OK in InitializeFusion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/fusion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index f9d57d1..b038b38 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); HRESULT WINAPI InitializeFusion(void) { FIXME("\n"); - return E_NOTIMPL; + return S_OK; } /******************************************************************

1 0

Jacek Caban : ucrtbase: Added _register_thread_local_exe_atexit_callback implementation.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 32c38dc4b27d314f5c367549c7016aaef7f425d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c38dc4b27d314f5c367549c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 20 16:06:13 2017 +0200 ucrtbase: Added _register_thread_local_exe_atexit_callback 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> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 13 +++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index caf0193..50856a5 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -61,7 +61,7 @@ @ stub _invoke_watson @ stub _query_app_type @ cdecl _register_onexit_function(ptr ptr) ucrtbase._register_onexit_function -@ stub _register_thread_local_exe_atexit_callback +@ cdecl _register_thread_local_exe_atexit_callback(ptr) ucrtbase._register_thread_local_exe_atexit_callback @ cdecl _resetstkoflw() ucrtbase._resetstkoflw @ cdecl -arch=i386,x86_64,arm,arm64 _seh_filter_dll(long ptr) ucrtbase._seh_filter_dll @ cdecl _seh_filter_exe(long ptr) ucrtbase._seh_filter_exe diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 4eff073..1d19081 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,6 +41,9 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); +static _tls_callback_type tls_atexit_callback; + static CRITICAL_SECTION MSVCRT_onexit_cs; static CRITICAL_SECTION_DEBUG MSVCRT_onexit_cs_debug = { @@ -63,6 +66,7 @@ static void __MSVCRT__call_atexit(void) { /* Note: should only be called with the exit lock held */ TRACE("%d atext functions to call\n", MSVCRT_atexit_registered); + if (tls_atexit_callback) tls_atexit_callback(NULL, DLL_PROCESS_DETACH, NULL); /* Last registered gets executed first */ while (MSVCRT_atexit_registered > 0) { @@ -450,6 +454,15 @@ int CDECL MSVCRT__execute_onexit_table(MSVCRT__onexit_table_t *table) } /********************************************************************* + * _register_thread_local_exe_atexit_callback (UCRTBASE.@) + */ +void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callback) +{ + TRACE("(%p)\n", callback); + tls_atexit_callback = callback; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e48c2ed..9512a22 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1862,7 +1862,7 @@ @ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long) @ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function -@ stub _register_thread_local_exe_atexit_callback +@ cdecl _register_thread_local_exe_atexit_callback(ptr) @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() MSVCRT__rmtmp

1 0

Józef Kucia : xinput1_1: Avoid DLL forwarding.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: ff8c49eec33ab2688d0fe50960e08075a908f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c49eec33ab2688d0fe5096… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:04 2017 +0200 xinput1_1: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 4 ++++ dlls/xinput1_1/xinput1_1.spec | 10 +++++----- dlls/xinput1_3/Makefile.in | 2 +- dlls/xinput1_3/{xinput1_3_main.c => xinput_main.c} | 0 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index fc341d1..e08b999 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_1.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_1/xinput1_1.spec b/dlls/xinput1_1/xinput1_1.spec index 95759c3..5a55370 100644 --- a/dlls/xinput1_1/xinput1_1.spec +++ b/dlls/xinput1_1/xinput1_1.spec @@ -1,5 +1,5 @@ -@ stdcall XInputEnable(long) xinput1_3.XInputEnable -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputEnable(long) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr) diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index cf8f730..0fe3f6d 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -2,6 +2,6 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput C_SRCS = \ - xinput1_3_main.c + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput_main.c similarity index 100% rename from dlls/xinput1_3/xinput1_3_main.c rename to dlls/xinput1_3/xinput_main.c

1 0

Józef Kucia : xinput1_2: Avoid DLL forwarding.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 13852ba4af693572099b5d4bd52a76d201c3818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13852ba4af693572099b5d4bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:05 2017 +0200 xinput1_2: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_2/Makefile.in | 4 ++++ dlls/xinput1_2/xinput1_2.spec | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 16fed94..1a9ac73 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_2.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_2/xinput1_2.spec b/dlls/xinput1_2/xinput1_2.spec index 95759c3..5a55370 100644 --- a/dlls/xinput1_2/xinput1_2.spec +++ b/dlls/xinput1_2/xinput1_2.spec @@ -1,5 +1,5 @@ -@ stdcall XInputEnable(long) xinput1_3.XInputEnable -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputEnable(long) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr)

1 0

Zebediah Figura : msi: Remove a superfluous substructure.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: 5245b9d3a85d5c4bc5857fa948d4fffa2400cd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5245b9d3a85d5c4bc5857fa94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 12:46:53 2017 -0500 msi: Remove a superfluous substructure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 45 ++++++++++++++++++++------------------------- dlls/msi/custom.c | 39 ++++++++++++++++----------------------- dlls/msi/msipriv.h | 36 +++++++++++++++--------------------- dlls/msi/package.c | 30 +++++++++++------------------- 4 files changed, 62 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5245b9d3a85d5c4bc5857…

1 0

Zebediah Figura : msi: Store the current script in the package.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: e1e668d41fce1dbd0270cd9de0d880a236ddb869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e668d41fce1dbd0270cd9de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 12:46:54 2017 -0500 msi: Store the current script in the package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 25 +++++++++++++++---------- dlls/msi/custom.c | 34 ++-------------------------------- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 8 ++++---- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 8 +++----- dlls/msi/package.c | 1 + 7 files changed, 29 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e668d41fce1dbd0270c…

1 0

Hans Leidekker : msi: Pass correct length to GetDateFormatW.
by Alexandre Julliard 19 Sep '17

19 Sep '17

Module: wine Branch: master Commit: fdac39f697e049ead215b164bfe6953269ffa7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdac39f697e049ead215b164b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 19 19:37:48 2017 +0200 msi: Pass correct length to GetDateFormatW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 63377a0..18466e1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2282,7 +2282,7 @@ static MSIRECORD *msi_get_property_row( MSIDATABASE *db, LPCWSTR name ) if (!length) return NULL; buffer = msi_alloc(length * sizeof(WCHAR)); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, buffer, sizeof(WCHAR)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, buffer, length); row = MSI_CreateRecord(1); if (!row) @@ -2297,7 +2297,7 @@ static MSIRECORD *msi_get_property_row( MSIDATABASE *db, LPCWSTR name ) if (!length) return NULL; buffer = msi_alloc(length * sizeof(WCHAR)); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER, NULL, NULL, buffer, sizeof(WCHAR)); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER, NULL, NULL, buffer, length); row = MSI_CreateRecord(1); if (!row)

1 0