April 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/avidec: Get rid of the AVIDecImpl typedef.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 27c9b689c100f4b2370a5767c3dbe05194b73f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c9b689c100f4b2370a5767… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:16 2020 -0500 quartz/avidec: Get rid of the AVIDecImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8d38b89e99..1d9bc8acdf 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct AVIDecImpl +struct avi_decompressor { struct strmbase_filter filter; CRITICAL_SECTION stream_cs; @@ -50,16 +50,16 @@ typedef struct AVIDecImpl HIC hvid; BITMAPINFOHEADER* pBihIn; REFERENCE_TIME late; -} AVIDecImpl; +}; -static AVIDecImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) +static struct avi_decompressor *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, AVIDecImpl, filter); + return CONTAINING_RECORD(iface, struct avi_decompressor, filter); } static HRESULT avi_decompressor_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; @@ -77,14 +77,15 @@ static HRESULT avi_decompressor_sink_query_accept(struct strmbase_pin *iface, co static HRESULT avi_decompressor_sink_end_flush(struct strmbase_sink *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->pin.filter); filter->late = -1; if (filter->source.pin.peer) return IPin_EndFlush(filter->source.pin.peer); return S_OK; } -static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { +static int AVIDec_DropSample(struct avi_decompressor *This, REFERENCE_TIME tStart) +{ if (This->late < 0) return 0; @@ -98,7 +99,7 @@ static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - AVIDecImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter); VIDEOINFOHEADER *source_format; HRESULT hr; DWORD res; @@ -219,7 +220,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { - AVIDecImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; /* Check root (GUID w/o FOURCC) */ @@ -273,7 +274,7 @@ failed: static void avi_decompressor_sink_disconnect(struct strmbase_sink *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->pin.filter); if (filter->hvid) ICClose(filter->hvid); @@ -295,7 +296,7 @@ static const struct strmbase_sink_ops sink_ops = static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; @@ -310,7 +311,7 @@ static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *ifac static HRESULT avi_decompressor_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); VIDEOINFOHEADER *sink_format, *format; if (!filter->sink.pin.peer || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) @@ -346,7 +347,7 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, }; - AVIDecImpl *filter = impl_from_strmbase_filter(iface->filter); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface->filter); const VIDEOINFOHEADER *sink_format; VIDEOINFO *format; @@ -464,34 +465,34 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = avi_decompressor_source_DecideBufferSize, }; -static AVIDecImpl *impl_from_source_IQualityControl(IQualityControl *iface) +static struct avi_decompressor *impl_from_source_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, AVIDecImpl, source_IQualityControl_iface); + return CONTAINING_RECORD(iface, struct avi_decompressor, source_IQualityControl_iface); } static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); @@ -507,7 +508,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { - AVIDecImpl *filter = impl_from_source_IQualityControl(iface); + struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sink %p.\n", filter, sink); @@ -525,7 +526,7 @@ static const IQualityControlVtbl source_qc_vtbl = static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *iface, unsigned int index) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); if (index == 0) return &filter->sink.pin; @@ -536,7 +537,7 @@ static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *ifa static void avi_decompressor_destroy(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); @@ -560,7 +561,7 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); VIDEOINFOHEADER *source_format; LRESULT res; @@ -579,7 +580,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) { - AVIDecImpl *filter = impl_from_strmbase_filter(iface); + struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) @@ -602,7 +603,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) { - AVIDecImpl *object; + struct avi_decompressor *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : kernel32: Avoid using wctype functions.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 2ec3396122e3f6c7402bbdacea1bb311b264bd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec3396122e3f6c7402bbdac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:30:17 2020 +0200 kernel32: Avoid using wctype functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 5 ++++- dlls/kernel32/format_msg.c | 4 ++-- dlls/kernel32/profile.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index e3d52ccc1a..489960aba6 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -362,7 +362,10 @@ static void WCEL_SaveYank(WCEL_Context* ctx, int beg, int end) */ static inline BOOL WCEL_iswalnum(WCHAR wc) { - return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); + WORD type; + + GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); + return type & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } static int WCEL_GetLeftWordTransition(WCEL_Context* ctx, int ofs) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 6a0dc5bd6b..f29c88fd38 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -184,7 +184,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, } else *p++ = *format++; } - while (isdigitW(*format)) *p++ = *format++; + while (*format >= '0' && *format <= '9') *p++ = *format++; if (*format == '.') { @@ -196,7 +196,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, format++; } else - while (isdigitW(*format)) *p++ = *format++; + while (*format >= '0' && *format <= '9') *p++ = *format++; } /* replicate MS bug: drop an argument when using va_list with width/precision */ diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 434728c267..f7d64f16a5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -270,8 +270,8 @@ static void PROFILE_Free( PROFILESECTION *section ) /* returns TRUE if a whitespace character, else FALSE */ static inline BOOL PROFILE_isspaceW(WCHAR c) { - /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ - return isspaceW(c) || c == 0x1a; + /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ + return (c >= 0x09 && c <= 0x0d) || c == 0x1a || c == 0x20; } static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len)

1 0

Zebediah Figura : quartz/avidec: Fix some copy-paste errors.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: f817fde7ea6a9221843ce430f9ad4b6278027a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f817fde7ea6a9221843ce430… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:17 2020 -0500 quartz/avidec: Fix some copy-paste errors. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 1d9bc8acdf..ada3a1c7e6 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -470,26 +470,26 @@ static struct avi_decompressor *impl_from_source_IQualityControl(IQualityControl return CONTAINING_RECORD(iface, struct avi_decompressor, source_IQualityControl_iface); } -static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, +static HRESULT WINAPI avi_decompressor_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } -static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) +static ULONG WINAPI avi_decompressor_source_qc_AddRef(IQualityControl *iface) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } -static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) +static ULONG WINAPI avi_decompressor_source_qc_Release(IQualityControl *iface) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } -static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, +static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); @@ -506,7 +506,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, return S_OK; } -static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +static HRESULT WINAPI avi_decompressor_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); @@ -517,11 +517,11 @@ static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQua static const IQualityControlVtbl source_qc_vtbl = { - acm_wrapper_source_qc_QueryInterface, - acm_wrapper_source_qc_AddRef, - acm_wrapper_source_qc_Release, - acm_wrapper_source_qc_Notify, - acm_wrapper_source_qc_SetSink, + avi_decompressor_source_qc_QueryInterface, + avi_decompressor_source_qc_AddRef, + avi_decompressor_source_qc_Release, + avi_decompressor_source_qc_Notify, + avi_decompressor_source_qc_SetSink, }; static struct strmbase_pin *avi_decompressor_get_pin(struct strmbase_filter *iface, unsigned int index)

1 0

Alexandre Julliard : krnl386: Avoid using toupperW().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 73dad192b49880c9754d46ae84aa9f4a97dd2ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73dad192b49880c9754d46ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:30:21 2020 +0200 krnl386: Avoid using toupperW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 9 ++++++--- dlls/krnl386.exe16/int21.c | 23 +++++++++++++--------- dlls/krnl386.exe16/relay.c | 49 ++++++++++++++++------------------------------ 3 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 4e7f7c4b33..e44455a021 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -461,10 +461,13 @@ LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) UINT WINAPI GetTempDrive( BYTE ignored ) { WCHAR buffer[MAX_PATH]; - BYTE ret; + BYTE ret = 'C'; - if (GetTempPathW( MAX_PATH, buffer )) ret = (BYTE)toupperW(buffer[0]); - else ret = 'C'; + if (GetTempPathW( MAX_PATH, buffer )) + { + ret = buffer[0]; + if (ret >= 'a' && ret <= 'z') ret += 'A' - 'a'; + } return MAKELONG( ret | (':' << 8), 1 ); } diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 04ae9fe8a8..feab712af0 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -264,6 +264,13 @@ typedef struct static int brk_flag; +static BYTE drive_number( WCHAR letter ) +{ + if (letter >= 'A' && letter <= 'Z') return letter - 'A'; + if (letter >= 'a' && letter <= 'z') return letter - 'a'; + return MAX_DOS_DRIVES; +} + /* Many calls translate a drive argument like this: drive number (00h = default, 01h = A:, etc) @@ -300,8 +307,7 @@ static BYTE INT21_GetCurrentDrive(void) TRACE( "Failed to get current drive.\n" ); return MAX_DOS_DRIVES; } - - return toupperW( current_directory[0] ) - 'A'; + return drive_number( current_directory[0] ); } @@ -636,7 +642,7 @@ static BOOL INT21_GetCurrentDirectory( CONTEXT *context, BOOL islong ) if (!GetCurrentDirectoryW( MAX_PATH, pathW )) return FALSE; - if (toupperW(pathW[0]) - 'A' != drive || pathW[1] != ':') + if (drive_number( pathW[0] ) != drive || pathW[1] != ':') { /* cwd is not on the requested drive, get the environment string instead */ @@ -765,7 +771,7 @@ static BOOL INT21_SetCurrentDirectory( CONTEXT *context ) result = SetEnvironmentVariableW( env_var, dirW ); /* only set current directory if on the current drive */ - if (result && (toupperW(dirW[0]) - 'A' == drive)) result = SetCurrentDirectoryW( dirW ); + if (result && (drive_number( dirW[0] ) == drive)) result = SetCurrentDirectoryW( dirW ); return result; } @@ -3418,8 +3424,7 @@ static BOOL INT21_ToDosFCBFormat( LPCWSTR name, LPWSTR buffer ) break; default: if (strchrW( invalid_chars, *p )) return FALSE; - buffer[i] = toupperW(*p); - p++; + buffer[i] = *p++; break; } } @@ -3455,12 +3460,12 @@ static BOOL INT21_ToDosFCBFormat( LPCWSTR name, LPWSTR buffer ) break; default: if (strchrW( invalid_chars, *p )) return FALSE; - buffer[i] = toupperW(*p); - p++; + buffer[i] = *p++; break; } } buffer[11] = '\0'; + struprW( buffer ); /* at most 3 character of the extension are processed * is something behind this ? @@ -3514,7 +3519,7 @@ static BOOL INT21_FindFirst( CONTEXT *context ) /* we must have a fully qualified file name in dta->fullPath * (we could have a UNC path, but this would lead to some errors later on) */ - dta->drive = toupperW(dta->fullPath[0]) - 'A'; + dta->drive = drive_number( dta->fullPath[0] ); dta->count = 0; dta->search_attr = CL_reg(context); return TRUE; diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index a47e85126e..837f389230 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -59,37 +59,22 @@ typedef struct { } RELAY_Stack16; -static const WCHAR **debug_relay_excludelist; -static const WCHAR **debug_relay_includelist; -static const WCHAR **debug_snoop_excludelist; -static const WCHAR **debug_snoop_includelist; +static const char **debug_relay_excludelist; +static const char **debug_relay_includelist; +static const char **debug_snoop_excludelist; +static const char **debug_snoop_includelist; -/* compare an ASCII and a Unicode string without depending on the current codepage */ -static inline int strcmpiAW( const char *strA, const WCHAR *strW ) -{ - while (*strA && (toupperW((unsigned char)*strA) == toupperW(*strW))) { strA++; strW++; } - return toupperW((unsigned char)*strA) - toupperW(*strW); -} - -/* compare an ASCII and a Unicode string without depending on the current codepage */ -static inline int strncmpiAW( const char *strA, const WCHAR *strW, int n ) -{ - int ret = 0; - for ( ; n > 0; n--, strA++, strW++) - if ((ret = toupperW((unsigned char)*strA) - toupperW(*strW)) || !*strA) break; - return ret; -} /*********************************************************************** * build_list * * Build a function list from a ';'-separated string. */ -static const WCHAR **build_list( const WCHAR *buffer ) +static const char **build_list( const WCHAR *buffer ) { int count = 1; const WCHAR *p = buffer; - const WCHAR **ret; + const char **ret; while ((p = strchrW( p, ';' ))) { @@ -98,17 +83,17 @@ static const WCHAR **build_list( const WCHAR *buffer ) } /* allocate count+1 pointers, plus the space for a copy of the string */ if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, - (count+1) * sizeof(WCHAR*) + (strlenW(buffer)+1) * sizeof(WCHAR) ))) + (count + 1) * sizeof(char *) + (strlenW(buffer) + 1) ))) { - WCHAR *str = (WCHAR *)(ret + count + 1); - WCHAR *p = str; + char *str = (char *)(ret + count + 1); + char *p = str; - strcpyW( str, buffer ); + while ((*str++ = *buffer++)); count = 0; for (;;) { ret[count++] = p; - if (!(p = strchrW( p, ';' ))) break; + if (!(p = strchr( p, ';' ))) break; *p++ = 0; } ret[count++] = NULL; @@ -185,25 +170,25 @@ void RELAY16_InitDebugLists(void) * * Check if a given module and function is in the list. */ -static BOOL check_list( const char *module, int ordinal, const char *func, const WCHAR **list ) +static BOOL check_list( const char *module, int ordinal, const char *func, const char **list ) { char ord_str[10]; sprintf( ord_str, "%d", ordinal ); for(; *list; list++) { - const WCHAR *p = strrchrW( *list, '.' ); + const char *p = strrchr( *list, '.' ); if (p && p > *list) /* check module and function */ { int len = p - *list; - if (strncmpiAW( module, *list, len-1 ) || module[len]) continue; + if (_strnicmp( module, *list, len-1 ) || module[len]) continue; if (p[1] == '*' && !p[2]) return TRUE; - if (!strcmpiAW( ord_str, p + 1 )) return TRUE; - if (func && !strcmpiAW( func, p + 1 )) return TRUE; + if (!strcmp( ord_str, p + 1 )) return TRUE; + if (func && !_strnicmp( func, p + 1, -1 )) return TRUE; } else /* function only */ { - if (func && !strcmpiAW( func, *list )) return TRUE; + if (func && !_strnicmp( func, *list, -1 )) return TRUE; } } return FALSE;

1 0

Alexandre Julliard : kernel32: Avoid using memchrW().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: e71ffcde30a7b21ea929dd770876873177024e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71ffcde30a7b21ea929dd77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:30:13 2020 +0200 kernel32: Avoid using memchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 18 ++++++++---------- dlls/kernel32/volume.c | 6 +++--- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index c7382fd7b3..434728c267 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -311,7 +311,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) WCHAR * szFile; const WCHAR *szLineStart, *szLineEnd; const WCHAR *szValueStart, *szEnd, *next_line; - int line = 0, len; + int len; PROFILESECTION *section, *first_section; PROFILESECTION **next_section; PROFILEKEY *key, *prev_key, **next_key; @@ -402,14 +402,10 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) while (next_line < szEnd) { szLineStart = next_line; - next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); - if (!next_line) next_line = memchrW(szLineStart, '\r', szEnd - szLineStart); - if (!next_line) next_line = szEnd; - else next_line++; + while (next_line < szEnd && *next_line != '\n' && *next_line != '\r') next_line++; + while (next_line < szEnd && (*next_line == '\n' || *next_line == '\r')) next_line++; szLineEnd = next_line; - line++; - /* get rid of white space */ while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; while ((szLineEnd > szLineStart) && PROFILE_isspaceW(szLineEnd[-1])) szLineEnd--; @@ -421,8 +417,8 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) for (len = szLineEnd - szLineStart; len > 0; len--) if (szLineStart[len - 1] == ']') break; if (!len) { - WARN("Invalid section header at line %d: %s\n", - line, debugstr_wn(szLineStart, (int)(szLineEnd - szLineStart)) ); + WARN("Invalid section header: %s\n", + debugstr_wn(szLineStart, (int)(szLineEnd - szLineStart)) ); } else { @@ -450,7 +446,8 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) /* get rid of white space after the name and before the start * of the value */ len = szLineEnd - szLineStart; - if ((szValueStart = memchrW( szLineStart, '=', szLineEnd - szLineStart )) != NULL) + for (szValueStart = szLineStart; szValueStart < szLineEnd; szValueStart++) if (*szValueStart == '=') break; + if (szValueStart < szLineEnd) { const WCHAR *szNameEnd = szValueStart; while ((szNameEnd > szLineStart) && PROFILE_isspaceW(szNameEnd[-1])) szNameEnd--; @@ -458,6 +455,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) szValueStart++; while (szValueStart < szLineEnd && PROFILE_isspaceW(*szValueStart)) szValueStart++; } + else szValueStart = NULL; if (len || !prev_key || *prev_key->name) { diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7967a55b2f..4f0f4a0a0f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -674,7 +674,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; FILE_FS_DEVICE_INFORMATION info; - WCHAR *p; + unsigned int i; enum fs_type type = FS_UNKNOWN; BOOL ret = FALSE; @@ -685,8 +685,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, return FALSE; } /* there must be exactly one backslash in the name, at the end */ - p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) ); - if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1) + for (i = 4; i < nt_name.Length / sizeof(WCHAR); i++) if (nt_name.Buffer[i] == '\\') break; + if (i != nt_name.Length / sizeof(WCHAR) - 1) { /* check if root contains an explicit subdir */ if (root[0] && root[1] == ':') root += 2;

1 0

Alexandre Julliard : kernel32: Reimplement Get/WritePrivateProfileStructW functions using exported APIs.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 30ad67dc1465e960bb77a2d38587373cb21a1899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ad67dc1465e960bb77a2d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:27:53 2020 +0200 kernel32: Reimplement Get/WritePrivateProfileStructW functions using exported APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 107 +++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8310ad6fe2..e4bd861b14 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1600,6 +1600,23 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, return ret; } +static int get_hex_byte( const WCHAR *p ) +{ + int val; + + if (*p >= '0' && *p <= '9') val = *p - '0'; + else if (*p >= 'A' && *p <= 'Z') val = *p - 'A' + 10; + else if (*p >= 'a' && *p <= 'z') val = *p - 'a' + 10; + else return -1; + val <<= 4; + p++; + if (*p >= '0' && *p <= '9') val += *p - '0'; + else if (*p >= 'A' && *p <= 'Z') val += *p - 'A' + 10; + else if (*p >= 'a' && *p <= 'z') val += *p - 'a' + 10; + else return -1; + return val; +} + /*********************************************************************** * GetPrivateProfileStructW (KERNEL32.@) * @@ -1608,70 +1625,29 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, LPVOID buf, UINT len, LPCWSTR filename) { - BOOL ret = FALSE; + BOOL ret = FALSE; + LPBYTE data = buf; + BYTE chksum = 0; + int val; + WCHAR *p, *buffer; - RtlEnterCriticalSection( &PROFILE_CritSect ); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (2 * len + 3) * sizeof(WCHAR) ))) return FALSE; - if (PROFILE_Open( filename, FALSE )) { - PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); - if (k) { - TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); - if (((strlenW(k->value) - 2) / 2) == len) - { - LPWSTR end, p; - BOOL valid = TRUE; - WCHAR c; - DWORD chksum = 0; - - end = k->value + strlenW(k->value); /* -> '\0' */ - /* check for invalid chars in ASCII coded hex string */ - for (p=k->value; p < end; p++) - { - if (!isxdigitW(*p)) - { - WARN("invalid char '%x' in file %s->[%s]->%s !\n", - *p, debugstr_w(filename), debugstr_w(section), debugstr_w(key)); - valid = FALSE; - break; - } - } - if (valid) - { - BOOL highnibble = TRUE; - BYTE b = 0, val; - LPBYTE binbuf = buf; - - end -= 2; /* don't include checksum in output data */ - /* translate ASCII hex format into binary data */ - for (p=k->value; p < end; p++) - { - c = toupperW(*p); - val = (c > '9') ? - (c - 'A' + 10) : (c - '0'); - - if (highnibble) - b = val << 4; - else - { - b += val; - *binbuf++ = b; /* feed binary data into output */ - chksum += b; /* calculate checksum */ - } - highnibble ^= 1; /* toggle */ - } - /* retrieve stored checksum value */ - c = toupperW(*p++); - b = ( (c > '9') ? (c - 'A' + 10) : (c - '0') ) << 4; - c = toupperW(*p); - b += (c > '9') ? (c - 'A' + 10) : (c - '0'); - if (b == (chksum & 0xff)) /* checksums match ? */ - ret = TRUE; - } - } - } + if (GetPrivateProfileStringW( section, key, NULL, buffer, 2 * len + 3, filename ) != 2 * len + 2) + goto done; + + for (p = buffer; len; p += 2, len--) + { + if ((val = get_hex_byte( p )) == -1) goto done; + *data++ = val; + chksum += val; } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + /* retrieve stored checksum value */ + if ((val = get_hex_byte( p )) == -1) goto done; + ret = ((BYTE)val == chksum); +done: + HeapFree( GetProcessHeap(), 0, buffer ); return ret; } @@ -1730,17 +1706,8 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, *p++ = hex[sum & 0xf]; *p++ = '\0'; - RtlEnterCriticalSection( &PROFILE_CritSect ); - - if (PROFILE_Open( filename, TRUE )) { - ret = PROFILE_SetString( section, key, outstring, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } - - RtlLeaveCriticalSection( &PROFILE_CritSect ); - + ret = WritePrivateProfileStringW( section, key, outstring, filename ); HeapFree( GetProcessHeap(), 0, outstring ); - return ret; }

1 0