wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

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

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 : 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 : 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 : 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 : 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 : include: Fix the spelling of some comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 70442de5332de98af9871baa93a23ef1ed6aec22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70442de5332de98af9871baa… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:21:36 2019 +0100 include: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objbase.h | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 78ec6d366d..75280d6de7 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -146,7 +146,7 @@ * - Each method is declared as a pointer to function field in the jump table. The implementation * will fill this jump table with appropriate values, probably using a static variable, and * initialize the lpVtbl field to point to this variable. - * - The IDirect3D_Xxx macros then just derefence the lpVtbl pointer and use the function pointer + * - The IDirect3D_Xxx macros then just dereference the lpVtbl pointer and use the function pointer * corresponding to the macro name. This emulates the behavior of a virtual table and should be * just as fast. * - This C code should be quite compatible with the Windows headers both for code that uses COM diff --git a/include/winbase.h b/include/winbase.h index c550ed816d..655eb48f0f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1262,7 +1262,7 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF (0x00000040) #define ACTCTX_FLAG_HMODULE_VALID (0x00000080) -/* flags to DeactiveActCtx */ +/* flags to DeactivateActCtx */ #define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION (0x00000001) /* flags to FindActCtxSection{Guid,String[AW]} */

1 0

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

12 Dec '19

Module: wine Branch: master Commit: 2cab6bea5e23e28f6a91ee9ab3d44c4b6667a489 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cab6bea5e23e28f6a91ee9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 12 11:20:53 2019 +0100 wined3d: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 34c3f061a9..9d98c79ce5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1472,7 +1472,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) mod = "_SAT"; else mod = ""; - /* Fragment samplers always have indentity mapping */ + /* Fragment samplers always have identity mapping */ if(sampler_idx >= WINED3D_MAX_FRAGMENT_SAMPLERS) { sampler_idx = priv->cur_vs_args->vertex.samplers[sampler_idx - WINED3D_MAX_FRAGMENT_SAMPLERS]; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c5d2eeaa47..95769014af 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4487,7 +4487,7 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * * this for now. * * Shouldn't be too hard to support with OpenGL, in theory just call - * glDrawArrays() instead of drawElements(). But the stream fequency value + * glDrawArrays() instead of drawElements(). But the stream frequency value * has a different meaning in that situation. */ if (!idx_size) { diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 81032745a0..c5df45541e 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -216,7 +216,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->position_transformed = TRUE; /* Find the streams used in the declaration. The vertex buffers have - * to be loaded when drawing, but filter tesselation pseudo streams. */ + * to be loaded when drawing, but filter tessellation pseudo streams. */ if (e->input_slot >= WINED3D_MAX_STREAMS) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60ddf74a0e..b73d5c7fec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3132,7 +3132,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tesselated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tessellated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset;

1 0

Alexandre Julliard : kernel32: Use the Get/SetComputerName functions from kernelbase.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: f2e5b8070776268912e1886d4516d7ddec6969fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e5b8070776268912e1886d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 19:19:12 2019 +0100 kernel32: Use the Get/SetComputerName functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 542 ++++-------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/tests/environ.c | 11 + 3 files changed, 61 insertions(+), 502 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2e5b8070776268912e1…

1 0

Alexandre Julliard : kernelbase: Implement the Get/SetComputerName functions.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 7822b854110dd1da0471489beab8f6ce04eb418b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7822b854110dd1da0471489b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 19:18:15 2019 +0100 kernelbase: Implement the Get/SetComputerName functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +-- dlls/kernelbase/registry.c | 216 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 221 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5b3e10f85b..afa3b0192f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -437,8 +437,8 @@ @ stdcall GetCommandLineW() @ stdcall GetCompressedFileSizeA(long ptr) @ stdcall GetCompressedFileSizeW(long ptr) -@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA -@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetComputerNameExA(long ptr ptr) +@ stdcall GetComputerNameExW(long ptr ptr) @ stdcall GetConsoleCP() @ stdcall GetConsoleCursorInfo(long ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @@ -1397,11 +1397,11 @@ @ stdcall SetCommMask(long long) @ stdcall SetCommState(long ptr) @ stdcall SetCommTimeouts(long ptr) -@ stdcall SetComputerNameA(str) kernel32.SetComputerNameA +@ stdcall SetComputerNameA(str) # @ stub SetComputerNameEx2W -@ stdcall SetComputerNameExA(long str) kernel32.SetComputerNameExA -@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW -@ stdcall SetComputerNameW(wstr) kernel32.SetComputerNameW +@ stdcall SetComputerNameExA(long str) +@ stdcall SetComputerNameExW(long wstr) +@ stdcall SetComputerNameW(wstr) @ stdcall SetConsoleActiveScreenBuffer(long) @ stdcall SetConsoleCP(long) @ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index b3297a3ad5..72b7711714 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -109,6 +109,8 @@ static struct list reg_mui_cache = LIST_INIT(reg_mui_cache); /* MRU */ static unsigned int reg_mui_cache_count; #define REG_MUI_CACHE_SIZE 8 +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + /* check if value type needs string conversion (Ansi<->Unicode) */ static inline BOOL is_string( DWORD type ) { @@ -1374,7 +1376,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD data = pdb + 1; pdb->SystemNameOffset = sizeof(*pdb); pdb->SystemNameLength = (data_size - sizeof(*pdb)) / sizeof(WCHAR); - if (!GetComputerNameW(data, &pdb->SystemNameLength)) + if (!GetComputerNameExW(ComputerNameNetBIOS, data, &pdb->SystemNameLength)) return ERROR_MORE_DATA; pdb->SystemNameLength++; @@ -3078,6 +3080,218 @@ BOOL WINAPI DECLSPEC_HOTPATCH DnsHostnameToComputerNameExW( const WCHAR *hostnam } +/*********************************************************************** + * GetComputerNameExA (kernelbase.@) + */ +BOOL WINAPI GetComputerNameExA( COMPUTER_NAME_FORMAT type, char *name, DWORD *len ) +{ + BOOL ret = FALSE; + DWORD lenA, lenW = 0; + WCHAR *buffer; + + GetComputerNameExW( type, NULL, &lenW ); + if (GetLastError() != ERROR_MORE_DATA) return FALSE; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (GetComputerNameExW( type, buffer, &lenW )) + { + lenA = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); + if (lenA > *len) + { + *len = lenA; + SetLastError( ERROR_MORE_DATA ); + } + else + { + WideCharToMultiByte( CP_ACP, 0, buffer, -1, name, *len, NULL, NULL ); + *len = lenA - 1; + ret = TRUE; + } + } + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + + +/*********************************************************************** + * GetComputerNameExW (kernelbase.@) + */ +BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, WCHAR *name, DWORD *len ) +{ + const WCHAR *keyname, *valuename; + LRESULT ret; + HKEY key; + + switch (type) + { + case ComputerNameNetBIOS: + case ComputerNamePhysicalNetBIOS: + keyname = L"System\\CurrentControlSet\\Control\\ComputerName\\ActiveComputerName"; + valuename = L"ComputerName"; + break; + case ComputerNameDnsHostname: + case ComputerNamePhysicalDnsHostname: + keyname = L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters"; + valuename = L"Hostname"; + break; + case ComputerNameDnsDomain: + case ComputerNamePhysicalDnsDomain: + keyname = L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters"; + valuename = L"Domain"; + break; + case ComputerNameDnsFullyQualified: + case ComputerNamePhysicalDnsFullyQualified: + { + WCHAR buffer[256]; + DWORD size = ARRAY_SIZE(buffer); + + if (!GetComputerNameExW( ComputerNameDnsHostname, buffer, &size )) return FALSE; + lstrcatW( buffer, L"." ); + size = ARRAY_SIZE(buffer) - lstrlenW(buffer); + if (!GetComputerNameExW( ComputerNameDnsDomain, buffer + lstrlenW(buffer), &size )) return FALSE; + size = lstrlenW(buffer); + if (name && size < *len) + { + if (name) lstrcpyW( name, buffer ); + *len = size; + return TRUE; + } + *len = size + 1; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (!(ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &key ))) + { + DWORD size = *len * sizeof(WCHAR); + ret = RegQueryValueExW( key, valuename, NULL, NULL, (BYTE *)name, &size ); + if (!name) ret = ERROR_MORE_DATA; + else if (!ret) size -= sizeof(WCHAR); + *len = size / sizeof(WCHAR); + RegCloseKey( key ); + } + TRACE("-> %lu %s\n", ret, debugstr_w(name) ); + if (ret) SetLastError( ret ); + return !ret; +} + + +/*********************************************************************** + * SetComputerNameA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameA( const char *name ) +{ + BOOL ret; + DWORD len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); + ret = SetComputerNameExW( ComputerNamePhysicalNetBIOS, nameW ); + HeapFree( GetProcessHeap(), 0, nameW ); + return ret; +} + + +/*********************************************************************** + * SetComputerNameW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameW( const WCHAR *name ) +{ + return SetComputerNameExW( ComputerNamePhysicalNetBIOS, name ); +} + + +/*********************************************************************** + * SetComputerNameExA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameExA( COMPUTER_NAME_FORMAT type, const char *name ) +{ + BOOL ret; + DWORD len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); + ret = SetComputerNameExW( type, nameW ); + HeapFree( GetProcessHeap(), 0, nameW ); + return ret; +} + + +/*********************************************************************** + * SetComputerNameExW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameExW( COMPUTER_NAME_FORMAT type, const WCHAR *name ) +{ + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD size; + HKEY key; + LRESULT ret; + + TRACE( "%u %s\n", type, debugstr_w( name )); + + switch (type) + { + case ComputerNameDnsHostname: + case ComputerNamePhysicalDnsHostname: + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"Hostname", 0, REG_SZ, + (BYTE *)name, (lstrlenW(name) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + /* fall through */ + + case ComputerNameNetBIOS: + case ComputerNamePhysicalNetBIOS: + /* @@ Wine registry key: HKCU\Software\Wine\Network */ + if (!RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Network", 0, KEY_READ, &key )) + { + BOOL use_dns = TRUE; + size = sizeof(buffer); + if (!RegQueryValueExW( key, L"UseDnsComputerName", NULL, NULL, (BYTE *)buffer, &size )) + use_dns = IS_OPTION_TRUE( buffer[0] ); + RegCloseKey( key ); + if (!use_dns) + { + ret = ERROR_ACCESS_DENIED; + break; + } + } + size = ARRAY_SIZE( buffer ); + if (!DnsHostnameToComputerNameExW( name, buffer, &size )) return FALSE; + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName\\ComputerName", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"ComputerName", 0, REG_SZ, + (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + break; + + case ComputerNameDnsDomain: + case ComputerNamePhysicalDnsDomain: + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"Domain", 0, REG_SZ, + (BYTE *)name, (lstrlenW(name) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + break; + default: + ret = ERROR_INVALID_PARAMETER; + break; + } + if (ret) SetLastError( ret ); + return !ret; +} + struct USKEY { HKEY HKCUstart; /* Start key in CU hive */

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019