June 2017 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Use an external UI record handler before a string handler.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: cef67993c5164bb12ff0547152d604f3fcc3d549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef67993c5164bb12ff054715… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:27 2017 -0500 msi: Use an external UI record handler before a string handler. 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/package.c | 20 +++++----- dlls/msi/tests/package.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 330f80f..8f86352 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1819,21 +1819,21 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerW && (gUIFilter & log_type)) - { - rc = gUIHandlerW( gUIContext, eMessageType, message ); - } - else if (gUIHandlerA && (gUIFilter & log_type)) - { - rc = gUIHandlerA( gUIContext, eMessageType, msg ); - } - else if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilter & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); MsiCloseHandle( rec ); } + if (!rc && gUIHandlerW && (gUIFilter & log_type)) + { + rc = gUIHandlerW( gUIContext, eMessageType, message ); + } + else if (!rc && gUIHandlerA && (gUIFilter & log_type)) + { + rc = gUIHandlerA( gUIContext, eMessageType, msg ); + } if (!rc && package->log_file != INVALID_HANDLE_VALUE && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) @@ -1882,7 +1882,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC break; } - return ERROR_SUCCESS; + return rc; } INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 10ef84a..e18f0f0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -39,6 +39,7 @@ static char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiSetExternalUIRecord)(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); @@ -67,6 +68,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); + GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, CheckTokenMembership); @@ -9074,6 +9076,102 @@ error: DeleteFileA( msifile ); } +static int externalui_ran; + +static INT CALLBACK externalui_callback(void *context, UINT message_type, LPCSTR message) +{ + externalui_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + return 0; +} + +static int externalui_record_ran; + +static INT CALLBACK externalui_record_callback(void *context, UINT message_type, MSIHANDLE hrecord) +{ + INT retval = context ? *((INT *)context) : 0; + UINT r; + externalui_record_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + r = MsiRecordGetFieldCount(hrecord); + ok(r == 1, "expected 1, got %u\n", r); + r = MsiRecordGetInteger(hrecord, 1); + todo_wine + ok(r == 12345, "expected 12345, got %u\n", r); + return retval; +} + +static void test_externalui(void) +{ + /* test that external UI handlers work correctly */ + + INSTALLUI_HANDLERA prev; + INSTALLUI_HANDLER_RECORD prev_record; + MSIHANDLE hpkg, hrecord; + UINT r; + + prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + r = package_from_db(create_package_db(), &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "Expected a valid package %u\n", r); + + hrecord = MsiCreateRecord(1); + ok(hrecord, "Expected a valid record\n"); + r = MsiRecordSetStringA(hrecord, 0, "test message [1]"); + ok(r == ERROR_SUCCESS, "MsiSetString failed %u\n", r); + r = MsiRecordSetInteger(hrecord, 1, 12345); + ok(r == ERROR_SUCCESS, "MsiSetInteger failed %u\n", r); + + externalui_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + + if (pMsiSetExternalUIRecord) + { + INT retval = 0; + + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + todo_wine + ok(r == 1, "expected 1, got %u\n", r); + todo_wine + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + } + else + win_skip("MsiSetExternalUIRecord is not available\n"); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9131,6 +9229,7 @@ START_TEST(package) test_MsiApplyPatch(); test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); + test_externalui(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Zebediah Figura : msi: Store string and record callback data separately.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: df31a7c1ece45ad5492bd96a4ad43611b3dde072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31a7c1ece45ad5492bd96a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:28 2017 -0500 msi: Store string and record callback data separately. 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/media.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/msi_main.c | 2 ++ dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 13 ++++++++----- dlls/msi/tests/package.c | 12 ++++++++++-- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 1357a64..bbfdd6f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -109,7 +109,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIHANDLE rec = MsiCreateRecord(1); MsiRecordSetStringW(rec, 0, error); - gUIHandlerRecord(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); + gUIHandlerRecord(gUIContextRecord, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); MsiCloseHandle(rec); } } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8a11e83..ce8a7be 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4222,8 +4222,8 @@ UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, *prev = gUIHandlerRecord; gUIHandlerRecord = handler; - gUIFilter = filter; - gUIContext = context; + gUIFilterRecord = filter; + gUIContextRecord = context; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 0955856..11cbf41 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -44,7 +44,9 @@ INSTALLUI_HANDLERA gUIHandlerA = NULL; INSTALLUI_HANDLERW gUIHandlerW = NULL; INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; DWORD gUIFilter = 0; +DWORD gUIFilterRecord = 0; LPVOID gUIContext = NULL; +LPVOID gUIContextRecord = NULL; WCHAR *gszLogFile = NULL; HINSTANCE msi_hInstance; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2e9e91e..cc42316 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -972,7 +972,9 @@ extern INSTALLUI_HANDLERA gUIHandlerA DECLSPEC_HIDDEN; extern INSTALLUI_HANDLERW gUIHandlerW DECLSPEC_HIDDEN; extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord DECLSPEC_HIDDEN; extern DWORD gUIFilter DECLSPEC_HIDDEN; +extern DWORD gUIFilterRecord DECLSPEC_HIDDEN; extern LPVOID gUIContext DECLSPEC_HIDDEN; +extern LPVOID gUIContextRecord DECLSPEC_HIDDEN; extern WCHAR *gszLogFile DECLSPEC_HIDDEN; extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8f86352..eae01e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1811,27 +1811,30 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC p[0] = 0; } - TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord, - gUIFilter, log_type, debugstr_w(message)); - /* convert it to ASCII */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); - rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", + gUIHandlerRecord, gUIContextRecord, eMessageType, rec); + rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); MsiCloseHandle( rec ); } if (!rc && gUIHandlerW && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerW, gUIContext, eMessageType, debugstr_w(message)); rc = gUIHandlerW( gUIContext, eMessageType, message ); } else if (!rc && gUIHandlerA && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg)); rc = gUIHandlerA( gUIContext, eMessageType, msg ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e18f0f0..a7cec7f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9159,11 +9159,19 @@ static void test_externalui(void) retval = 1; externalui_ran = externalui_record_ran = 0; r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - todo_wine ok(r == 1, "expected 1, got %u\n", r); - todo_wine ok(externalui_ran == 0, "external UI callback should not have run\n"); ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); } else win_skip("MsiSetExternalUIRecord is not available\n");

1 0

Zebediah Figura : msi: Pass the given record to the callback.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4e49ae3cc69b595f791410b3060dc18ddb9412cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e49ae3cc69b595f791410b30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:30 2017 -0500 msi: Pass the given record to the callback. 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/package.c | 3 +-- dlls/msi/tests/package.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index eae01e0..e195764 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1818,8 +1818,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { - MSIHANDLE rec = MsiCreateRecord( 1 ); - MsiRecordSetStringW( rec, 0, message ); + MSIHANDLE rec = alloc_msihandle(&record->hdr); TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", gUIHandlerRecord, gUIContextRecord, eMessageType, rec); rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a7cec7f..146d1fc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9096,7 +9096,6 @@ static INT CALLBACK externalui_record_callback(void *context, UINT message_type, r = MsiRecordGetFieldCount(hrecord); ok(r == 1, "expected 1, got %u\n", r); r = MsiRecordGetInteger(hrecord, 1); - todo_wine ok(r == 12345, "expected 12345, got %u\n", r); return retval; }

1 0

Alexandre Julliard : iphlpapi: Check if getifaddrs really exists.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7f23bbe7f9b252ac6a9e0881b25315cc3a6eeca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f23bbe7f9b252ac6a9e0881b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 13:47:38 2017 +0200 iphlpapi: Check if getifaddrs really exists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/iphlpapi/ifenum.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 10a4204..55b5ad8 100755 --- a/configure +++ b/configure @@ -15403,6 +15403,7 @@ for ac_func in \ futimesat \ getattrlist \ getauxval \ + getifaddrs \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/configure.ac b/configure.ac index 573d290..9ec90f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,7 @@ AC_CHECK_FUNCS(\ futimesat \ getattrlist \ getauxval \ + getifaddrs \ getopt_long_only \ getpwuid \ gettimeofday \ diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 3070ae5..eed1be1 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -815,7 +815,7 @@ static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, return ret; } -#ifdef HAVE_IFADDRS_H +#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) /* Counts the IPv4 addresses in the system using the return value from * getifaddrs, returning the count. diff --git a/include/config.h.in b/include/config.h.in index 7cdf70c..18cacd5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -204,6 +204,9 @@ /* Define to 1 if you have the `getauxval' function. */ #undef HAVE_GETAUXVAL +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO

1 0

Zebediah Figura : msacm32: Rewrite PCM conversion functions.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: cadedd73f968fc981e86e020cfe00b32ce9de752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cadedd73f968fc981e86e020c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 15 13:25:48 2017 -0500 msacm32: Rewrite PCM conversion functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 584 +++++++++++++++++++++++--------------------- dlls/msacm32/tests/msacm.c | 99 ++++++++ 2 files changed, 399 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cadedd73f968fc981e86e…

1 0

Sebastian Lackner : wined3d: Trigger frontbuffer update in surface_cpu_blt.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7fbdb54ee4c66bf4d50fa6b8eb0fb4c3f7cdbea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbdb54ee4c66bf4d50fa6b8e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 19 17:54:36 2017 +0200 wined3d: Trigger frontbuffer update in surface_cpu_blt. Fixes a regression introduced in ee17d7ba1b72b26baae90c1d5e2ae5b3e4721654. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af8b5b4..c1bb53e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3343,6 +3343,12 @@ release: context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) + { + SetRect(&dst_texture->swapchain->front_buffer_update, + dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); + dst_texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(dst_texture->swapchain); + } if (converted_texture) wined3d_texture_decref(converted_texture); if (context)

1 0

Andrey Gusev : api-ms-win-security-credentials-l1-1-0: Add dll.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: abaddc871842ba4ec0156f4bfed9939b44052ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abaddc871842ba4ec0156f4bf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jun 19 16:50:19 2017 +0300 api-ms-win-security-credentials-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 + .../Makefile.in | 1 + .../api-ms-win-security-credentials-l1-1-0.spec | 29 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 34 insertions(+) diff --git a/configure b/configure index 55b5ad8..02de880 100755 --- a/configure +++ b/configure @@ -1032,6 +1032,7 @@ enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 +enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 @@ -17922,6 +17923,7 @@ wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_a wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 +wine_fn_config_dll api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 diff --git a/configure.ac b/configure.ac index 9ec90f9..7ae29f7 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-base-private-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) diff --git a/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in b/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in new file mode 100644 index 0000000..8acd7aa --- /dev/null +++ b/dlls/api-ms-win-security-credentials-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-credentials-l1-1-0.dll diff --git a/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec b/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec new file mode 100644 index 0000000..857795c --- /dev/null +++ b/dlls/api-ms-win-security-credentials-l1-1-0/api-ms-win-security-credentials-l1-1-0.spec @@ -0,0 +1,29 @@ +@ stdcall CredDeleteA(str long long) advapi32.CredDeleteA +@ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW +@ stdcall CredEnumerateA(str long ptr ptr) advapi32.CredEnumerateA +@ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW +@ stub CredFindBestCredentialA +@ stub CredFindBestCredentialW +@ stdcall CredFree(ptr) advapi32.CredFree +@ stdcall CredGetSessionTypes(long ptr) advapi32.CredGetSessionTypes +@ stub CredGetTargetInfoA +@ stub CredGetTargetInfoW +@ stdcall CredIsMarshaledCredentialW(wstr) advapi32.CredIsMarshaledCredentialW +@ stub CredIsProtectedA +@ stub CredIsProtectedW +@ stdcall CredMarshalCredentialA(long ptr ptr) advapi32.CredMarshalCredentialA +@ stdcall CredMarshalCredentialW(long ptr ptr) advapi32.CredMarshalCredentialW +@ stub CredProtectA +@ stub CredProtectW +@ stdcall CredReadA(str long long ptr) advapi32.CredReadA +@ stdcall CredReadDomainCredentialsA(ptr long ptr ptr) advapi32.CredReadDomainCredentialsA +@ stdcall CredReadDomainCredentialsW(ptr long ptr ptr) advapi32.CredReadDomainCredentialsW +@ stdcall CredReadW(wstr long long ptr) advapi32.CredReadW +@ stdcall CredUnmarshalCredentialA(str ptr ptr) advapi32.CredUnmarshalCredentialA +@ stdcall CredUnmarshalCredentialW(wstr ptr ptr) advapi32.CredUnmarshalCredentialW +@ stub CredUnprotectA +@ stub CredUnprotectW +@ stdcall CredWriteA(ptr long) advapi32.CredWriteA +@ stub CredWriteDomainCredentialsA +@ stub CredWriteDomainCredentialsW +@ stdcall CredWriteW(ptr long) advapi32.CredWriteW diff --git a/tools/make_specfiles b/tools/make_specfiles index 910bd0f..ca620da 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -124,6 +124,7 @@ my @dll_groups = "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", + "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-1",

1 0

Sebastian Lackner : gdiplus: Initialize containers list in GdipCloneImage.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a4b7fe6a92ec5fd709156c6d3547730929833248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7fe6a92ec5fd709156c6d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:06:12 2017 +0200 gdiplus: Initialize containers list in GdipCloneImage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07609ac..720f8f2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1333,6 +1333,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) result->unit = metafile->unit; result->metafile_type = metafile->metafile_type; result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + list_init(&result->containers); if (!result->hemf) {

1 0

Clemens Tamme : gdiplus: Implement triangular line caps in widened paths.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 260cbd022e43b9385b8d501de412151d89debd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=260cbd022e43b9385b8d501de… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Sat Jun 17 17:28:28 2017 +0200 gdiplus: Implement triangular line caps in widened paths. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3d33c29..e34f4ed 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1883,6 +1883,27 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } break; } + case LineCapTriangle: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy; + + dx = distance * segment_dx / segment_length; + dy = distance * segment_dy / segment_length; + + if (add_first_points) { + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeLine); + } + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } } } @@ -2118,10 +2139,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRound) + if (pen->endcap > LineCapTriangle) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRound) + if (pen->startcap > LineCapTriangle) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Henri Verbeet : include: Simply forward declare the required D2D interfaces in wincodec.idl.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 92847874b273ec488e6eaa882cac8772005ff9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=92847874b273ec488e6eaa882… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 16 12:18:25 2017 +0200 include: Simply forward declare the required D2D interfaces in wincodec.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1ea6e0e..2a80876 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -218,14 +218,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") cpp_quote("#if 0") -typedef DWORD *ID2D1Device; -typedef DWORD *ID2D1Image; typedef DWORD *D2D1_PIXEL_FORMAT; cpp_quote ("#endif") -cpp_quote ("typedef interface ID2D1Device ID2D1Device;") -cpp_quote ("typedef interface ID2D1Image ID2D1Image;") - typedef struct WICRect { INT X; INT Y; @@ -254,6 +249,8 @@ typedef struct WICImageParameters typedef UINT32 WICColor; +interface ID2D1Device; +interface ID2D1Image; interface IWICPalette; [

1 0