February 2022 - Wine-Commits

Alexandre Julliard : sfc: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 2abcdf08033334075a22e65b97a7f8874361e72a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abcdf08033334075a22e65b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:54 2022 +0100 sfc: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/Makefile.in | 3 +-- dlls/sfc/sfc.spec | 20 +++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 3a557a4b6f2..1c8fe4f9b8c 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -1,5 +1,4 @@ MODULE = sfc.dll IMPORTLIB = sfc -IMPORTS = sfc_os -EXTRADLLFLAGS = -Wb,--prefer-native +EXTRADLLFLAGS = -Wb,--data-only -Wb,--prefer-native diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 77a82739a5c..7509c98b666 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -1,18 +1,16 @@ -1 stub @ # sfc_os.SfcInitProt -2 stub @ # sfc_os.SfcTerminateWatcherThread +1 stdcall @() sfc_os.SfcInitProt +2 stdcall @() sfc_os.SfcTerminateWatcherThread 3 stdcall @(long) sfc_os.SfcConnectToServer -4 stub @ # sfc_os.SfcClose -5 stub @ # sfc_os.SfcFileException -6 stub @ # sfc_os.SfcInitiateScan -7 stub @ # sfc_os.SfcInstallProtectedFiles -8 stub @ # sfc_os.SfpInstallCatalog -9 stub @ # SfpDeleteCatalog +4 stdcall @() sfc_os.SfcClose +5 stdcall @() sfc_os.SfcFileException +6 stdcall @() sfc_os.SfcInitiateScan +7 stdcall @() sfc_os.SfcInstallProtectedFiles +8 stdcall @() sfc_os.SfpInstallCatalog +9 stdcall @() sfc_os.SfpDeleteCatalog @ stdcall SRSetRestorePoint(ptr ptr) sfc_os.SRSetRestorePointA @ stdcall SRSetRestorePointA(ptr ptr) sfc_os.SRSetRestorePointA @ stdcall SRSetRestorePointW(ptr ptr) sfc_os.SRSetRestorePointW @ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected -@ stub SfcWLEventLogoff -@ stub SfcWLEventLogon -@ stub SfpVerifyFile +@ stdcall SfpVerifyFile() sfc_os.SfpVerifyFile

1 0

Alexandre Julliard : makedep: Add support for winebuild --data-only option.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 1c2e3fc68a0feb6dc0854cc4bbb72d1b024268d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2e3fc68a0feb6dc0854cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:10:08 2022 +0100 makedep: Add support for winebuild --data-only option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index edb5d5a42d0..25277efd7bb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -197,6 +197,7 @@ struct makefile int native_unix_lib; int disabled; int use_msvcrt; + int data_only; int is_cross; int is_win16; int is_exe; @@ -3139,35 +3140,45 @@ static void output_module( struct makefile *make ) struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; struct strarray imports = make->imports; - char *module_name = strmake( "%s%s", make->module, make->is_cross ? "" : dll_ext ); + const char *module_name = make->module; const char *debug_file; const char *delay_load = delay_load_flag; char *spec_file = NULL; unsigned int i; if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) - imports = add_default_imports( make, imports ); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); - - if (!make->use_msvcrt) + if (!make->data_only) { - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); - } + if (*dll_ext && !make->is_cross && !make->data_only) + module_name = strmake( "%s%s", make->module, dll_ext ); - if (!make->is_cross && *dll_ext) delay_load = "-Wl,-delayload,"; - if (delay_load) - { - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load, make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + imports = add_default_imports( make, imports ); + + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); + + if (!make->use_msvcrt) + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } + + if (!make->is_cross && *dll_ext) delay_load = "-Wl,-delayload,"; + if (delay_load) + { + for (i = 0; i < make->delayimports.count; i++) + strarray_add( &all_libs, strmake( "%s%s%s", delay_load, make->delayimports.str[i], + strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + } } strarray_add( &make->all_targets, module_name ); - if (make->is_cross) + if (make->data_only) + add_install_rule( make, make->module, module_name, + strmake( "d%s/%s", *dll_ext ? pe_dir : "$(dlldir)", module_name )); + else if (make->is_cross) add_install_rule( make, make->module, module_name, strmake( "c%s/%s", pe_dir, module_name )); else if (*dll_ext) add_install_rule( make, make->module, module_name, strmake( "p%s/%s", so_dir, module_name )); @@ -3524,7 +3535,7 @@ static void output_programs( struct makefile *make ) output_filenames_obj_dir( make, objs ); output_filenames( deps ); output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CC" )); + output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); output_filenames_obj_dir( make, objs ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); @@ -3713,7 +3724,7 @@ static void output_sources( struct makefile *make ) else if (make->module) { output_module( make ); - if (*dll_ext && !make->is_cross) output_fake_module( make ); + if (*dll_ext && !make->is_cross && !make->data_only) output_fake_module( make ); if (make->unixlib) output_unix_lib( make ); if (make->importlib) output_import_lib( make ); } @@ -4141,6 +4152,7 @@ static void load_sources( struct makefile *make ) make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); + make->data_only = strarray_exists( &make->extradllflags, "-Wb,--data-only" ); make->use_msvcrt = (make->module || make->testdll || make->is_win16) && !strarray_exists( &make->extradllflags, "-mcygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) ||

1 0

Zebediah Figura : wined3d: Allow passing a NULL context to wined3d_device_gl_create_bo().
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 95173d6f6592a3ebd1985277a080f007efcb815c URL: https://source.winehq.org/git/wine.git/?a=commit;h=95173d6f6592a3ebd1985277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:11 2022 -0600 wined3d: Allow passing a NULL context to wined3d_device_gl_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e302e1917a6..9488e8c642e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -961,11 +961,15 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct wined3d_allocator *allocator, struct wined3d_context *context, unsigned int memory_type, size_t chunk_size) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_allocator_chunk_gl *chunk_gl; + struct wined3d_context_gl *context_gl; TRACE("allocator %p, context %p, memory_type %u, chunk_size %zu.\n", allocator, context, memory_type, chunk_size); + if (!context) + return NULL; + context_gl = wined3d_context_gl(context); + if (!(chunk_gl = heap_alloc(sizeof(*chunk_gl)))) return NULL; @@ -1063,12 +1067,13 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { - *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + if (context_gl) + *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); wined3d_device_gl_allocator_unlock(device_gl); return NULL; } - if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) + if (!(block = wined3d_allocator_allocate(allocator, context_gl ? &context_gl->c : NULL, memory_type, size))) { wined3d_device_gl_allocator_unlock(device_gl); *id = 0; @@ -1119,7 +1124,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset; } - else + else if (context_gl) { WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); @@ -1133,6 +1138,9 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win } else { + if (!context_gl) + return false; + GL_EXTCALL(glGenBuffers(1, &id)); if (!id) {

1 0

Dmitry Timoshkov : riched20/tests: Add a test to see what richedit class flavours should be available.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: d54a0e2bea4548bb5d9c0cca9f918d7c46591e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d54a0e2bea4548bb5d9c0cca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 16 10:44:30 2022 +0300 riched20/tests: Add a test to see what richedit class flavours should be available. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f7c00383a..20bf0358712 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8994,6 +8994,38 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %u\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -9003,6 +9035,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE);

1 0

Alexandre Julliard : light.msstyles: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 91db4290caa0bc4f0173e72296852de2d7ad699d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91db4290caa0bc4f0173e722… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:10:54 2022 +0100 light.msstyles: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 265d984bb52..8ac2fcea0e6 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -1,5 +1,7 @@ MODULE = light.msstyles +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = light.rc SVG_SRCS = \

1 0

Alexandre Julliard : wmi: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 141be028802f1675366802d49af01982525c2e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=141be028802f1675366802d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:32 2022 +0100 wmi: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index ac1e2f0f673..de7719654ff 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -1,2 +1,4 @@ MODULE = wmi.dll IMPORTS = advapi32 + +EXTRADLLFLAGS = -Wb,--data-only

1 0

Alexandre Julliard : tzres: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 457c5df7d33144e45e0b275cf3cd060ec8403f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457c5df7d33144e45e0b275c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:20 2022 +0100 tzres: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/tzres/Makefile.in b/dlls/tzres/Makefile.in index 86e5bcdbf7b..8d4710e7b78 100644 --- a/dlls/tzres/Makefile.in +++ b/dlls/tzres/Makefile.in @@ -1,2 +1,5 @@ MODULE = tzres.dll + +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = tzres.rc

1 0

Alexandre Julliard : stdole32.tlb: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 5b7534e55adb59cddb7f0c8a337cc3c3954c8d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7534e55adb59cddb7f0c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:14 2022 +0100 stdole32.tlb: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stdole32.tlb/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in index 6422325b3c7..9fc649ee5a4 100644 --- a/dlls/stdole32.tlb/Makefile.in +++ b/dlls/stdole32.tlb/Makefile.in @@ -1,4 +1,6 @@ MODULE = stdole32.tlb +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = rsrc.rc IDL_SRCS = std_ole_v1.idl

1 0

Alexandre Julliard : lz32: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 2da8b64cfd5ed46f98d1fbfa5d56b680358a7a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da8b64cfd5ed46f98d1fbfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:04 2022 +0100 lz32: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lz32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index adbd4ac91c4..d67f7d70fe8 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -1,4 +1,6 @@ MODULE = lz32.dll IMPORTLIB = lz32 +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = version.rc

1 0

Alexandre Julliard : mferror: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 3584dd2900fbd3a11175d1b3f77a55315442c284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3584dd2900fbd3a11175d1b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:12 2022 +0100 mferror: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mferror/Makefile.in b/dlls/mferror/Makefile.in index 25cbdf6172c..271688a79a5 100644 --- a/dlls/mferror/Makefile.in +++ b/dlls/mferror/Makefile.in @@ -1,4 +1,5 @@ MODULE = mferror.dll -MC_SRCS = \ - mferror.mc +EXTRADLLFLAGS = -Wb,--data-only + +MC_SRCS = mferror.mc

1 0