December 2019 - Wine-commits

Francois Gouget : wineps.drv: Avoid unneeded abbreviations in comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: d59659c79de901cdad1f68e57beb29f83c77fd8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d59659c79de901cdad1f68e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:21:48 2019 +0100 wineps.drv: Avoid unneeded abbreviations in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ppd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index aa013940fe..662dbe6db7 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -283,7 +283,7 @@ static BOOL get_line( char *buf, int size, struct map_context *ctx ) * * PSDRV_PPDGetInvocationValue * - * Passed string that should be surrounded by `"'s, return string alloced + * Passed string that should be surrounded by `"'s, return string allocated * from process heap. */ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple) @@ -318,7 +318,7 @@ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple * PSDRV_PPDGetQuotedValue * * Passed string that should be surrounded by `"'s. Expand <xx> as hex - * return string alloced from process heap. + * return string allocated from process heap. */ static BOOL PSDRV_PPDGetQuotedValue(struct map_context *ctx, PPDTuple *tuple) { @@ -517,7 +517,7 @@ static DUPLEX *get_duplex( PPD *ppd, const char *name ) * * PSDRV_PPDGetWord * - * Returns ptr alloced from heap to first word in str. Strips leading spaces. + * Returns ptr allocated from heap to first word in str. Strips leading spaces. * Puts ptr to next word in next */ static char *PSDRV_PPDGetWord(char *str, char **next)

1 0

Francois Gouget : ole32: Fix the spelling of a couple of comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: a46ccda5c04b487b3dca49d5880c386ecab4c96d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46ccda5c04b487b3dca49d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:22:02 2019 +0100 ole32: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index ea03e9b0a2..9c7cb0977f 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -60,7 +60,7 @@ typedef struct { /* this is the static object instance */ static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; -/* with a spy active all calls from pre to post methods are threadsave */ +/* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -285,8 +285,8 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * * NOTES * FIXME returns: - * win95: size allocated (4 byte boundarys) - * win2k: size originally requested !!! (allocated on 8 byte boundarys) + * win95: size allocated (4 byte boundaries) + * win2k: size originally requested !!! (allocated on 8 byte boundaries) */ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) {

1 0

Francois Gouget : usp10: Fix the spelling of some comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: bd2cc27d55727fecadcc677ccb099d544d2de7ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2cc27d55727fecadcc677c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:22:14 2019 +0100 usp10: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 4 ++-- dlls/usp10/shape.c | 2 +- dlls/usp10/usp10.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 34ca955dcb..e1d0a11697 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions @@ -1083,7 +1083,7 @@ search: } /************************************************************* - * BIDI_DeterminLevels + * BIDI_DetermineLevels */ BOOL BIDI_DetermineLevels( const WCHAR *lpString, /* [in] The string for which information is to be returned */ diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 86e80aacd5..8d5d1265fa 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -998,7 +998,7 @@ static inline BOOL left_join_causing(CHAR joining_type) static inline BOOL word_break_causing(WCHAR chr) { - /* we are working within a string of characters already guareented to + /* we are working within a string of characters already guaranteed to be within one script, Syriac, so we do not worry about any character other than the space character outside of that range */ return (chr == 0 || chr == 0x20 ); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f66e85cc48..dd6a854356 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3009,7 +3009,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, else /* (glyph_index >= cGlyphs) */ i = cChars; - /* If not snaping in the reverse direction (such as Hebrew) Then 0 + /* If not snapping in the reverse direction (such as Hebrew) Then 0 point flow to the next character */ if (direction < 0) {

1 0

Francois Gouget : wininet: Fix the spelling of a comment.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 84069679a407cf0b5b8d185b5d98e9afdb933c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84069679a407cf0b5b8d185b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:22:39 2019 +0100 wininet: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5e21076953..94491689df 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3928,7 +3928,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) dwCode = ERROR_INTERNET_CANNOT_CONNECT; break; - case 426: /* Connection closed, transer aborted. */ + case 426: /* Connection closed, transfer aborted. */ dwCode = ERROR_INTERNET_CONNECTION_ABORTED; break;

1 0

Francois Gouget : ntdll: Fix the spelling of some comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 101be282a6f8a99a31bb5dc348532d98d0c8cbbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=101be282a6f8a99a31bb5dc3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:22:59 2019 +0100 ntdll: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a65703d6f9..26acc066cd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3281,7 +3281,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io * restart [I] restart EA scan * * RETURNS - * Success: 0. Atrributes read into buffer + * Success: 0. Attributes read into buffer * Failure: An NTSTATUS error code describing the error. */ NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 35b89df52e..0dc6fc3390 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2143,8 +2143,8 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) * RtlTryAcquireSRWLockExclusive (NTDLL.@) * * NOTES - * Similar to AcquireSRWLockExclusive recusive calls are not allowed - * and will fail with return value FALSE. + * Similarly to AcquireSRWLockExclusive, recursive calls are not allowed + * and will fail with a FALSE return value. */ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) {

1 0

Francois Gouget : oleaut32: Fix the spelling of some comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 8ecd037962701f62c7a5b33d230d5b92484a0e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ecd037962701f62c7a5b33d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:24:05 2019 +0100 oleaut32: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 7e6398a162..39d6fddee5 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -176,7 +176,7 @@ done: * (linked at run-time), as opposed to early-bound (linked at compile time). * * The interface is used by objects that wish to called by scripting - * languages such as VBA, in order to minimise the amount of COM and C/C++ + * languages such as VBA, in order to minimize the amount of COM and C/C++ * knowledge required, or by objects that wish to live out of process from code * that will call their methods. * diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7daf2f032c..8a498defbc 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5934,7 +5934,7 @@ static void test_bstr_cache(void) str = SysAllocStringLen(NULL, 24); ok(str == strs[0], "str != strs[0]\n"); - /* Smaller buffers may also use larget cached buffers */ + /* Smaller buffers may also use larger cached buffers */ str2 = SysAllocStringLen(NULL, 16); ok(str2 == strs[1], "str2 != strs[1]\n"); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 528fe6372c..451753e23b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4202,7 +4202,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, letter of the name, else the next WORD is an offset to the arg type and paramName points to the first letter. So let's take one char off paramName and see if we're - pointing at an alpha-numeric char. However if *pArg is + pointing at an alphanumeric char. However if *pArg is 0xffff or 0xfffe then the param has no name, the former meaning that the next WORD is the type, the latter meaning that the next WORD is an offset to the type. */ diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 71e8d080c4..9c700b11a7 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -325,7 +325,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct {

1 0

Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator PromptNew.
by Alexandre Julliard 12 Dec '19

12 Dec '19

1 0

Alexandre Julliard : kernelbase: Save registry keys directly to the destination file.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 2d0e8ff672058336ce0ef48eeb99accbd51015ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e8ff672058336ce0ef48e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 11:16:59 2019 +0100 kernelbase: Save registry keys directly to the destination file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 51 ++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index ad9a2a3366..0961cb0850 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2263,12 +2263,10 @@ LSTATUS WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename ) */ LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) { - static const WCHAR format[] = - {'r','e','g','%','0','4','x','.','t','m','p',0}; - WCHAR buffer[MAX_PATH]; - int count = 0; - LPWSTR nameW; - DWORD ret, err; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; HANDLE handle; TRACE( "(%p,%s,%p)\n", hkey, debugstr_w(file), sa ); @@ -2276,39 +2274,20 @@ LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, if (!file || !*file) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; - err = GetLastError(); - GetFullPathNameW( file, ARRAY_SIZE( buffer ), buffer, &nameW ); - - for (;;) - { - swprintf( nameW, 16, format, count++ ); - handle = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); - if (handle != INVALID_HANDLE_VALUE) break; - if ((ret = GetLastError()) != ERROR_FILE_EXISTS) goto done; - - /* Something gone haywire ? Please report if this happens abnormally */ - if (count >= 100) - MESSAGE("Wow, we are already fiddling with a temp file %s with an ordinal as high as %d !\nYou might want to delete all corresponding temp files in that directory.\n", debugstr_w(buffer), count); - } - - ret = RtlNtStatusToDosError(NtSaveKey(hkey, handle)); + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( file, &nameW, NULL, NULL ))) + return RtlNtStatusToDosError( status ); - CloseHandle( handle ); - if (!ret) + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, sa ); + status = NtCreateFile( &handle, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, FILE_NON_DIRECTORY_FILE, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + RtlFreeUnicodeString( &nameW ); + if (!status) { - if (!MoveFileExW( buffer, file, MOVEFILE_REPLACE_EXISTING )) - { - ERR( "Failed to move %s to %s\n", debugstr_w(buffer), - debugstr_w(file) ); - ret = GetLastError(); - } + status = NtSaveKey( hkey, handle ); + CloseHandle( handle ); } - if (ret) DeleteFileW( buffer ); - -done: - SetLastError( err ); /* restore last error code */ - return ret; + return RtlNtStatusToDosError( status ); }

1 0

Michael Stefaniuc : dmband: Move debugstr_fourcc() to dmobject.h.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: bc3d4b5d76ab251ff22b7dd263c54c185a327985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc3d4b5d76ab251ff22b7dd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:55 2019 +0100 dmband: Move debugstr_fourcc() to dmobject.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 7 ------- dlls/dmband/dmobject.h | 12 ++++++++++-- dlls/dmband/dmutils.c | 9 +-------- dlls/dmband/dmutils.h | 2 -- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index 25f3198d2b..3b71a2719c 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -34,13 +34,6 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) -static inline const char *debugstr_fourcc(DWORD fourcc) -{ - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 4a721cc152..9e287a4126 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,13 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index af24054bf4..2401b20a60 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -40,6 +40,7 @@ #include "dmusics.h" #include "dmutils.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -296,14 +297,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - /* returns name of given GUID */ const char *debugstr_dmguid (const GUID *id) { static const guid_info guids[] = { diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index bb93e05c2b..5a845a81a8 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -52,8 +52,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : dmband: Move debugstr_dmguid() to dmobject.c.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 864e373c7541d99827d319f50d59aca67336c050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864e373c7541d99827d319f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:56 2019 +0100 dmband: Move debugstr_dmguid() to dmobject.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmobject.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 1 + dlls/dmband/dmutils.c | 184 -------------------------------------------- dlls/dmband/dmutils.h | 9 --- 5 files changed, 191 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=864e373c7541d99827d3…

1 0