May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : setupapi: Remove implementation for LayoutInf parameter of SP_FILE_COPY_PARAMS.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: ee36f923c59d9ba51b429247df90e0ed30592e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee36f923c59d9ba51b429247… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:06 2019 -0500 setupapi: Remove implementation for LayoutInf parameter of SP_FILE_COPY_PARAMS. Tests demonstrate that the existing implementation is not correct, and I was unable to find an arrangement of parameters such that it was respected on Windows. Most likely it has to do with the undocumented parameters used in the "master" C:\windows\inf\layout.inf. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 20 ---------- dlls/setupapi/queue.c | 81 +--------------------------------------- dlls/setupapi/setupapi_private.h | 1 - 3 files changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 5cde5eb..c108689 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1055,26 +1055,6 @@ const WCHAR *PARSER_get_inf_filename( HINF hinf ) return file->filename; } - -/*********************************************************************** - * PARSER_get_src_root - * - * Retrieve the source directory of an inf file. - */ -WCHAR *PARSER_get_src_root( HINF hinf ) -{ - unsigned int len; - const WCHAR *dir = get_inf_dir( hinf, &len ); - WCHAR *ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (ret) - { - memcpy( ret, dir, len * sizeof(WCHAR) ); - ret[len] = 0; - } - return ret; -} - - /*********************************************************************** * PARSER_get_dest_dir * diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index bc774f3..d18ce9a 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -256,82 +256,6 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, return ret; } - -/*********************************************************************** - * get_src_file_info - * - * Retrieve the source file information for a given file. - */ -static void get_src_file_info( HINF hinf, struct file_op *op ) -{ - static const WCHAR SourceDisksNames[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; - static const WCHAR SourceDisksFiles[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - - INFCONTEXT file_ctx, disk_ctx; - INT id, diskid; - DWORD len, len2; - - /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, op->src_file, &file_ctx )) - { - if ((op->style & (SP_COPY_SOURCE_ABSOLUTE|SP_COPY_SOURCEPATH_ABSOLUTE))) return; - /* no specific info, use .inf file source directory */ - if (!op->src_root) op->src_root = PARSER_get_src_root( hinf ); - return; - } - if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; - - /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; - for (;;) - { - if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break; - if (!SetupFindNextLine( &disk_ctx, &disk_ctx )) return; - } - - /* and fill in the missing info */ - - if (!op->src_descr) - { - if (SetupGetStringFieldW( &disk_ctx, 1, NULL, 0, &len ) && - (op->src_descr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ))) - SetupGetStringFieldW( &disk_ctx, 1, op->src_descr, len, NULL ); - } - if (!op->src_tag) - { - if (SetupGetStringFieldW( &disk_ctx, 2, NULL, 0, &len ) && - (op->src_tag = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ))) - SetupGetStringFieldW( &disk_ctx, 2, op->src_tag, len, NULL ); - } - if (!op->src_path && !(op->style & SP_COPY_SOURCE_ABSOLUTE)) - { - len = len2 = 0; - if (!(op->style & SP_COPY_SOURCEPATH_ABSOLUTE)) - { - /* retrieve relative path for this disk */ - if (!SetupGetStringFieldW( &disk_ctx, 4, NULL, 0, &len )) len = 0; - } - /* retrieve relative path for this file */ - if (!SetupGetStringFieldW( &file_ctx, 2, NULL, 0, &len2 )) len2 = 0; - - if ((len || len2) && - (op->src_path = HeapAlloc( GetProcessHeap(), 0, (len+len2)*sizeof(WCHAR) ))) - { - WCHAR *ptr = op->src_path; - if (len) - { - SetupGetStringFieldW( &disk_ctx, 4, op->src_path, len, NULL ); - ptr = op->src_path + strlenW(op->src_path); - if (len2 && ptr > op->src_path && ptr[-1] != '\\') *ptr++ = '\\'; - } - if (!SetupGetStringFieldW( &file_ctx, 2, ptr, len2, NULL )) *ptr = 0; - } - } - if (!op->src_root) op->src_root = PARSER_get_src_root(hinf); -} - static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params, WCHAR *src_root, WCHAR *src_path) { @@ -557,10 +481,7 @@ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) /* some defaults */ if (!op->src_file) op->src_file = op->dst_file; if (params->LayoutInf) - { - get_src_file_info( params->LayoutInf, op ); - if (!op->dst_path) op->dst_path = get_destination_dir( params->LayoutInf, op->dst_file ); - } + FIXME("Unhandled LayoutInf %p.\n", params->LayoutInf); TRACE( "root=%s path=%s file=%s -> dir=%s file=%s descr=%s tag=%s\n", debugstr_w(op->src_root), debugstr_w(op->src_path), debugstr_w(op->src_file), diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 1df96b1..f4685ab 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -90,7 +90,6 @@ static inline WCHAR *strdupAtoW( const char *str ) struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; -extern WCHAR *PARSER_get_src_root( HINF hinf ) DECLSPEC_HIDDEN; extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; /* support for Ascii queue callback functions */

1 0

Alexandre Julliard : winedevice: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 8a52a73fe923dea772dd1e709cce74e3809dfae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52a73fe923dea772dd1e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 11:08:01 2019 +0200 winedevice: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/Makefile.in | 3 ++- programs/winedevice/device.c | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index a0a4450..c4f1d9e 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,6 +1,7 @@ MODULE = winedevice.exe -APPMODE = -mwindows -municode IMPORTS = advapi32 ntoskrnl +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ device.c diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 201a041..f4ebad2 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "ntstatus.h" @@ -30,7 +27,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/svcctl.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -70,7 +66,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) DWORD result = NO_ERROR; WCHAR *str; - if (!(str = heap_alloc( sizeof(servicesW) + strlenW(driver_name)*sizeof(WCHAR) ))) + if (!(str = heap_alloc( sizeof(servicesW) + lstrlenW(driver_name)*sizeof(WCHAR) ))) return STATUS_NO_MEMORY; lstrcpyW( str, servicesW );

1 0

Alexandre Julliard : winemine: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 4a8ae1c0f47f17bb159ca95c38c4d5025254ec4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a8ae1c0f47f17bb159ca95c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:30:56 2019 +0200 winemine: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index f72e1b1..8f5aebd 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -1,8 +1,9 @@ MODULE = winemine.exe -APPMODE = -mwindows -municode IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = shell32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ dialog.c \ main.c

1 0

Alexandre Julliard : winemsibuilder: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: d87da76156eb7a14dfc77d2071d1ad4b00348f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87da76156eb7a14dfc77d20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:02 2019 +0200 winemsibuilder: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemsibuilder/Makefile.in | 3 ++- programs/winemsibuilder/main.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in index b29f44c..1d7031e 100644 --- a/programs/winemsibuilder/Makefile.in +++ b/programs/winemsibuilder/Makefile.in @@ -1,5 +1,6 @@ MODULE = winemsibuilder.exe -APPMODE = -mconsole -municode IMPORTS = msi ole32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = main.c diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c index ea4607e..71fd1fd 100644 --- a/programs/winemsibuilder/main.c +++ b/programs/winemsibuilder/main.c @@ -28,7 +28,6 @@ #include <objbase.h> #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winemsibuilder); @@ -131,7 +130,7 @@ static WCHAR *encode_stream( const WCHAR *in ) DWORD c, next, count; WCHAR *out, *p; - count = strlenW( in ); + count = lstrlenW( in ); if (count > MAX_STREAM_NAME) return NULL;

1 0

Alexandre Julliard : winetest: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 15c4352f4cf8ba1e54c3b97759f158d51285e747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c4352f4cf8ba1e54c3b977… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:10 2019 +0200 winetest: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 3 ++- programs/winetest/gui.c | 63 ++++++++++++++++++++++--------------------- programs/winetest/main.c | 3 --- programs/winetest/send.c | 9 +++---- programs/winetest/util.c | 20 +++++++------- programs/winetest/winetest.h | 8 +++--- 6 files changed, 52 insertions(+), 54 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 2719a24..0322e77 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,8 +1,9 @@ MODULE = winetest.exe -APPMODE = -mconsole IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 DELAYIMPORTS = ole32 +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ gui.c \ main.c \ diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index bda00f3..bf9c3de 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -60,7 +60,7 @@ MBdefault (int uType) /* report (R_STATUS, fmt, ...) */ static int -textStatus (va_list ap) +textStatus (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -71,7 +71,7 @@ textStatus (va_list ap) } static int -guiStatus (va_list ap) +guiStatus (__ms_va_list ap) { size_t len; char *str = vstrmake (&len, ap); @@ -84,7 +84,7 @@ guiStatus (va_list ap) /* report (R_PROGRESS, barnum, steps) */ static int -textProgress (va_list ap) +textProgress (__ms_va_list ap) { progressGroup = va_arg (ap, int); progressMax = va_arg (ap, int); @@ -93,7 +93,7 @@ textProgress (va_list ap) } static int -guiProgress (va_list ap) +guiProgress (__ms_va_list ap) { unsigned int max; HWND pb; @@ -114,7 +114,7 @@ guiProgress (va_list ap) /* report (R_STEP, fmt, ...) */ static int -textStep (va_list ap) +textStep (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -126,7 +126,7 @@ textStep (va_list ap) } static int -guiStep (va_list ap) +guiStep (__ms_va_list ap) { const int pgID = IDC_ST0 + progressGroup * 2; char *str = vstrmake (NULL, ap); @@ -141,7 +141,7 @@ guiStep (va_list ap) /* report (R_DELTA, inc, fmt, ...) */ static int -textDelta (va_list ap) +textDelta (__ms_va_list ap) { const int inc = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -154,7 +154,7 @@ textDelta (va_list ap) } static int -guiDelta (va_list ap) +guiDelta (__ms_va_list ap) { const int inc = va_arg (ap, int); const int pgID = IDC_ST0 + progressGroup * 2; @@ -170,7 +170,7 @@ guiDelta (va_list ap) /* report (R_TAG) */ static int -textTag (va_list ap) +textTag (__ms_va_list ap) { fputs ("Tag: ", stderr); fputs (tag, stderr); @@ -179,7 +179,7 @@ textTag (va_list ap) } static int -guiTag (va_list ap) +guiTag (__ms_va_list ap) { SetDlgItemTextA (dialog, IDC_TAG, tag); return 0; @@ -187,7 +187,7 @@ guiTag (va_list ap) /* report (R_DIR, fmt, ...) */ static int -textDir (va_list ap) +textDir (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -199,7 +199,7 @@ textDir (va_list ap) } static int -guiDir (va_list ap) +guiDir (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -210,7 +210,7 @@ guiDir (va_list ap) /* report (R_OUT, fmt, ...) */ static int -textOut (va_list ap) +textOut (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -222,7 +222,7 @@ textOut (va_list ap) } static int -guiOut (va_list ap) +guiOut (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -233,7 +233,7 @@ guiOut (va_list ap) /* report (R_WARNING, fmt, ...) */ static int -textWarning (va_list ap) +textWarning (__ms_va_list ap) { fputs ("Warning: ", stderr); textStatus (ap); @@ -241,7 +241,7 @@ textWarning (va_list ap) } static int -guiWarning (va_list ap) +guiWarning (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -252,7 +252,7 @@ guiWarning (va_list ap) /* report (R_ERROR, fmt, ...) */ static int -textError (va_list ap) +textError (__ms_va_list ap) { fputs ("Error: ", stderr); textStatus (ap); @@ -260,7 +260,7 @@ textError (va_list ap) } static int -guiError (va_list ap) +guiError (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -271,22 +271,24 @@ guiError (va_list ap) /* report (R_FATAL, fmt, ...) */ static int -textFatal (va_list ap) +textFatal (__ms_va_list ap) { textError (ap); exit (1); + return 0; } static int -guiFatal (va_list ap) +guiFatal (__ms_va_list ap) { guiError (ap); exit (1); + return 0; } /* report (R_ASK, type, fmt, ...) */ static int -textAsk (va_list ap) +textAsk (__ms_va_list ap) { int uType = va_arg (ap, int); int ret = MBdefault (uType); @@ -299,7 +301,7 @@ textAsk (va_list ap) } static int -guiAsk (va_list ap) +guiAsk (__ms_va_list ap) { int uType = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -393,13 +395,13 @@ guiAskEmail (void) /* Quiet functions */ static int -qNoOp (va_list ap) +qNoOp (__ms_va_list ap) { return 0; } static int -qAsk (va_list ap) +qAsk (__ms_va_list ap) { return MBdefault (va_arg (ap, int)); } @@ -476,12 +478,11 @@ DlgThreadProc (LPVOID param) return 0; } -int -report (enum report_type t, ...) +int WINAPIV report (enum report_type t, ...) { - typedef int r_fun_t (va_list); + typedef int r_fun_t (__ms_va_list); - va_list ap; + __ms_va_list ap; int ret = 0; static r_fun_t * const text_funcs[] = {textStatus, textProgress, textStep, textDelta, @@ -545,10 +546,10 @@ report (enum report_type t, ...) } } } - - va_start (ap, t); + + __ms_va_start (ap, t); if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); - va_end (ap); + __ms_va_end (ap); return ret; } diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ec2f6a7..a6874c2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -25,9 +25,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include <stdio.h> #include <assert.h> diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 1b0b94a..1d4e3a7 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -103,17 +103,16 @@ send_buf (SOCKET s, const char *buf, size_t length) return 0; } -static int -send_str (SOCKET s, ...) +static int WINAPIV send_str (SOCKET s, ...) { - va_list ap; + __ms_va_list ap; char *p; int ret; size_t len; - va_start (ap, s); + __ms_va_start (ap, s); p = vstrmake (&len, ap); - va_end (ap); + __ms_va_end (ap); if (!p) return 1; ret = send_buf (s, p, len); heap_free (p); diff --git a/programs/winetest/util.c b/programs/winetest/util.c index af625e7..b3d112e 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -57,7 +57,7 @@ void heap_free (void *op) HeapFree(GetProcessHeap(), 0, op); } -static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) +static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap) { size_t size = 1000; char *p, *q; @@ -81,7 +81,7 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) return p; } -char *vstrmake (size_t *lenp, va_list ap) +char *vstrmake (size_t *lenp, __ms_va_list ap) { const char *fmt; @@ -89,29 +89,29 @@ char *vstrmake (size_t *lenp, va_list ap) return vstrfmtmake (lenp, fmt, ap); } -char *strmake (size_t *lenp, ...) +char * WINAPIV strmake (size_t *lenp, ...) { - va_list ap; + __ms_va_list ap; char *p; - va_start (ap, lenp); + __ms_va_start (ap, lenp); p = vstrmake (lenp, ap); if (!p) report (R_FATAL, "Out of memory."); - va_end (ap); + __ms_va_end (ap); return p; } -void xprintf (const char *fmt, ...) +void WINAPIV xprintf (const char *fmt, ...) { - va_list ap; + __ms_va_list ap; size_t size; DWORD written; char *buffer, *head; - va_start (ap, fmt); + __ms_va_start (ap, fmt); buffer = vstrfmtmake (&size, fmt, ap); head = buffer; - va_end (ap); + __ms_va_end (ap); while (size) { if (!WriteFile( logfile, head, size, &written, NULL )) report (R_FATAL, "Can't write logs: %u", GetLastError()); diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 0446ad5..32d3f90 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -28,9 +28,9 @@ void fatal (const char* msg); void warning (const char* msg); -void xprintf (const char *fmt, ...); -char *vstrmake (size_t *lenp, va_list ap); -char *strmake (size_t *lenp, ...); +void WINAPIV xprintf (const char *fmt, ...); +char *vstrmake (size_t *lenp, __ms_va_list ap); +char * WINAPIV strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag); @@ -72,6 +72,6 @@ extern char *email; extern BOOL aborting; int guiAskTag (void); int guiAskEmail (void); -int report (enum report_type t, ...); +int WINAPIV report (enum report_type t, ...); #endif /* __WINETESTS_H */

1 0

Alexandre Julliard : winhlp32: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 6cd7240fec06829e73f240104f6e690b7ca5ff8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd7240fec06829e73f24010… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:16 2019 +0200 winhlp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/Makefile.in | 3 ++- programs/winhlp32/macro.lex.l | 1 - programs/winhlp32/winhelp.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 40ce8a1..78e0e5a 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -1,8 +1,9 @@ MODULE = winhlp32.exe -APPMODE = -mwindows IMPORTS = user32 gdi32 DELAYIMPORTS = shell32 comctl32 comdlg32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ callback.c \ hlpfile.c \ diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index eab7a79..08067a4 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -23,7 +23,6 @@ %option noinput nounput never-interactive 8bit %x quote %{ -#include "config.h" #include <assert.h> #include <stdarg.h> diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 7ce5d4a..a98a760 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -275,10 +275,10 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) strcpy(mwi.name, "main"); if (hlpfile && hlpfile->lpszTitle[0]) { - char tmp[128]; + char tmp[40]; LoadStringA(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); - snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", - hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + _snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); } else LoadStringA(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption));

1 0

Alexandre Julliard : wmic: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: be5c1c86d416735b09d1c1b48d08ad241204b00d URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5c1c86d416735b09d1c1b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:22 2019 +0200 wmic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/Makefile.in | 3 ++- programs/wmic/main.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in index 87185f7..16098c1 100644 --- a/programs/wmic/Makefile.in +++ b/programs/wmic/Makefile.in @@ -1,7 +1,8 @@ MODULE = wmic.exe -APPMODE = -mconsole -municode IMPORTS = oleaut32 ole32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 5d50045..e20b1f8 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -28,7 +28,6 @@ #include "wmic.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wmic); @@ -84,7 +83,7 @@ static const WCHAR *find_class( const WCHAR *alias ) for (i = 0; i < ARRAY_SIZE(alias_map); i++) { - if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; + if (!wcsicmp( alias, alias_map[i].alias )) return alias_map[i].class; } return NULL; } @@ -93,8 +92,8 @@ static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - strcpyW( dst, src ); + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; + lstrcpyW( dst, src ); return dst; } @@ -111,7 +110,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) for (i = 0; i <= last_index; i++) { SafeArrayGetElement( sa, &i, &str ); - if (!strcmpiW( str, prop )) + if (!wcsicmp( str, prop )) { ret = strdupW( str ); break; @@ -121,16 +120,16 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) return ret; } -static int output_string( HANDLE handle, const WCHAR *msg, ... ) +static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) { - va_list va_args; + __ms_va_list va_args; int len; DWORD count; WCHAR buffer[8192]; - va_start( va_args, msg ); - len = vsnprintfW( buffer, ARRAY_SIZE(buffer), msg, va_args ); - va_end( va_args ); + __ms_va_start( va_args, msg ); + len = vswprintf( buffer, ARRAY_SIZE(buffer), msg, va_args ); + __ms_va_end( va_args ); if (!WriteConsoleW( handle, buffer, len, &count, NULL )) WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); @@ -154,7 +153,7 @@ static int output_header( const WCHAR *prop, ULONG column_width ) DWORD count; WCHAR buffer[8192]; - len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); + len = swprintf( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -204,10 +203,10 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + ARRAY_SIZE(select_allW); + len = lstrlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - strcpyW( query, select_allW ); - strcatW( query, class ); + lstrcpyW( query, select_allW ); + lstrcatW( query, class ); if (!(wql = SysAllocString( wqlW ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); @@ -226,7 +225,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - width = max( strlenW( V_BSTR( &v ) ), width ); + width = max( lstrlenW( V_BSTR( &v ) ), width ); VariantClear( &v ); } IWbemClassObject_Release( obj ); @@ -283,20 +282,20 @@ int wmain(int argc, WCHAR *argv[]) if (i >= argc) goto not_supported; - if (!strcmpiW( argv[i], quitW ) || - !strcmpiW( argv[i], exitW )) + if (!wcsicmp( argv[i], quitW ) || + !wcsicmp( argv[i], exitW )) { return 0; } - if (!strcmpiW( argv[i], classW) || - !strcmpiW( argv[i], contextW )) + if (!wcsicmp( argv[i], classW) || + !wcsicmp( argv[i], contextW )) { WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - if (!strcmpiW( argv[i], pathW )) + if (!wcsicmp( argv[i], pathW )) { if (++i >= argc) { @@ -318,7 +317,7 @@ int wmain(int argc, WCHAR *argv[]) if (++i >= argc) goto not_supported; - if (!strcmpiW( argv[i], getW )) + if (!wcsicmp( argv[i], getW )) { if (++i >= argc) goto not_supported;

1 0

Alexandre Julliard : write: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: bb90e8dd4979f3fa852698317ccb1f9e1284d8cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb90e8dd4979f3fa85269831… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:28 2019 +0200 write: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index dcdca16..b0280b7 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -1,7 +1,8 @@ MODULE = write.exe -APPMODE = -mwindows IMPORTS = user32 gdi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = write.c RC_SRCS = write.rc

1 0

Alexandre Julliard : wscript: Build with msvcrt.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 4432405ec5b61536fe9a75c3289a8e6f35dfb203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4432405ec5b61536fe9a75c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:36 2019 +0200 wscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cscript/Makefile.in | 3 ++- programs/wscript/Makefile.in | 3 ++- programs/wscript/host.c | 7 +++---- programs/wscript/main.c | 13 ++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index b3fee31..73b8966 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,9 +1,10 @@ MODULE = cscript.exe -APPMODE = -mwindows -municode IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ arguments.c \ host.c \ diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 07d8832..96a4244 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -1,7 +1,8 @@ MODULE = wscript.exe -APPMODE = -mwindows -municode IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + RC_SRCS = \ rsrc.rc diff --git a/programs/wscript/host.c b/programs/wscript/host.c index fb1c86f..315b8ac 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -29,7 +29,6 @@ #include <wine/debug.h> #include <wine/heap.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -80,7 +79,7 @@ static void print_string(const WCHAR *string) return; } - len = strlenW(string); + len = lstrlenW(string); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; @@ -200,7 +199,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; - pos = strrchrW(path, '\\'); + pos = wcsrchr(path, '\\'); howMany = pos - path; if(!(*out_Path = SysAllocStringLen(path, howMany))) return E_OUTOFMEMORY; @@ -237,7 +236,7 @@ static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName) WINE_TRACE("(%p)\n", out_ScriptName); - scriptName = strrchrW(scriptFullName, '\\'); + scriptName = wcsrchr(scriptFullName, '\\'); ++scriptName; if(!(*out_ScriptName = SysAllocString(scriptName))) return E_OUTOFMEMORY; diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 1cbb9e7..8a80360 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -31,7 +31,6 @@ #include "wscript.h" #include <wine/debug.h> -#include <wine/unicode.h> #ifdef _WIN64 @@ -87,7 +86,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, { WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); - if(strcmpW(pstrName, wshW) && strcmpW(pstrName, wscriptW)) + if(lstrcmpW(pstrName, wshW) && lstrcmpW(pstrName, wscriptW)) return E_FAIL; if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { @@ -261,7 +260,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); - strcatW(fileid, script_engineW); + lstrcatW(fileid, script_engineW); res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -400,11 +399,11 @@ static BOOL set_host_properties(const WCHAR *prop) else ++prop; - if(strcmpiW(prop, iactive) == 0) + if(wcsicmp(prop, iactive) == 0) wshInteractive = VARIANT_TRUE; - else if(strcmpiW(prop, batch) == 0) + else if(wcsicmp(prop, batch) == 0) wshInteractive = VARIANT_FALSE; - else if(strcmpiW(prop, nologoW) == 0) + else if(wcsicmp(prop, nologoW) == 0) WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); else { @@ -450,7 +449,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; - ext = strrchrW(filepart, '.'); + ext = wcsrchr(filepart, '.'); if(!ext || !get_engine_clsid(ext, &clsid)) { WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1;

1 0

Alexandre Julliard : ping: Avoid using getopt().
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: cf39ae8962e921eec25ad2ec9beaeef8f5bcc347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf39ae8962e921eec25ad2ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:35:20 2019 +0200 ping: Avoid using getopt(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ping/ping_main.c | 54 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 9c4f239..59d36b7 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -52,14 +52,14 @@ static void usage(void) int main(int argc, char** argv) { - unsigned int n = 4, i = 0, w = 4000, l = 32; - int optc, res; + unsigned int n = 4, i, w = 4000, l = 32; + int res; int rec = 0, lost = 0, min = INT_MAX, max = 0; WSADATA wsa; HANDLE icmp_file; unsigned long ipaddr; DWORD retval, reply_size; - char *send_data, ip[100], *hostname, rtt[16]; + char *send_data, ip[100], *hostname = NULL, rtt[16]; void *reply_buffer; struct in_addr addr; ICMP_ECHO_REPLY *reply; @@ -72,12 +72,19 @@ int main(int argc, char** argv) exit(1); } - while ((optc = getopt( argc, argv, "n:w:l:tal:fi:v:r:s:j:k:" )) != -1) + for (i = 1; i < argc; i++) { - switch(optc) + if (argv[i][0] == '-' || argv[i][0] == '/') { + switch (argv[i][1]) + { case 'n': - n = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + n = atoi(argv[++i]); if (n == 0) { printf("Bad value for option -n, valid range is from 1 to 4294967295.\n"); @@ -85,7 +92,12 @@ int main(int argc, char** argv) } break; case 'w': - w = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + w = atoi(argv[++i]); if (w == 0) { printf("Bad value for option -w.\n"); @@ -93,7 +105,12 @@ int main(int argc, char** argv) } break; case 'l': - l = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + l = atoi(argv[++i]); if (l == 0) { printf("Bad value for option -l.\n"); @@ -107,12 +124,20 @@ int main(int argc, char** argv) usage(); WINE_FIXME( "this command currently only supports the -n, -w and -l parameters.\n" ); exit(1); + } + } + else + { + if (hostname) + { + printf( "Bad argument %s\n", argv[i] ); + exit(1); + } + hostname = argv[i]; } } - if (argv[optind] != NULL) - hostname = argv[optind]; - else + if (!hostname) { printf("Pass a host name.\n"); return 1; @@ -155,7 +180,7 @@ int main(int argc, char** argv) } printf("Pinging %s [%s] with %d bytes of data:\n", hostname, ip, l); - for (;;) + for (i = 0; i < n; i++) { SetLastError(0); retval = IcmpSendEcho(icmp_file, ipaddr, send_data, l, @@ -184,10 +209,7 @@ int main(int argc, char** argv) puts("PING: transmit failed. General failure."); lost++; } - i++; - if (i == n) - break; - Sleep(1000); + if (i < n - 1) Sleep(1000); } printf("\nPing statistics for %s\n", ip);

1 0