November 2022 - Wine-commits

Fabian Maurer : sapi: Prevent resource leak (Coverity).
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 6a917733b49b3026a1de6f1b7d79ba29380bfb1b URL: https://gitlab.winehq.org/wine/wine/-/commit/6a917733b49b3026a1de6f1b7d79ba… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 2 02:39:33 2022 +0100 sapi: Prevent resource leak (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/sapi/token.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 8972a5086ed..478a400f920 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -814,7 +814,10 @@ static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, hr = token_create( NULL, &IID_ISpObjectToken, (void**)&subtoken ); if (FAILED(hr)) + { + heap_free(subkey); return hr; + } object = impl_from_ISpObjectToken( subtoken ); object->token_key = key;

1 0

Fabian Maurer : msvcrt/tests: Fix typo (Coverity).
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 5d21966b9f16b301272d0f95dbe4939d1d9f6823 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d21966b9f16b301272d0f95dbe493… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 2 05:13:16 2022 +0100 msvcrt/tests: Fix typo (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a5466968b5..de21d11d0b9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1948,7 +1948,7 @@ static void test_fopen_fclose_fcloseall( void ) ok(errno == 0xdeadbeef, "errno = %d\n", errno); ret = fclose(NULL); ok(ret == EOF, "Closing NULL file returned %d\n", ret); - ok(errno = EINVAL, "errno = %d\n", errno); + ok(errno == EINVAL, "errno = %d\n", errno); /* testing fcloseall() */ numclosed = _fcloseall();

1 0

Piotr Caban : msvcrt: Fix errno set on write to read-only file.
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 7f5f904cfa7e062012960283e98229806c3b27c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f5f904cfa7e062012960283e98229… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 2 11:08:02 2022 +0100 msvcrt: Fix errno set on write to read-only file. --- dlls/msvcrt/file.c | 4 ++++ dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 81416deed5a..affa2fbdd43 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3590,6 +3590,8 @@ int CDECL _write(int fd, const void* buf, unsigned int count) TRACE("WriteFile (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); + if (GetLastError() == ERROR_ACCESS_DENIED) + *_errno() = EBADF; num_written = -1; } @@ -3718,6 +3720,8 @@ int CDECL _write(int fd, const void* buf, unsigned int count) TRACE("WriteFile/WriteConsoleW (fd %d, hand %p) failed-last error (%ld)\n", fd, hand, GetLastError()); msvcrt_set_errno(GetLastError()); + if (GetLastError() == ERROR_ACCESS_DENIED) + *_errno() = EBADF; release_ioinfo(info); return -1; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 91b057ea72e..7a5466968b5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -311,6 +311,12 @@ static void test_readmode( BOOL ascii_mode ) ok(l == pl+fp,"line 2 ftell got %ld should be %d in %s\n", l, pl+fp, IOMODE); ok(lstrlenA(buffer) == 2+ao,"line 2 fgets got size %d should be %d in %s\n", lstrlenA(buffer), 2+ao, IOMODE); + + errno = 0xdeadbeef; + _doserrno = 0xdeadbeef; + ok(write(fd, buffer, 1) == -1, "read succeeded on write-only file\n"); + ok(errno == EBADF, "errno = %d\n", errno); + ok(_doserrno == ERROR_ACCESS_DENIED, "doserrno = %ld\n", _doserrno); /* test fread across buffer boundary */ rewind(file);

1 0

Fabian Maurer : wbemproxy/tests: Prevent double free (Coverity).
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: f2459fa8695a9e508648249d5332dab0f49d0f56 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2459fa8695a9e508648249d5332da… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 2 02:44:26 2022 +0100 wbemproxy/tests: Prevent double free (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wbemprox/tests/query.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e86f7fd5b62..4503ace0b68 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2162,7 +2162,6 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) ok( hr == S_OK, "got %#lx\n", hr ); ok( count == 1, "got %lu\n", count ); IWbemClassObject_Release( obj ); - SysFreeString( query ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Fabian Maurer : shell32: Prevent double free (Coverity).
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 04589492638ed14c1c6cbdd09f84eb1df419a0a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/04589492638ed14c1c6cbdd09f84eb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Nov 2 04:39:06 2022 +0100 shell32: Prevent double free (Coverity). If we get an error, we might get a double free otherwise. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 24482d2c33f..96b5a243f93 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -403,6 +403,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) } free(opcode); + opcode = NULL; for (i = 0; i < argc; i++) free(argv[i]); free(argv);

1 0

Zhiyi Zhang : comctl32/button: Initialize dtFlags in PB_Paint().
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 398cb9595a01df26ee380a850c5084a453cb72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/398cb9595a01df26ee380a850c5084… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 2 16:02:52 2022 +0800 comctl32/button: Initialize dtFlags in PB_Paint(). Fix an uninitialized variable warning. --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 089534b2b9d..6c04c458a6a 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1833,7 +1833,7 @@ static void BUTTON_DrawThemedLabel(const BUTTON_INFO *info, HDC hdc, UINT text_f static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { RECT rc, labelRect, imageRect, textRect; - UINT dtFlags, uState; + UINT dtFlags = (UINT)-1, uState; HPEN hOldPen, hpen; HBRUSH hOldBrush; INT oldBkMode;

1 0

Brendan Shanks : winemac: Remove pre-Mac OS X 10.8 workarounds.
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: c69f19552be4b2b61ae25c2fe8cd4ca1791c435c URL: https://gitlab.winehq.org/wine/wine/-/commit/c69f19552be4b2b61ae25c2fe8cd4c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sat Oct 8 09:42:35 2022 -0500 winemac: Remove pre-Mac OS X 10.8 workarounds. --- dlls/winemac.drv/cocoa_app.m | 16 ++---- dlls/winemac.drv/display.c | 113 +++++++++++++++++-------------------------- 2 files changed, 47 insertions(+), 82 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b13bc678c6d..d9d56da20f8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -760,13 +760,8 @@ static NSString* WineLocalizedString(unsigned int stringID) if (CGDisplayModeGetWidth(mode1) != CGDisplayModeGetWidth(mode2)) return FALSE; if (CGDisplayModeGetHeight(mode1) != CGDisplayModeGetHeight(mode2)) return FALSE; - -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&CGDisplayModeGetPixelWidth != NULL && - CGDisplayModeGetPixelWidth(mode1) != CGDisplayModeGetPixelWidth(mode2)) return FALSE; - if (&CGDisplayModeGetPixelHeight != NULL && - CGDisplayModeGetPixelHeight(mode1) != CGDisplayModeGetPixelHeight(mode2)) return FALSE; -#endif + if (CGDisplayModeGetPixelWidth(mode1) != CGDisplayModeGetPixelWidth(mode2)) return FALSE; + if (CGDisplayModeGetPixelHeight(mode1) != CGDisplayModeGetPixelHeight(mode2)) return FALSE; encoding1 = [(NSString*)CGDisplayModeCopyPixelEncoding(mode1) autorelease]; encoding2 = [(NSString*)CGDisplayModeCopyPixelEncoding(mode2) autorelease]; @@ -791,12 +786,7 @@ static NSString* WineLocalizedString(unsigned int stringID) - (NSArray*)modesMatchingMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { NSMutableArray* ret = [NSMutableArray array]; - NSDictionary* options = nil; - -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE] - forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes]; -#endif + NSDictionary* options = @{ (NSString*)kCGDisplayShowDuplicateLowResolutionModes: @YES }; NSArray *modes = [(NSArray*)CGDisplayCopyAllDisplayModes(displayID, (CFDictionaryRef)options) autorelease]; for (id candidateModeObject in modes) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 68069df7cc5..f24ada839ab 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -176,18 +176,12 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID val = CGDisplayModeGetIOFlags(display_mode); if (!set_setting_value(display_hkey, "IOFlags", val)) goto fail; - -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) - { - val = CGDisplayModeGetPixelWidth(display_mode); - if (!set_setting_value(display_hkey, "PixelWidth", val)) - goto fail; - val = CGDisplayModeGetPixelHeight(display_mode); - if (!set_setting_value(display_hkey, "PixelHeight", val)) - goto fail; - } -#endif + val = CGDisplayModeGetPixelWidth(display_mode); + if (!set_setting_value(display_hkey, "PixelWidth", val)) + goto fail; + val = CGDisplayModeGetPixelHeight(display_mode); + if (!set_setting_value(display_hkey, "PixelHeight", val)) + goto fail; pixel_encoding = CGDisplayModeCopyPixelEncoding(display_mode); len = CFStringGetLength(pixel_encoding); @@ -370,17 +364,8 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct if (fabs(desc->refresh - mode_refresh) > 0.1) return FALSE; -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) - { - if (CGDisplayModeGetPixelWidth(mode) != desc->pixel_width || - CGDisplayModeGetPixelHeight(mode) != desc->pixel_height) - return FALSE; - } - else -#endif - if (CGDisplayModeGetWidth(mode) != desc->pixel_width || - CGDisplayModeGetHeight(mode) != desc->pixel_height) + if (CGDisplayModeGetPixelWidth(mode) != desc->pixel_width || + CGDisplayModeGetPixelHeight(mode) != desc->pixel_height) return FALSE; mode_pixel_encoding = CGDisplayModeCopyPixelEncoding(mode); @@ -420,7 +405,6 @@ static int get_default_bpp(void) } -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_original) { CFDictionaryRef ret; @@ -542,7 +526,6 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo /* Otherwise, prefer the mode with the smaller pixel size. */ return new_width_pixels < old_width_pixels && new_height_pixels < old_height_pixels; } -#endif static CFComparisonResult mode_compare(const void *p1, const void *p2, void *context) @@ -605,56 +588,48 @@ static CFComparisonResult mode_compare(const void *p1, const void *p2, void *con static CFArrayRef copy_display_modes(CGDirectDisplayID display, BOOL include_unsupported) { CFArrayRef modes = NULL; + CFDictionaryRef options; + struct display_mode_descriptor* desc; + CFMutableDictionaryRef modes_by_size; + CFIndex i, count; + CGDisplayModeRef* mode_array; -#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) - { - CFDictionaryRef options; - struct display_mode_descriptor* desc; - CFMutableDictionaryRef modes_by_size; - CFIndex i, count; - CGDisplayModeRef* mode_array; - - options = CFDictionaryCreate(NULL, (const void**)&kCGDisplayShowDuplicateLowResolutionModes, - (const void**)&kCFBooleanTrue, 1, &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - - modes = CGDisplayCopyAllDisplayModes(display, options); - if (options) - CFRelease(options); - if (!modes) - return NULL; - - desc = create_original_display_mode_descriptor(display); - - modes_by_size = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - count = CFArrayGetCount(modes); - for (i = 0; i < count; i++) - { - CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); - CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); - CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + options = CFDictionaryCreate(NULL, (const void**)&kCGDisplayShowDuplicateLowResolutionModes, + (const void**)&kCFBooleanTrue, 1, &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); - if (mode_is_preferred(new_mode, old_mode, desc, include_unsupported)) - CFDictionarySetValue(modes_by_size, key, new_mode); + modes = CGDisplayCopyAllDisplayModes(display, options); + if (options) + CFRelease(options); + if (!modes) + return NULL; - CFRelease(key); - } + desc = create_original_display_mode_descriptor(display); - free_display_mode_descriptor(desc); - CFRelease(modes); + modes_by_size = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + count = CFArrayGetCount(modes); + for (i = 0; i < count; i++) + { + CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); + CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); + CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + + if (mode_is_preferred(new_mode, old_mode, desc, include_unsupported)) + CFDictionarySetValue(modes_by_size, key, new_mode); - count = CFDictionaryGetCount(modes_by_size); - mode_array = malloc(count * sizeof(mode_array[0])); - CFDictionaryGetKeysAndValues(modes_by_size, NULL, (const void **)mode_array); - modes = CFArrayCreate(NULL, (const void **)mode_array, count, &kCFTypeArrayCallBacks); - free(mode_array); - CFRelease(modes_by_size); + CFRelease(key); } - else -#endif - modes = CGDisplayCopyAllDisplayModes(display, NULL); + + free_display_mode_descriptor(desc); + CFRelease(modes); + + count = CFDictionaryGetCount(modes_by_size); + mode_array = malloc(count * sizeof(mode_array[0])); + CFDictionaryGetKeysAndValues(modes_by_size, NULL, (const void **)mode_array); + modes = CFArrayCreate(NULL, (const void **)mode_array, count, &kCFTypeArrayCallBacks); + free(mode_array); + CFRelease(modes_by_size); if (modes) {

1 0

Piotr Caban : msvcrt: Fix errno set on read from write-only file.
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 3fd47b4663af18d815f85f50c9f343bb6aca7066 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fd47b4663af18d815f85f50c9f343… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 2 11:05:07 2022 +0100 msvcrt: Fix errno set on read from write-only file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53677 --- dlls/msvcrt/file.c | 6 ++++++ dlls/msvcrt/tests/file.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a3140589481..81416deed5a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2756,6 +2756,8 @@ static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count) return 0; }else { msvcrt_set_errno(GetLastError()); + if (GetLastError() == ERROR_ACCESS_DENIED) + *_errno() = EBADF; return -1; } }else if(!num_read) { @@ -2813,6 +2815,8 @@ static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count) return 0; }else { msvcrt_set_errno(GetLastError()); + if (GetLastError() == ERROR_ACCESS_DENIED) + *_errno() = EBADF; if (readbuf != min_buf) free(readbuf); return -1; } @@ -3041,6 +3045,8 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) { TRACE(":failed-last error (%ld)\n", GetLastError()); msvcrt_set_errno(GetLastError()); + if (GetLastError() == ERROR_ACCESS_DENIED) + *_errno() = EBADF; return -1; } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 78ed8931d7a..91b057ea72e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -258,6 +258,13 @@ static void test_readmode( BOOL ascii_mode ) write (fd, &padbuffer[i], 1); write (fd, nlbuffer, strlen(nlbuffer)); write (fd, outbuffer, sizeof (outbuffer)); + + errno = 0xdeadbeef; + _doserrno = 0xdeadbeef; + ok(read(fd, buffer, 1) == -1, "read succeeded on write-only file\n"); + ok(errno == EBADF, "errno = %d\n", errno); + ok(_doserrno == ERROR_ACCESS_DENIED, "doserrno = %ld\n", _doserrno); + close (fd); if (ascii_mode) {

1 0

Alexandre Julliard : makedep: Always generate a fake module for the native architecture.
by Alexandre Julliard 02 Nov '22

02 Nov '22

Module: wine Branch: master Commit: 1e58882e77178562723166502f9b80d6682bcda9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e58882e77178562723166502f9b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:26:22 2022 +0100 makedep: Always generate a fake module for the native architecture. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53861 --- tools/makedep.c | 70 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 913b3af7620..ca1efed4533 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3274,6 +3274,38 @@ static char *get_unix_lib_name( struct makefile *make ) } +/******************************************************************* + * output_fake_module + */ +static void output_fake_module( struct makefile *make ) +{ + unsigned int arch = 0; /* fake modules are always native */ + const char *spec_file = NULL, *name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); + + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + + strarray_add( &make->all_targets[arch], name ); + add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); + + output( "%s:", obj_dir_path( make, name )); + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, make->res_files[arch] ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output_winegcc_command( make, arch ); + output_filename( "-Wb,--fake-module" ); + if (spec_file) + { + output_filename( "-shared" ); + output_filename( spec_file ); + } + output_filenames( make->extradllflags ); + output_filenames_obj_dir( make, make->res_files[arch] ); + output( "\n" ); +} + + /******************************************************************* * output_module */ @@ -3348,37 +3380,8 @@ static void output_module( struct makefile *make, unsigned int arch ) output_filenames( all_libs ); output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); -} - -/******************************************************************* - * output_fake_module - */ -static void output_fake_module( struct makefile *make, unsigned int arch ) -{ - const char *spec_file = NULL, *name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); - - if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - - strarray_add( &make->all_targets[arch], name ); - add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name )); - - output( "%s:", obj_dir_path( make, name )); - if (spec_file) output_filename( spec_file ); - output_filenames_obj_dir( make, make->res_files[arch] ); - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, arch ); - output_filename( "-Wb,--fake-module" ); - if (spec_file) - { - output_filename( "-shared" ); - output_filename( spec_file ); - } - output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, make->res_files[arch] ); - output( "\n" ); + if (!make->data_only && !arch && *dll_ext) output_fake_module( make ); } @@ -3842,10 +3845,11 @@ static void output_sources( struct makefile *make ) } else if (make->module) { - for (arch = 0; arch < archs.count; arch++) + if (!make->use_msvcrt) output_module( make, 0 ); + else { - if (!is_multiarch( arch ) == !make->use_msvcrt) output_module( make, arch ); - else if (is_multiarch( arch ) && *dll_ext) output_fake_module( make, arch ); + for (arch = 0; arch < archs.count; arch++) + if (is_multiarch( arch )) output_module( make, arch ); } if (make->unixlib) output_unix_lib( make ); if (make->importlib) for (arch = 0; arch < archs.count; arch++) output_import_lib( make, arch );

1 0

Bartosz Kosiorek : msvcrt: Add _scprintf_p implementation.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 3ac9ff07af011908f5e4e923229157e403d1f1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ac9ff07af011908f5e4e923229157… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 28 15:10:20 2022 +0200 msvcrt: Add _scprintf_p implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 13 +++++++++++++ 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 052ce73ec7d..2f22af81920 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1261,7 +1261,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -@ stub _scprintf_p +@ varargs _scprintf_p(str) @ stub _scprintf_p_l @ varargs _scwprintf(wstr) @ stub _scwprintf_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7e098a049eb..7a1408a0e24 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1618,7 +1618,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -@ stub _scprintf_p +@ varargs _scprintf_p(str) @ stub _scprintf_p_l @ varargs _scwprintf(wstr) @ stub _scwprintf_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 39a3565088a..c8416c0545b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1629,7 +1629,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -@ stub _scprintf_p +@ varargs _scprintf_p(str) @ stub _scprintf_p_l @ varargs _scwprintf(wstr) @ stub _scwprintf_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 87508d5d069..41b78b43b0a 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1355,7 +1355,7 @@ @ varargs _scanf_s_l(str ptr) msvcr120._scanf_s_l @ varargs _scprintf(str) msvcr120._scprintf @ varargs _scprintf_l(str ptr) msvcr120._scprintf_l -@ stub _scprintf_p +@ varargs _scprintf_p(str) msvcr120._scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) msvcr120._scwprintf @ stub _scwprintf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9eb50ea2b8e..890b1bead1b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -939,7 +939,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -@ stub _scprintf_p +@ varargs _scprintf_p(str) @ stub _scprintf_p_l @ varargs _scwprintf(wstr) @ stub _scwprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 90cd807ca19..d878e7120c4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -915,7 +915,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -@ stub _scprintf_p +@ varargs _scprintf_p(str) @ stub _scprintf_p_l @ varargs _scwprintf(wstr) @ stub _scwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ccaa339ffa0..fc21f162aa7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1329,6 +1329,19 @@ int WINAPIV _scprintf_l(const char *format, _locale_t locale, ...) return retval; } +/********************************************************************* + * _scprintf_p (MSVCRT.@) + */ +int WINAPIV _scprintf_p(const char *format, ...) +{ + int retval; + va_list valist; + va_start(valist, format); + retval = _vscprintf_p_l(format, NULL, valist); + va_end(valist); + return retval; +} + /********************************************************************* * _vsnwprintf (MSVCRT.@) */

1 0