November 2018 - Wine-commits

Alexandre Julliard : winegcc: Forward the -mfpu option to winebuild.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: a51611e816979390efe267d95da223b8db3ee4b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51611e816979390efe267d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 20:21:30 2018 +0100 winegcc: Forward the -mfpu option to winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 05a0ebb..76442d8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1580,6 +1580,7 @@ int main(int argc, char **argv) raw_linker_arg = 1; } else if (!strncmp("-mcpu=", argv[i], 6) || + !strncmp("-mfpu=", argv[i], 6) || !strncmp("-march=", argv[i], 7) || !strncmp("-mfloat-abi=", argv[i], 12)) strarray_add(opts.winebuild_args, argv[i]);

1 0

Akihiro Sagawa : windowscodecs/tests: Introduce PNG_COLOR_TYPE constants.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 495aac5f66ab8f8664205780c4b6c00ed57fab16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=495aac5f66ab8f8664205780… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 4 23:17:40 2018 +0900 windowscodecs/tests: Introduce PNG_COLOR_TYPE constants. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 74 +++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index c798ea4..3648a2e 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -624,23 +624,29 @@ static const char png_1x1_data[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +#define PNG_COLOR_TYPE_GRAY 0 +#define PNG_COLOR_TYPE_RGB 2 +#define PNG_COLOR_TYPE_PALETTE 3 +#define PNG_COLOR_TYPE_GRAY_ALPHA 4 +#define PNG_COLOR_TYPE_RGB_ALPHA 6 + static BOOL is_valid_png_type_depth(int color_type, int bit_depth, BOOL plte) { switch (color_type) { - case 0: /* Grayscale */ + case PNG_COLOR_TYPE_GRAY: return bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8 || bit_depth == 16; - case 2: /* True Color */ + case PNG_COLOR_TYPE_RGB: return bit_depth == 8 || bit_depth == 16; - case 3: /* Indexed Color */ + case PNG_COLOR_TYPE_PALETTE: return (bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8) && plte; - case 4: /* Grayscale with alpha */ + case PNG_COLOR_TYPE_GRAY_ALPHA: return bit_depth == 8 || bit_depth == 16; - case 6: /* True Color with alpha */ + case PNG_COLOR_TYPE_RGB_ALPHA: return bit_depth == 8 || bit_depth == 16; default: @@ -662,33 +668,44 @@ static void test_color_formats(void) } td[] = { /* 2 - PNG_COLOR_TYPE_RGB */ - { 1, 2, NULL, NULL, NULL }, - { 2, 2, NULL, NULL, NULL }, - { 4, 2, NULL, NULL, NULL }, - { 8, 2, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR }, + { 1, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 2, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 4, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 8, PNG_COLOR_TYPE_RGB, + &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppBGR }, /* libpng refuses to load our test image complaining about extra compressed data, * but libpng is still able to load the image with other combination of type/depth * making RGB 16 bpp case special for some reason. Therefore todo = TRUE. */ - { 16, 2, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, TRUE, TRUE }, - { 24, 2, NULL, NULL, NULL }, - { 32, 2, NULL, NULL, NULL }, + { 16, PNG_COLOR_TYPE_RGB, + &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat48bppRGB, TRUE, TRUE }, + { 24, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_RGB, NULL, NULL, NULL }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed }, - { 2, 0, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed }, - { 4, 0, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed }, - { 8, 0, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed }, - { 16, 0, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat64bppRGBA }, - { 24, 0, NULL, NULL, NULL }, - { 32, 0, NULL, NULL, NULL }, + { 1, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat1bppIndexed }, + { 2, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat2bppIndexed }, + { 4, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat4bppIndexed }, + { 8, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat8bppIndexed }, + { 16, PNG_COLOR_TYPE_GRAY, + &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat64bppRGBA }, + { 24, PNG_COLOR_TYPE_GRAY, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_GRAY, NULL, NULL, NULL }, /* 3 - PNG_COLOR_TYPE_PALETTE */ - { 1, 3, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed }, - { 2, 3, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed }, - { 4, 3, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed }, - { 8, 3, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed }, - { 16, 3, NULL, NULL, NULL }, - { 24, 3, NULL, NULL, NULL }, - { 32, 3, NULL, NULL, NULL }, + { 1, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat1bppIndexed }, + { 2, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat2bppIndexed }, + { 4, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat4bppIndexed }, + { 8, PNG_COLOR_TYPE_PALETTE, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat8bppIndexed }, + { 16, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, + { 24, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, + { 32, PNG_COLOR_TYPE_PALETTE, NULL, NULL, NULL }, }; char buf[sizeof(png_1x1_data)]; HRESULT hr; @@ -833,6 +850,11 @@ todo_wine_if(td[i].todo) IWICBitmapDecoder_Release(decoder); } } +#undef PNG_COLOR_TYPE_GRAY +#undef PNG_COLOR_TYPE_RGB +#undef PNG_COLOR_TYPE_PALETTE +#undef PNG_COLOR_TYPE_GRAY_ALPHA +#undef PNG_COLOR_TYPE_RGB_ALPHA START_TEST(pngformat) {

1 0

Akihiro Sagawa : windowscodecs: Fix buffer overflow when generating a palette.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: e93495d3f8e1c1e069823c569e3ec58fa5a95ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93495d3f8e1c1e069823c56… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 4 23:17:42 2018 +0900 windowscodecs: Fix buffer overflow when generating a palette. This typically happens when loading 16-bpp color-keyed grayscale PNG image via GDIPlus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 42a1f2f..3f0ab39 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1057,7 +1057,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, png_palette[i].blue); } } - else if (color_type == PNG_COLOR_TYPE_GRAY) { + else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth <= 8) { ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); if (!ret) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 3648a2e..5f4a5e1 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -539,6 +539,15 @@ static const char png_PLTE_tRNS[] = { 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 }; +/* grayscale 16 bpp 1x1 pixel PNG image with tRNS chunk */ +static const char png_gray_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x10,0x00,0x00,0x00,0x00,0x6a,0xee,0x47,0x16, + 0x00,0x00,0x00,0x02,'t','R','N','S',0x00,0x00,0x76,0x93,0xcd,0x38, + 0x00,0x00,0x00,0x0b,'I','D','A','T',0x78,0x9c,0x63,0x60,0x60,0x00,0x00,0x00,0x03,0x00,0x01,0xb8,0xad,0x3a,0x63, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + static void test_png_palette(void) { HRESULT hr; @@ -548,6 +557,7 @@ static void test_png_palette(void) GUID format; UINT count, ret; WICColor color[256]; + char *buf; hr = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS), &decoder); ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); @@ -579,6 +589,64 @@ static void test_png_palette(void) IWICPalette_Release(palette); IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder); + + hr = create_decoder(png_gray_tRNS, sizeof(png_gray_tRNS), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat64bppRGBA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "CopyPalette error %#x\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + + /* test 8 bpp grayscale PNG image with tRNS chunk */ + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(png_gray_tRNS)); + memcpy(buf, png_gray_tRNS, sizeof(png_gray_tRNS)); + buf[24] = 8; /* override bit depth */ + + hr = create_decoder(buf, sizeof(png_gray_tRNS), &decoder); + ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0x00000000, "expected 0x00000000, got %#x\n", color[0]); + ok(color[1] == 0xff010101, "expected 0xff010101, got %#x\n", color[1]); + + HeapFree(GetProcessHeap(), 0, buf); + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); } /* RGB 24 bpp 1x1 pixel PNG image */

1 0

Piotr Caban : msvcp140: Add _Winerror_map implementation.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 8d0ef952e247e16ff9bbb60e18fc24855b0a789d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0ef952e247e16ff9bbb60e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 5 20:21:27 2018 +0100 msvcp140: Add _Winerror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 296d06c..7c54f80 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1669,7 +1669,7 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub ?_Winerror_map(a)std@@YAHH(a)Z +@ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) _Winerror_map @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 870573e..5705882 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <stdio.h> #include "windef.h" @@ -192,6 +193,7 @@ static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); +static int (__cdecl *p__Winerror_map)(int); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -212,6 +214,7 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); SET(p__Task_impl_base__IsNonBlockingThread, "?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ"); SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ"); + SET(p__Winerror_map, "?_Winerror_map(a)std@@YAHH(a)Z"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); @@ -1303,6 +1306,60 @@ static void test__Winerror_message(void) ok(buf[0] == 'a', "buf = %s\n", buf); } +static void test__Winerror_map(void) +{ + static struct { + int winerr, doserr; + BOOL broken; + } tests[] = { + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP, TRUE}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL, TRUE}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} + }; + int i, ret; + + for(i=0; i<ARRAY_SIZE(tests); i++) + { + ret = p__Winerror_map(tests[i].winerr); + ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), + "_Winerror_map(%d) returned %d, expected %d\n", + tests[i].winerr, ret, tests[i].doserr); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -1325,5 +1382,6 @@ START_TEST(msvcp140) test_Rename(); test_Last_write_time(); test__Winerror_message(); + test__Winerror_map(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c5079d7..aa29fb9 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -198,6 +198,51 @@ static struct { }; #endif +#if _MSVCP_VER >= 140 +static struct { + int winerr; + int doserr; +} winerror_map[] = +{ + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} +}; +#endif + struct __Container_proxy; typedef struct { @@ -2809,4 +2854,24 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } + +/* ?_Winerror_map(a)std@@YAHH(a)Z */ +int __cdecl _Winerror_map(int err) +{ + int low = 0, high = ARRAY_SIZE(winerror_map) - 1, mid; + + while(low <= high) + { + mid = (low + high) / 2; + + if(err == winerror_map[mid].winerr) + return winerror_map[mid].doserr; + if(err > winerror_map[mid].winerr) + low = mid + 1; + else + high = mid - 1; + } + + return 0; +} #endif

1 0

Michael Stefaniuc : cryptui: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: f836995ed59f6bbb8eb5bf74aa6186cbdd6e1b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f836995ed59f6bbb8eb5bf74… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 5 21:56:20 2018 +0100 cryptui: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index bb14fe6..b62ce9e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7013,32 +7013,32 @@ static void init_columns(HWND lv, DWORD flags) column.pszText = buf; if (!(flags & CRYPTUI_SELECT_ISSUEDTO_COLUMN)) { - LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_ISSUEDBY_COLUMN)) { - LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_INTENDEDUSE_COLUMN)) { - LoadStringW(hInstance, IDS_INTENDED_USE_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_INTENDED_USE_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_FRIENDLYNAME_COLUMN)) { - LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_EXPIRATION_COLUMN)) { - LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_LOCATION_COLUMN)) { - LoadStringW(hInstance, IDS_LOCATION_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_LOCATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } } @@ -7149,11 +7149,9 @@ static void add_cert_to_list(HWND lv, PCCERT_CONTEXT cert, DWORD flags, DWORD *a } if (!(flags & CRYPTUI_SELECT_EXPIRATION_COLUMN)) { - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(&cert->pCertInfo->NotAfter, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, buf, - sizeof(buf) / sizeof(buf[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, buf, ARRAY_SIZE(buf)); item.pszText = buf; if (!item.iSubItem) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); @@ -7167,7 +7165,7 @@ static void add_cert_to_list(HWND lv, PCCERT_CONTEXT cert, DWORD flags, DWORD *a static int show_fixme; if (!show_fixme++) FIXME("showing location is not implemented\n"); - LoadStringW(hInstance, IDS_NO_IMPL, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_NO_IMPL, buf, ARRAY_SIZE(buf)); if (!item.iSubItem) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); else @@ -7373,10 +7371,9 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA { WCHAR buf[40], title[40]; - LoadStringW(hInstance, IDS_SELECT_CERT, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SELECT_CERT, buf, ARRAY_SIZE(buf)); if (!data->title) - LoadStringW(hInstance, IDS_SELECT_CERT_TITLE, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_SELECT_CERT_TITLE, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, buf, data->title ? data->title : title, MB_OK | MB_ICONWARNING); break; }

1 0

Michael Stefaniuc : winegstreamer: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: b618a6c6a73deb78fa4d823b805fe03b99621cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b618a6c6a73deb78fa4d823b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 5 21:56:21 2018 +0100 winegstreamer: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/winegstreamer/main.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 833464b..0d9ab8d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -794,12 +794,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); - MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); + MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, ARRAY_SIZE(piOutput.achName) - 1); TRACE("Name: %s\n", name); strcpy(my_name, "qz_sink_"); strcat(my_name, name); g_free(name); - piOutput.achName[sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1] = 0; + piOutput.achName[ARRAY_SIZE(piOutput.achName) - 1] = 0; caps = gst_pad_query_caps(pad, NULL); caps = gst_caps_make_writable(caps); @@ -1259,7 +1259,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index dc988cf..b9cddcb 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -223,7 +223,7 @@ FactoryTemplate const g_Templates[] = { }, }; -const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]); +const int g_cTemplates = ARRAY_SIZE(g_Templates); BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -323,7 +323,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_ID(MEDIATYPE_Stream); INF_SET_ID(WINESUBTYPE_Gstreamer); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { + for(i = 0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = HeapAlloc(GetProcessHeap(),0,39); sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], @@ -331,7 +331,7 @@ static HRESULT register_server(BOOL do_register) clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); } - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); @@ -339,7 +339,7 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + for(i = 0; i < ARRAY_SIZE(pse); i++) HeapFree(GetProcessHeap(),0,pse[i].pszValue); if(FAILED(hres)) {

1 0

Fabian Maurer : msi: In dialogs show titlebar buttons.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 84e6b331918d57f39e20a3063b67eb7fc0876288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e6b331918d57f39e20a306… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 3 18:05:28 2018 +0100 msi: In dialogs show titlebar buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6184da8..a3797c2 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3858,6 +3858,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_COMMAND: return msi_dialog_oncommand( dialog, wParam, (HWND)lParam ); + case WM_CLOSE: + /* Simulate escape press */ + return msi_dialog_oncommand(dialog, 2, NULL); + case WM_ACTIVATE: if( LOWORD(wParam) == WA_INACTIVE ) dialog->hWndFocus = GetFocus(); @@ -3903,10 +3907,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - style = WS_OVERLAPPED; + style = WS_OVERLAPPED | WS_SYSMENU; if( dialog->attributes & msidbDialogAttributesVisible ) style |= WS_VISIBLE; + if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) + style |= WS_MINIMIZEBOX; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog );

1 0

Pierre Schweitzer : msi: Don' t consider read-only drives when enumerating volumes.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 0dd0d879a1c487dcefedd44762d4ea0fcebd98fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd0d879a1c487dcefedd447… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Nov 3 18:33:16 2018 +0100 msi: Don't consider read-only drives when enumerating volumes. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a3797c2..b6de1f5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3289,7 +3289,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; - DWORD size; + DWORD size, flags; int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3306,6 +3306,13 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { + if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && + flags & FILE_READ_ONLY_VOLUME) + { + ptr += lstrlenW(ptr) + 1; + continue; + } + lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0;

1 0

Dmitry Timoshkov : crypt32: Directly call I_CryptGetDefaultCryptProv to make hooking from a 3rd party CSP work.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 41e0a38f7cdb9460930e63cad0cb402a20e196f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e0a38f7cdb9460930e63ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 2 17:06:57 2018 +0300 crypt32: Directly call I_CryptGetDefaultCryptProv to make hooking from a 3rd party CSP work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/main.c | 2 +- dlls/crypt32/msg.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a7a2605..c44e4bc 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2169,7 +2169,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_SHA1; if (ret) @@ -2198,7 +2198,7 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, dwCertEncodingType, pInfo, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_MD5; if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) @@ -2250,7 +2250,7 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, HCRYPTHASH hHash; if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, info->SignatureAlgorithm.pszObjId, 0); if (!oidInfo) @@ -2299,7 +2299,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, if (info->dwGroupId == CRYPT_HASH_ALG_OID_GROUP_ID) { if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash); if (ret) { @@ -2423,7 +2423,7 @@ static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEnco pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index e58db98..c6e2012 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -149,7 +149,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, /* Returns a handle to the default crypto provider; loads it if necessary. * Returns NULL on failure. */ -HCRYPTPROV CRYPT_GetDefaultProvider(void) DECLSPEC_HIDDEN; +HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD); HINSTANCE hInstance DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93fb91..d37bf4a 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) return TRUE; } -HCRYPTPROV CRYPT_GetDefaultProvider(void) +static HCRYPTPROV CRYPT_GetDefaultProvider(void) { if (!hDefProv) { diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 005fbf2..f37c462 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,7 +567,7 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CHashEncodeMsg)); @@ -1956,7 +1956,7 @@ static HCRYPTMSG CEnvelopedEncodeMsg_Open(DWORD dwFlags, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CEnvelopedEncodeMsg)); @@ -3545,7 +3545,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = hCryptProv; else { - msg->crypt_prov = CRYPT_GetDefaultProvider(); + msg->crypt_prov = I_CryptGetDefaultCryptProv(0); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } memset(&msg->u, 0, sizeof(msg->u));

1 0

Dmitry Timoshkov : crypt32: Add support for 3rd party CSPs to CertGetPublicKeyLength.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 99a2514fdaa335271cf806c355e2ca41031f5f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a2514fdaa335271cf806c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 2 17:07:03 2018 +0300 crypt32: Add support for 3rd party CSPs to CertGetPublicKeyLength. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c44e4bc..faf70de 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1317,9 +1317,30 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, } else { + PCCRYPT_OID_INFO info; DWORD size; PBYTE buf; - BOOL ret = CryptDecodeObjectEx(dwCertEncodingType, + BOOL ret; + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, pPublicKey->Algorithm.pszObjId, 0); + if (info) + { + HCRYPTKEY key; + + TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); + + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + if (ret) + { + size = sizeof(len); + ret = CryptGetKeyParam(key, KP_KEYLEN, (BYTE *)&len, &size, 0); + CryptDestroyKey(key); + return len; + } + /* fallback to RSA */ + } + + ret = CryptDecodeObjectEx(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pPublicKey->PublicKey.pbData, pPublicKey->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size);

1 0