September 2016 - Wine-commits

Tag wine-1.9.19 : Alexandre Julliard : Release 1.9.19
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: refs/tags/wine-1.9.19 Tag: 057a93c6017e0de73bccf5c4ee170cf64f05461e URL: http://source.winehq.org/git/wine.git/?a=tag;h=057a93c6017e0de73bccf5c4ee17… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 00:14:21 2016 +0900 Release 1.9.19

1 0

Andrey Gusev : api-ms-win-core-winrt-errorprivate-l1-1-1: Add dll.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: c07769731cf0505f903cd5fbab9e8a6eb85a3fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07769731cf0505f903cd5fba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 15 19:22:20 2016 +0300 api-ms-win-core-winrt-errorprivate-l1-1-1: 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 + dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-winrt-errorprivate-l1-1-1.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 2fa877d..2b5726f 100755 --- a/configure +++ b/configure @@ -962,6 +962,7 @@ enable_api_ms_win_core_version_l1_1_0 enable_api_ms_win_core_versionansi_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 +enable_api_ms_win_core_winrt_errorprivate_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 @@ -17627,6 +17628,7 @@ wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version wine_fn_config_dll api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 +wine_fn_config_dll api-ms-win-core-winrt-errorprivate-l1-1-1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_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 diff --git a/configure.ac b/configure.ac index f6b9039..204d5a6 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,6 +2738,7 @@ WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-winrt-errorprivate-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/Makefile.in new file mode 100644 index 0000000..4a5bdf6 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-errorprivate-l1-1-1.dll diff --git a/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/api-ms-win-core-winrt-errorprivate-l1-1-1.spec b/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/api-ms-win-core-winrt-errorprivate-l1-1-1.spec new file mode 100644 index 0000000..866f468 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-errorprivate-l1-1-1/api-ms-win-core-winrt-errorprivate-l1-1-1.spec @@ -0,0 +1,2 @@ +@ stub RoFailFastWithErrorContextInternal +@ stub RoReportCapabilityCheckFailure diff --git a/tools/make_specfiles b/tools/make_specfiles index 7c1cd1f..53597e4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -263,6 +263,7 @@ my @dll_groups = ], [ "combase", + "api-ms-win-core-winrt-errorprivate-l1-1-1", "api-ms-win-core-winrt-l1-1-0", "api-ms-win-core-winrt-registration-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0",

1 0

Andrey Gusev : api-ms-win-core-windowserrorreporting-l1-1-0: Add dll.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: c059b18ac62bb58eb0b2df368ae2e13ef591ec81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c059b18ac62bb58eb0b2df368… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 15 20:13:18 2016 +0300 api-ms-win-core-windowserrorreporting-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 + dlls/api-ms-win-core-windowserrorreporting-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 2b5726f..1e408be 100755 --- a/configure +++ b/configure @@ -960,6 +960,7 @@ enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_version_l1_1_0 enable_api_ms_win_core_versionansi_l1_1_0 +enable_api_ms_win_core_windowserrorreporting_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 @@ -17626,6 +17627,7 @@ wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 wine_fn_config_dll api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_dll api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-errorprivate-l1-1-1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 diff --git a/configure.ac b/configure.ac index 204d5a6..9027299 100644 --- a/configure.ac +++ b/configure.ac @@ -2736,6 +2736,7 @@ WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-errorprivate-l1-1-1) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/Makefile.in b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/Makefile.in new file mode 100644 index 0000000..8ff7fce --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-windowserrorreporting-l1-1-0.dll diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec new file mode 100644 index 0000000..e5b4a61 --- /dev/null +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -0,0 +1,10 @@ +@ stub GetApplicationRecoveryCallback +@ stub GetApplicationRestartSettings +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource +@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile +@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule +@ stub WerUnregisterFile +@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock +@ stub WerUnregisterRuntimeExceptionModule diff --git a/tools/make_specfiles b/tools/make_specfiles index 53597e4..218f58e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -189,6 +189,7 @@ my @dll_groups = "api-ms-win-core-localization-l1-2-1", "api-ms-win-core-datetime-l1-1-0", "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-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2",

1 0

Andrey Gusev : api-ms-win-core-localization-private-l1-1-0: Add dll.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: dff4ae99eb0ccec101d026f8d1c77318e9fec9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff4ae99eb0ccec101d026f8d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Sep 16 13:13:37 2016 +0300 api-ms-win-core-localization-private-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 + dlls/api-ms-win-core-localization-private-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-localization-private-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 1e408be..fb38c87 100755 --- a/configure +++ b/configure @@ -916,6 +916,7 @@ enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 +enable_api_ms_win_core_localization_private_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 @@ -17583,6 +17584,7 @@ wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_lo wine_fn_config_dll api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 +wine_fn_config_dll api-ms-win-core-localization-private-l1-1-0 enable_api_ms_win_core_localization_private_l1_1_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 diff --git a/configure.ac b/configure.ac index 9027299..7a29dc4 100644 --- a/configure.ac +++ b/configure.ac @@ -2692,6 +2692,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-localization-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) diff --git a/dlls/api-ms-win-core-localization-private-l1-1-0/Makefile.in b/dlls/api-ms-win-core-localization-private-l1-1-0/Makefile.in new file mode 100644 index 0000000..0461f5f --- /dev/null +++ b/dlls/api-ms-win-core-localization-private-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-private-l1-1-0.dll diff --git a/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec new file mode 100644 index 0000000..b704db6 --- /dev/null +++ b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub _AddMUIStringToCache +@ stub _GetMUIStringFromCache +@ stub _OpenMuiStringCache +@ stub GetCPFileNameFromRegistry +@ stub LoadStringByReference +@ stub NlsCheckPolicy +@ stub NlsEventDataDescCreate +@ stub NlsGetCacheUpdateCount +@ stub NlsUpdateLocale +@ stub NlsUpdateSystemLocale +@ stub NlsWriteEtwEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 218f58e..66476df 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -168,6 +168,7 @@ my @dll_groups = "api-ms-win-core-localization-l2-1-0", "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-localization-obsolete-l1-2-0", + "api-ms-win-core-localization-private-l1-1-0", "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2",

1 0

Piotr Caban : msvcp140: Fix locale class structure.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: e5ffb180c4a229db6a6bd37a9afcc4a96bda6ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ffb180c4a229db6a6bd37a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 15 19:18:19 2016 +0200 msvcp140: Fix locale class structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c775156..e46c5cf 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -258,6 +258,9 @@ wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char); /* class locale */ typedef struct { +#if _MSVCP_VER >= 140 + int unused; +#endif struct _locale__Locimp *ptr; } locale;

1 0

Dmitry Timoshkov : windowscodecs: Avoid extra conversion step BGR-> RGB when converting 32bpp BGRA to 24bpp RGB.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 7431380e3860b58a072047751ebae80f8191937a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7431380e3860b58a072047751… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 15 16:10:15 2016 -0500 windowscodecs: Avoid extra conversion step BGR->RGB when converting 32bpp BGRA to 24bpp RGB. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 13 ++++++++----- dlls/windowscodecs/tests/converter.c | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e701f2a..efe78d8 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -953,6 +953,7 @@ static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRec const BYTE *srcpixel; BYTE *dstrow; BYTE *dstpixel; + BYTE tmppixel[3]; srcstride = 4 * prc->Width; srcdatasize = srcstride * prc->Height; @@ -970,16 +971,18 @@ static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRec srcpixel=srcrow; dstpixel=dstrow; for (x=0; x<prc->Width; x++) { - *dstpixel++=*srcpixel++; /* blue */ - *dstpixel++=*srcpixel++; /* green */ - *dstpixel++=*srcpixel++; /* red */ + tmppixel[0]=*srcpixel++; /* blue */ + tmppixel[1]=*srcpixel++; /* green */ + tmppixel[2]=*srcpixel++; /* red */ srcpixel++; /* alpha */ + + *dstpixel++=tmppixel[2]; /* red */ + *dstpixel++=tmppixel[1]; /* green */ + *dstpixel++=tmppixel[0]; /* blue */ } srcrow += srcstride; dstrow += cbStride; } - - reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); } HeapFree(GetProcessHeap(), 0, srcdata); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 8c7a10f..c1599c5 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -733,6 +733,7 @@ START_TEST(converter) test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", FALSE); test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); + test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Vincent Povirk : windowscodecs/tests: Add a helper function for comparing bits.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 82f82f69174f9725ef7663307ff2571026ebedda URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f82f69174f9725ef7663307… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 15 16:10:16 2016 -0500 windowscodecs/tests: Add a helper function for comparing bits. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 58 ++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index c1599c5..d6f581d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -196,6 +196,29 @@ static void DeleteTestBitmap(BitmapTestSrc *This) HeapFree(GetProcessHeap(), 0, This); } +static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, const BYTE *converted_bits) +{ + BOOL equal; + + if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppBGR)) + { + /* ignore the padding byte when comparing data */ + UINT i; + const DWORD *a=(const DWORD*)expect->bits, *b=(const DWORD*)converted_bits; + equal=TRUE; + for (i=0; i<(buffersize/4); i++) + if ((a[i]&0xffffff) != (b[i]&0xffffff)) + { + equal = FALSE; + break; + } + } + else + equal = (memcmp(expect->bits, converted_bits, buffersize) == 0); + + return equal; +} + static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSource *source, const char *name) { BYTE *converted_bits; @@ -231,42 +254,13 @@ static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSour converted_bits = HeapAlloc(GetProcessHeap(), 0, buffersize); hr = IWICBitmapSource_CopyPixels(source, &prc, stride, buffersize, converted_bits); ok(SUCCEEDED(hr), "CopyPixels(%s) failed, hr=%x\n", name, hr); - if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppBGR)) - { - /* ignore the padding byte when comparing data */ - UINT i; - BOOL equal=TRUE; - const DWORD *a=(const DWORD*)expect->bits, *b=(const DWORD*)converted_bits; - for (i=0; i<(buffersize/4); i++) - if ((a[i]&0xffffff) != (b[i]&0xffffff)) - { - equal = FALSE; - break; - } - ok(equal, "unexpected pixel data (%s)\n", name); - } - else - ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data (%s)\n", name); + ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); /* Test with NULL rectangle - should copy the whole bitmap */ + memset(converted_bits, 0xaa, buffersize); hr = IWICBitmapSource_CopyPixels(source, NULL, stride, buffersize, converted_bits); ok(SUCCEEDED(hr), "CopyPixels(%s,rc=NULL) failed, hr=%x\n", name, hr); - if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppBGR)) - { - /* ignore the padding byte when comparing data */ - UINT i; - BOOL equal=TRUE; - const DWORD *a=(const DWORD*)expect->bits, *b=(const DWORD*)converted_bits; - for (i=0; i<(buffersize/4); i++) - if ((a[i]&0xffffff) != (b[i]&0xffffff)) - { - equal = FALSE; - break; - } - ok(equal, "unexpected pixel data with rc=NULL (%s)\n", name); - } - else - ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data with rc=NULL (%s)\n", name); + ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); HeapFree(GetProcessHeap(), 0, converted_bits); }

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromWmf.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Module: wine Branch: master Commit: 8c1ded6164ca6d98a0d7010f154cc01e9fc76371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1ded6164ca6d98a0d7010f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 14 14:57:00 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromWmf. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c163ef9..db0a49a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -303,7 +303,7 @@ 303 stdcall GdipGetMetafileHeaderFromFile(wstr ptr) 304 stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) 305 stdcall GdipGetMetafileHeaderFromStream(ptr ptr) -306 stub GdipGetMetafileHeaderFromWmf +306 stdcall GdipGetMetafileHeaderFromWmf(ptr ptr ptr) 307 stdcall GdipGetNearestColor(ptr ptr) 308 stdcall GdipGetPageScale(ptr ptr) 309 stdcall GdipGetPageUnit(ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6d58170..88717e4 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1779,6 +1779,23 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE hwmf, + GDIPCONST WmfPlaceableFileHeader *placeable, MetafileHeader *header) +{ + GpStatus status; + GpMetafile *metafile; + + TRACE("(%p,%p,%p)\n", hwmf, placeable, header); + + status = GdipCreateMetafileFromWmf(hwmf, FALSE, placeable, &metafile); + if (status == Ok) + { + status = GdipGetMetafileHeaderFromMetafile(metafile, header); + GdipDisposeImage(&metafile->image); + } + return status; +} + GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, MetafileHeader *header) {

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromStream.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Module: wine Branch: master Commit: 368b4c47bbbc525f7479bdf8a861d84c3284711e URL: http://source.winehq.org/git/wine.git/?a=commit;h=368b4c47bbbc525f7479bdf8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 14 14:57:01 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 88717e4..adad4f9 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1817,19 +1817,21 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, MetafileHeader *header) { - static int calls; + GpStatus status; + GpMetafile *metafile; TRACE("(%p,%p)\n", stream, header); - if(!stream || !header) + if (!stream || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - memset(header, 0, sizeof(MetafileHeader)); - - return Ok; + status = GdipCreateMetafileFromStream(stream, &metafile); + if (status == Ok) + { + status = GdipGetMetafileHeaderFromMetafile(metafile, header); + GdipDisposeImage(&metafile->image); + } + return status; } GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete,

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromFile.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Module: wine Branch: master Commit: b7956a89bd938bcab348ee533fde97ad90fb26b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7956a89bd938bcab348ee533… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 14 14:57:02 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromFile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index adad4f9..c0e799c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1799,19 +1799,21 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE hwmf, GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, MetafileHeader *header) { - static int calls; + GpStatus status; + GpMetafile *metafile; TRACE("(%s,%p)\n", debugstr_w(filename), header); - if(!filename || !header) + if (!filename || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - memset(header, 0, sizeof(MetafileHeader)); - - return Ok; + status = GdipCreateMetafileFromFile(filename, &metafile); + if (status == Ok) + { + status = GdipGetMetafileHeaderFromMetafile(metafile, header); + GdipDisposeImage(&metafile->image); + } + return status; } GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream,

1 0