September 2017 - Wine-commits

Anton Romanov : secur32: Fix race between schan_(Encrypt|Decrypt)Message.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 3c40ffbfad793af11225cbb55f08b88278a9816a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c40ffbfad793af11225cbb55… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Sep 15 22:40:02 2017 -0700 secur32: Fix race between schan_(Encrypt|Decrypt)Message. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 82374ef..88b6521 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -57,6 +57,7 @@ struct schan_handle struct schan_context { schan_imp_session session; + struct schan_transport transport; ULONG req_ctx_attr; const CERT_CONTEXT *cert; }; @@ -789,7 +790,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_context *ctx; struct schan_buffers *out_buffers; struct schan_credentials *cred; - struct schan_transport transport; SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; @@ -833,6 +833,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } + ctx->transport.ctx = ctx; + schan_imp_set_session_transport(ctx->session, &ctx->transport); + if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); @@ -891,24 +894,22 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; - transport.ctx = ctx; - init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); - transport.in.limit = expected_size; - init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); + ctx->transport.in.limit = expected_size; + init_schan_buffers(&ctx->transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); /* Perform the TLS handshake */ ret = schan_imp_handshake(ctx->session); - if(transport.in.offset && transport.in.offset != pInput->pBuffers[0].cbBuffer) { + if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) return SEC_E_INVALID_TOKEN; pInput->pBuffers[1].BufferType = SECBUFFER_EXTRA; - pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-transport.in.offset; + pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - out_buffers = &transport.out; + out_buffers = &ctx->transport.out; if (out_buffers->current_buffer_idx != -1) { SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; @@ -1205,7 +1206,6 @@ static int schan_encrypt_message_get_next_buffer_token(const struct schan_transp static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle, ULONG quality, PSecBufferDesc message, ULONG message_seq_no) { - struct schan_transport transport; struct schan_context *ctx; struct schan_buffers *b; SECURITY_STATUS status; @@ -1235,13 +1235,10 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle data = HeapAlloc(GetProcessHeap(), 0, data_size); memcpy(data, buffer->pvBuffer, data_size); - transport.ctx = ctx; - init_schan_buffers(&transport.in, NULL, NULL); if (schan_find_sec_buffer_idx(message, 0, SECBUFFER_STREAM_HEADER) != -1) - init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer); + init_schan_buffers(&ctx->transport.out, message, schan_encrypt_message_get_next_buffer); else - init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer_token); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.out, message, schan_encrypt_message_get_next_buffer_token); length = data_size; status = schan_imp_send(ctx->session, data, &length); @@ -1251,7 +1248,7 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle if (length != data_size) status = SEC_E_INTERNAL_ERROR; - b = &transport.out; + b = &ctx->transport.out; b->desc->pBuffers[b->current_buffer_idx].cbBuffer = b->offset; HeapFree(GetProcessHeap(), 0, data); @@ -1327,7 +1324,6 @@ static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { - struct schan_transport transport; struct schan_context *ctx; SecBuffer *buffer; SIZE_T data_size; @@ -1371,11 +1367,8 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle data_size = expected_size - 5; data = HeapAlloc(GetProcessHeap(), 0, data_size); - transport.ctx = ctx; - init_schan_buffers(&transport.in, message, schan_decrypt_message_get_next_buffer); - transport.in.limit = expected_size; - init_schan_buffers(&transport.out, NULL, NULL); - schan_imp_set_session_transport(ctx->session, &transport); + init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); + ctx->transport.in.limit = expected_size; while (received < data_size) {

1 0

Anton Romanov : secur32: Protect SSLRead/Write with cs on OSX.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 1dbf6c8f54c17e50852470caf88febb816aad4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbf6c8f54c17e50852470caf… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Sep 15 22:40:03 2017 -0700 secur32: Protect SSLRead/Write with cs on OSX. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 7f38133..015de92 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -185,6 +185,7 @@ enum { struct mac_session { SSLContextRef context; struct schan_transport *transport; + CRITICAL_SECTION cs; }; @@ -742,6 +743,9 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre if (!s) return FALSE; + InitializeCriticalSection(&s->cs); + s->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": mac_session.cs"); + status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { @@ -803,6 +807,7 @@ void schan_imp_dispose_session(schan_imp_session session) status = SSLDisposeContext(s->context); if (status != noErr) ERR("Failed to dispose of session context: %d\n", status); + DeleteCriticalSection(&s->cs); HeapFree(GetProcessHeap(), 0, s); } @@ -1090,7 +1095,9 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); + EnterCriticalSection(&s->cs); status = SSLWrite(s->context, buffer, *length, length); + LeaveCriticalSection(&s->cs); if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1120,7 +1127,9 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); + EnterCriticalSection(&s->cs); status = SSLRead(s->context, buffer, *length, length); + LeaveCriticalSection(&s->cs); if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock)

1 0

Zebediah Figura : ieframe: Add stub implementation of InternetExplorerManager.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 1bee19a3f67508d76257a680418f74620cd06598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bee19a3f67508d76257a6804… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 11:33:19 2017 -0500 ieframe: Add stub implementation of InternetExplorerManager. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 5 +- dlls/ieframe/ieframe_main.c | 35 ++++-------- dlls/ieframe/iexplore.c | 117 ++++++++++++++++++++++++++++++++++++++--- dlls/ieframe/tests/ie.c | 24 +++++++++ programs/iexplore/iexplore.inf | 3 ++ 5 files changed, 151 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bee19a3f67508d76257a…

1 0

Fabian Maurer : strmiids: Add evr interface GUIDS.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 8fef79d48b4efeae020887364a1fcd3c6da3ca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fef79d48b4efeae020887364… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 18 18:24:12 2017 +0200 strmiids: Add evr interface GUIDS. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmiids/Makefile.in | 1 + dlls/strmiids/evr.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index baf7019..09edc70 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,5 @@ MODULE = libstrmiids.a C_SRCS = \ + evr.c \ strmiids.c diff --git a/dlls/strmiids/evr.c b/dlls/strmiids/evr.c new file mode 100644 index 0000000..74ec145 --- /dev/null +++ b/dlls/strmiids/evr.c @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "propidl.h" +#include "mfidl.h" + +#include "initguid.h" + +#include "evr.h"

1 0

Andrey Gusev : api-ms-win-mm-joystick-l1-1-0: Add dll.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 302153117e20b62c9170aed62aa33e83cacfaf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302153117e20b62c9170aed62… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Sep 17 20:48:47 2017 +0300 api-ms-win-mm-joystick-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-mm-joystick-l1-1-0/Makefile.in | 1 + .../api-ms-win-mm-joystick-l1-1-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 90fde59..6643778 100755 --- a/configure +++ b/configure @@ -1031,6 +1031,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_legacy_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 +enable_api_ms_win_mm_joystick_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 @@ -18094,6 +18095,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-legacy-l1-1-0 enable_api_ms_win_eventing_legacy_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-mm-joystick-l1-1-0 enable_api_ms_win_mm_joystick_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 diff --git a/configure.ac b/configure.ac index f01162b..f5a617c 100644 --- a/configure.ac +++ b/configure.ac @@ -2884,6 +2884,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-mm-joystick-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) diff --git a/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in new file mode 100644 index 0000000..0da1efb --- /dev/null +++ b/dlls/api-ms-win-mm-joystick-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-joystick-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec b/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec new file mode 100644 index 0000000..f9748d5 --- /dev/null +++ b/dlls/api-ms-win-mm-joystick-l1-1-0/api-ms-win-mm-joystick-l1-1-0.spec @@ -0,0 +1,10 @@ +@ stdcall joyConfigChanged(long) winmm.joyConfigChanged +@ stdcall joyGetDevCapsA(long ptr long) winmm.joyGetDevCapsA +@ stdcall joyGetDevCapsW(long ptr long) winmm.joyGetDevCapsW +@ stdcall joyGetNumDevs() winmm.joyGetNumDevs +@ stdcall joyGetPos(long ptr) winmm.joyGetPos +@ stdcall joyGetPosEx(long ptr) winmm.joyGetPosEx +@ stdcall joyGetThreshold(long ptr) winmm.joyGetThreshold +@ stdcall joyReleaseCapture(long) winmm.joyReleaseCapture +@ stdcall joySetCapture(long long long long) winmm.joySetCapture +@ stdcall joySetThreshold(long long) winmm.joySetThreshold diff --git a/tools/make_specfiles b/tools/make_specfiles index 3332313..a49dff9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -342,6 +342,7 @@ my @dll_groups = ], [ "winmm", + "api-ms-win-mm-joystick-l1-1-0", "api-ms-win-mm-misc-l1-1-1", "api-ms-win-mm-mme-l1-1-0", "api-ms-win-mm-time-l1-1-0",

1 0

Dmitry Timoshkov : windowscodecs: Add support for palette image formats to PNG encoder.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 14cca6ee6572441dc6310ffcd72a8ae4aa0e6891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cca6ee6572441dc6310ffcd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 15 11:12:08 2017 -0500 windowscodecs: Add support for palette image formats to PNG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9e837ca..1ab2c85 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -325,8 +326,10 @@ MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_interlace_handling); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); +MAKE_FUNCPTR(png_set_PLTE); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); +MAKE_FUNCPTR(png_set_tRNS); MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); @@ -389,8 +392,10 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_interlace_handling); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); + LOAD_FUNCPTR(png_set_PLTE); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); + LOAD_FUNCPTR(png_set_tRNS); LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_set_write_fn); LOAD_FUNCPTR(png_read_end); @@ -1349,6 +1354,10 @@ static const struct png_pixelformat formats[] = { {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, + {&GUID_WICPixelFormat1bppIndexed, 1, 1, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 2, 2, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 4, 4, PNG_COLOR_TYPE_PALETTE, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 8, 8, PNG_COLOR_TYPE_PALETTE, 0, 0}, {NULL}, }; @@ -1651,6 +1660,33 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, (This->yres+0.0127) / 0.0254, PNG_RESOLUTION_METER); } + if (This->format->color_type == PNG_COLOR_TYPE_PALETTE && This->colors) + { + png_color png_palette[256]; + png_byte trans[256]; + UINT i, num_trans = 0, colors; + + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + colors = min(This->colors, 1 << This->format->bit_depth); + + for (i = 0; i < colors; i++) + { + png_palette[i].red = (This->palette[i] >> 16) & 0xff; + png_palette[i].green = (This->palette[i] >> 8) & 0xff; + png_palette[i].blue = This->palette[i] & 0xff; + trans[i] = (This->palette[i] >> 24) & 0xff; + if (trans[i] != 0xff) + num_trans = i+1; + } + + ppng_set_PLTE(This->png_ptr, This->info_ptr, png_palette, colors); + + if (num_trans) + ppng_set_tRNS(This->png_ptr, This->info_ptr, trans, num_trans, NULL); + } + ppng_write_info(This->png_ptr, This->info_ptr); if (This->format->remove_filler) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 10a6c03..b011d71 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1359,6 +1359,10 @@ static GUID const * const png_encode_formats[] = { &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL };

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for encoding 1bpp/ 8bpp images with a palette.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 7f525fbe43f1c85b6c6fd0d68d0c7311c6c9576e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f525fbe43f1c85b6c6fd0d68… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 15 11:12:09 2017 -0500 windowscodecs/tests: Add some tests for encoding 1bpp/8bpp images with a palette. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 359 +++++++++++++++++++++++++++++++++-- 1 file changed, 340 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f525fbe43f1c85b6c6fd…

1 0

Zebediah Figura : msi: Don' t execute a deferred custom action when not running the install script.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bc556f9fd4a964cbaa66bc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 17 23:08:01 2017 -0500 msi: Don't execute a deferred custom action when not running the install script. 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/custom.c | 1 + dlls/msi/tests/install.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 922927e..636f77f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1144,6 +1144,7 @@ static BOOL action_type_matches_script( UINT type, UINT script ) switch (script) { case SCRIPT_NONE: + return FALSE; case SCRIPT_INSTALL: return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); case SCRIPT_COMMIT: diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index dd3e6a3..e429039 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1285,6 +1285,27 @@ static const char ft_install_exec_seq_dat[] = "PublishProduct\t\t1400\n" "InstallFinalize\t\t1500\n"; +static const char da_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "deferred\t1074\tCMDEXE\t/c if exist msitest (exit 0) else (exit 1)\t\n" + "immediate\t50\tCMDEXE\t/c mkdir msitest\t\n" + "cleanup\t50\tCMDEXE\t/c rmdir msitest\t\n"; + +static const char da_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallInitialize\t\t500\n" + "deferred\t\t600\n" + "immediate\t\t700\n" + "InstallFinalize\t\t1100\n" + "cleanup\t\t1200\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1939,6 +1960,19 @@ static const msi_table ft_tables[] = ADD_TABLE(property) }; +static const msi_table da_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(da_install_exec_seq), + ADD_TABLE(da_custom_action), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6046,6 +6080,26 @@ static void test_feature_tree(void) DeleteFileA( msifile ); } +static void test_deferred_action(void) +{ + UINT r; + + create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "CMDEXE=\"cmd.exe\""); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + +error: + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6134,6 +6188,7 @@ START_TEST(install) test_shared_component(); test_remove_upgrade_code(); test_feature_tree(); + test_deferred_action(); DeleteFileA(log_file);

1 0

Stefan Dösinger : include: CHOOSECOLOR.lCustData is an LPARAM.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: cd67446d8f43efb84ea8a32aa829047f84514168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd67446d8f43efb84ea8a32aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 17 10:48:14 2017 +0200 include: CHOOSECOLOR.lCustData is an LPARAM. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commdlg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index df56c14..c059b19 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -180,10 +180,10 @@ typedef struct { DWORD lStructSize; HWND hwndOwner; HWND hInstance; /* Should be an HINSTANCE but MS made a typo */ - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF *lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCSTR lpTemplateName; } CHOOSECOLORA; @@ -193,10 +193,10 @@ typedef struct { DWORD lStructSize; HWND hwndOwner; HWND hInstance; /* Should be an HINSTANCE but MS made a typo */ - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF *lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCWSTR lpTemplateName; } CHOOSECOLORW;

1 0

Nikolay Sivov : shell32: Implement Parent() property for ShellDispatch objects.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 58b73fa075f5c842e56adc3b8cd5ec6d50cebd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b73fa075f5c842e56adc3b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:39:41 2017 +0300 shell32: Implement Parent() property for ShellDispatch objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 47 ++++++++++++++++++++++++++------------ dlls/shell32/tests/shelldispatch.c | 36 ++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index ee6f340..c489eb6 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -298,7 +298,10 @@ static HRESULT WINAPI FolderItemVerbImpl_get_Application(FolderItemVerb *iface, static HRESULT WINAPI FolderItemVerbImpl_get_Parent(FolderItemVerb *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -477,7 +480,10 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Application(FolderItemVerbs *iface static HRESULT WINAPI FolderItemVerbsImpl_get_Parent(FolderItemVerbs *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -718,13 +724,19 @@ static HRESULT WINAPI FolderItemImpl_get_Application(FolderItem2 *iface, IDispat return Folder3_get_Application(&This->folder->Folder3_iface, disp); } -static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, - IDispatch **ppid) +static HRESULT WINAPI FolderItemImpl_get_Parent(FolderItem2 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + FolderItemImpl *This = impl_from_FolderItem(iface); - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, disp); + + if (disp) + { + *disp = (IDispatch *)&This->folder->Folder3_iface; + IDispatch_AddRef(*disp); + } + + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_Name(FolderItem2 *iface, BSTR *pbs) @@ -1429,11 +1441,12 @@ static HRESULT WINAPI FolderImpl_get_Application(Folder3 *iface, IDispatch **dis return S_OK; } -static HRESULT WINAPI FolderImpl_get_Parent(Folder3 *iface, IDispatch **ppid) +static HRESULT WINAPI FolderImpl_get_Parent(Folder3 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, disp); - *ppid = NULL; + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -1760,13 +1773,17 @@ static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, - IDispatch **ppid) +static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, disp); - *ppid = NULL; - return E_NOTIMPL; + if (disp) + { + *disp = (IDispatch *)iface; + IDispatch_AddRef(*disp); + } + + return S_OK; } static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index eb8a8c7..fa7e8dc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -124,11 +124,18 @@ static void test_namespace(void) FolderItem *item; VARIANT var; BSTR title, item_path; + IDispatch *disp; int len, i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void **)&sd); ok(SUCCEEDED(r), "Failed to create ShellDispatch object: %#x.\n", r); + disp = NULL; + r = IShellDispatch_get_Parent(sd, &disp); + ok(r == S_OK, "Failed to get Shell object parent, hr %#x.\n", r); + ok(disp == (IDispatch *)sd, "Unexpected parent pointer %p.\n", disp); + IDispatch_Release(disp); + VariantInit(&var); folder = (void*)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); @@ -266,6 +273,11 @@ todo_wine { r = IShellDispatch_NameSpace(sd, var, &folder); ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + disp = (void *)0xdeadbeef; + r = Folder_get_Parent(folder, &disp); + ok(r == E_NOTIMPL, "Unexpected hr %#x.\n", r); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + r = Folder_get_Title(folder, &title); ok(r == S_OK, "Failed to get folder title: %#x.\n", r); ok(!lstrcmpW(title, winetestW), "Unexpected title: %s\n", wine_dbgstr_w(title)); @@ -480,6 +492,17 @@ static void test_items(void) r = FolderItems_Item(items, var, &item); ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); ok(!!item, "item is null\n"); + + disp = (void *)0xdeadbeef; + r = FolderItems_get_Parent(items, &disp); + ok(r == E_NOTIMPL, "Unexpected hr %#x.\n", r); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + + r = FolderItem_get_Parent(item, &disp); + ok(r == S_OK, "Failed to get parent pointer, hr %#x.\n", r); + ok(disp == (IDispatch *)folder, "Unexpected parent pointer %p.\n", disp); + IDispatch_Release(disp); + if (item) FolderItem_Release(item); VariantClear(&var); @@ -1209,6 +1232,7 @@ static void test_Verbs(void) IShellDispatch *sd; FolderItem *item; Folder2 *folder2; + IDispatch *disp; Folder *folder; HRESULT hr; LONG count, i; @@ -1241,6 +1265,11 @@ if (0) { /* crashes on some systems */ hr = FolderItem_Verbs(item, &verbs); ok(hr == S_OK, "got 0x%08x\n", hr); + disp = (void *)0xdeadbeef; + hr = FolderItemVerbs_get_Parent(verbs, &disp); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + if (0) { /* crashes on winxp/win2k3 */ hr = FolderItemVerbs_get_Count(verbs, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1267,7 +1296,12 @@ if (0) { /* crashes on winxp/win2k3 */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "%d: name %s\n", i, wine_dbgstr_w(str)); if (i == count) - ok(str[0] == 0, "%d: got teminating item %s\n", i, wine_dbgstr_w(str)); + ok(str[0] == 0, "%d: got terminating item %s\n", i, wine_dbgstr_w(str)); + + disp = (void *)0xdeadbeef; + hr = FolderItemVerb_get_Parent(verb, &disp); + ok(hr == E_NOTIMPL, "got %#x.\n", hr); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); SysFreeString(str); FolderItemVerb_Release(verb);

1 0