February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Build with msvcrt.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 8abcae547501809d1cbf01b14669707c0bd66714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abcae547501809d1cbf01b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 19 20:34:59 2021 -0600 winegstreamer: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 ++ dlls/winegstreamer/audioconvert.c | 3 --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 7 +++---- dlls/winegstreamer/main.c | 2 +- dlls/winegstreamer/media_source.c | 6 +----- dlls/winegstreamer/mfplat.c | 3 --- dlls/winegstreamer/wg_parser.c | 4 ++++ 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index debdae2d4bb..996818fa457 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -5,6 +5,8 @@ EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audioconvert.c \ filter.c \ diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index f4e841fe3e4..3b6571ab60d 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include "mfapi.h" diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d2f6fee8971..ef84d611a09 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -25,9 +25,6 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> -#include <gst/gst.h> -#include <gst/video/video.h> -#include <gst/audio/audio.h> #define COBJMACROS #define NONAMELESSSTRUCT diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 910abada48c..84e6bcd61e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -20,17 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "gst_private.h" #include "gst_guids.h" #include "vfwmsgs.h" #include "amvideo.h" -#include "wine/unicode.h" #include "wine/debug.h" #include <assert.h> +#include <limits.h> #include "dvdmedia.h" #include "mmreg.h" @@ -1016,7 +1015,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1677,7 +1676,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ee9f57b6c57..6f3be9095d6 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -19,9 +19,9 @@ */ #include "gst_private.h" +#include "winternl.h" #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "initguid.h" #include "gst_guids.h" diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 32b4477ad88..e69370d2513 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> @@ -1083,7 +1079,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ { IMFStreamDescriptor **descriptors = NULL; struct media_source *object; - gint64 total_pres_time = 0; + UINT64 total_pres_time = 0; struct wg_parser *parser; DWORD bytestream_caps; uint64_t file_size; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 8891facdffe..439fc2ee5ed 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 257da2538af..a7b3e6348cf 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -29,7 +29,11 @@ #define WIN32_NO_STATUS #include "gst_private.h" #include "winternl.h" + #include <assert.h> +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);

1 0

Henri Verbeet : wined3d: Introduce a backup path for swapchain presents using GDI.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 70418f69dd49da5625bb1893d9fc2bef3fe97b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70418f69dd49da5625bb1893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 21:31:11 2021 +0100 wined3d: Introduce a backup path for swapchain presents using GDI. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5fae34c8af5..a027a7cffb1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -400,6 +400,73 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s return WINED3D_OK; } +/* The is a fallback for cases where we e.g. can't create a GL context or + * Vulkan swapchain for the swapchain window. */ +static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) +{ + struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + D3DKMT_CREATEDCFROMMEMORY create_desc; + const struct wined3d_format *format; + unsigned int row_pitch, slice_pitch; + HDC src_dc, dst_dc; + NTSTATUS status; + HBITMAP bitmap; + + static unsigned int once; + + TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", + swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); + + if (!once++) + FIXME("Using GDI present.\n"); + + format = back_buffer->resource.format; + if (!format->ddi_format) + { + WARN("Cannot create a DC for format %s.\n", debug_d3dformat(format->id)); + return; + } + + wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_pitch(back_buffer, 0, &row_pitch, &slice_pitch); + + create_desc.pMemory = back_buffer->resource.heap_memory; + create_desc.Format = format->ddi_format; + create_desc.Width = wined3d_texture_get_level_width(back_buffer, 0); + create_desc.Height = wined3d_texture_get_level_height(back_buffer, 0); + create_desc.Pitch = row_pitch; + create_desc.hDeviceDc = CreateCompatibleDC(NULL); + create_desc.pColorTable = NULL; + + status = D3DKMTCreateDCFromMemory(&create_desc); + DeleteDC(create_desc.hDeviceDc); + if (status) + { + WARN("Failed to create DC, status %#x.\n", status); + return; + } + + src_dc = create_desc.hDc; + bitmap = create_desc.hBitmap; + + TRACE("Created source DC %p, bitmap %p for backbuffer %p.\n", src_dc, bitmap, back_buffer); + + if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + ERR("Failed to get destination DC.\n"); + + if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + ERR("Failed to blit.\n"); + + ReleaseDC(swapchain->win_handle, dst_dc); + destroy_desc.hDc = src_dc; + destroy_desc.hBitmap = bitmap; + if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) + ERR("Failed to destroy src dc, status %#x.\n", status); +} + /* A GL context is provided by the caller */ static void swapchain_blit(const struct wined3d_swapchain *swapchain, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) @@ -523,6 +590,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); + if (context_gl->dc == swapchain_gl->backup_dc) + swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); + if (!(render_to_fbo = swapchain->render_to_fbo) && (src_rect->left || src_rect->top || src_rect->right != desc->backbuffer_width @@ -1152,6 +1222,8 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain_vk->vk_swapchain) wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval); + else + swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); wined3d_swapchain_vk_rotate(swapchain, context_vk);

1 0

Hugh McMaster : reg/tests: Check for key non-existence with verify_key_nonexist().
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 597a12420be2bee4e69b9400a075ae4393863573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=597a12420be2bee4e69b9400… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:29:59 2021 +1100 reg/tests: Check for key non-existence with verify_key_nonexist(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 489989f12a8..429de8164e6 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -249,13 +249,11 @@ static void test_add(void) /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); + verify_key_nonexist(hkey, "keytest0"); run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); + verify_key_nonexist(hkey, "keytest1"); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),

1 0

Hugh McMaster : reg/tests: Ensure test key is fully removed before each sequence begins.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 405853adb53695c0fd3f7d38ac733dd6900a48dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=405853adb53695c0fd3f7d38… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:29:57 2021 +1100 reg/tests: Ensure test key is fully removed before each sequence begins. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4be9e635ed7..e11e4e9227e 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -222,6 +222,9 @@ static void test_add(void) DWORD r, dword, type, size; char buffer[22]; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -234,11 +237,6 @@ static void test_add(void) run_reg_exe("reg add -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); - - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -602,12 +600,11 @@ static void test_add(void) static void test_delete(void) { HKEY hkey, hsubkey; - LONG err; DWORD r; const DWORD deadbeef = 0xdeadbeef; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -664,8 +661,8 @@ static void test_query(void) const DWORD dword1 = 0x123; const DWORD dword2 = 0xabc; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -858,8 +855,8 @@ static void test_import(void) LONG err; BYTE hex[8]; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -2387,8 +2384,8 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -3910,8 +3907,8 @@ static void test_import_with_whitespace(void) DWORD r, dword; LONG err; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -4058,8 +4055,8 @@ static void test_unicode_import_with_whitespace(void) DWORD r, dword; LONG err; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -4453,8 +4450,8 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg export", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4691,6 +4688,9 @@ static void test_copy(void) { DWORD r; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + run_reg_exe("reg copy", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg/tests: Always overwrite export test file during 'export' sequence.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: b51b969a011c3efbddbbf29a312e49d0b5877faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51b969a011c3efbddbbf29a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:00 2021 +1100 reg/tests: Always overwrite export test file during 'export' sequence. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 429de8164e6..2afa5eb01fa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4511,7 +4511,7 @@ static void test_export(void) add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); add_value(hkey, "String", REG_SZ, "Your text here...", 18); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); @@ -4549,7 +4549,7 @@ static void test_export(void) RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); @@ -4563,7 +4563,7 @@ static void test_export(void) add_key(hkey, "Subkey1", &subkey); RegCloseKey(subkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); @@ -4578,7 +4578,7 @@ static void test_export(void) RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); @@ -4596,7 +4596,7 @@ static void test_export(void) add_value(hkey, "Wine1h", 0xabcd, NULL, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); @@ -4614,7 +4614,7 @@ static void test_export(void) verify_reg(hkey, "Wine2c", REG_DWORD, NULL, 0, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); @@ -4633,7 +4633,7 @@ static void test_export(void) verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); @@ -4671,7 +4671,7 @@ static void test_export(void) verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n");

1 0

Hugh McMaster : reg/tests: Verify registry export after each empty key test.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 5cacd496a14b8f83c8e0209bb00bf2ea4ce90e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cacd496a14b8f83c8e0209b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:01 2021 +1100 reg/tests: Verify registry export after each empty key test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2afa5eb01fa..9dd3a2afe81 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4493,6 +4493,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4503,7 +4504,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE), /* winxp */ "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); /* Test registry export with a simple data structure */

1 0

Hugh McMaster : reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: add814af3eb7368961fe5b37a66c616e4bd97e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=add814af3eb7368961fe5b37… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:29:56 2021 +1100 reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index afba8424c1a..4be9e635ed7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4204,14 +4204,11 @@ static void test_import_31(void) { LONG err; HKEY hkey; - DWORD r; - - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + DWORD dispos, r; /* Check if reg.exe is running with elevated privileges */ err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (err == ERROR_ACCESS_DENIED) { win_skip("reg.exe is not running with elevated privileges; " @@ -4219,6 +4216,9 @@ static void test_import_31(void) return; } + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); + /* Test simple value */ test_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r);

1 0

Hugh McMaster : reg/tests: Replace RegCloseKey() with the helper function close_key().
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 93fbe09ed098f6356485c6390a533e04f6ff3959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93fbe09ed098f6356485c639… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:02 2021 +1100 reg/tests: Replace RegCloseKey() with the helper function close_key(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 92 ++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93fbe09ed098f6356485…

1 0

Hugh McMaster : reg/tests: Move /v* syntax tests to the 'add' and 'delete' test sequences.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: e6e227f21de08c7ddfe3e48b3ceb2fef01b6c0a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6e227f21de08c7ddfe3e48b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:29:58 2021 +1100 reg/tests: Move /v* syntax tests to the 'add' and 'delete' test sequences. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 73 +++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e11e4e9227e..489989f12a8 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -574,6 +574,9 @@ static void test_add(void) RegCloseKey(hkey); /* Test duplicate switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup1 /t REG_DWORD /d 123 /f /t REG_SZ", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); @@ -581,6 +584,17 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + /* Multiple /v* switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Test invalid switches */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); @@ -618,6 +632,27 @@ static void test_delete(void) run_reg_exe("reg delete -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Multiple /v* switches */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); @@ -757,43 +792,6 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } -static void test_v_flags(void) -{ - DWORD r; - - run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* No /v argument */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* Multiple /v switches */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -} - static BOOL write_file(const void *str, DWORD size) { HANDLE file; @@ -4772,7 +4770,6 @@ START_TEST(reg) test_add(); test_delete(); test_query(); - test_v_flags(); test_import(); test_unicode_import(); test_import_with_whitespace();

1 0

Gerald Pfeifer : iphlpapi: Include <netinet/in.h> in ifenum.c.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 9e69aca6d15477070d55583fac23026f64416959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e69aca6d15477070d55583f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 21 14:05:46 2021 +0100 iphlpapi: Include <netinet/in.h> in ifenum.c. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 288e04db7b8..2e99ebe03fd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -67,6 +67,10 @@ #include <net/if_types.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_IFADDRS_H #include <ifaddrs.h> #endif

1 0