wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Rémi Bernon : ntdll: Use a dedicated member for shared heap flag.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 9d34933f24e9152296f7ae3ca5bd0003afb1413b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d34933f24e9152296f7ae3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:31 2022 +0200 ntdll: Use a dedicated member for shared heap flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 346bcf3c10c..01364016271 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -153,6 +153,7 @@ typedef struct tagHEAP /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ @@ -687,7 +688,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) /* Decommit the end of the heap */ - if (!(subheap->heap->flags & HEAP_SHARED)) HEAP_Decommit( subheap, pFree + 1 ); + if (!(subheap->heap->shared)) HEAP_Decommit( subheap, pFree + 1 ); } @@ -922,6 +923,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap = address; heap->flags = flags; + heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); list_init( &heap->subheap_list ); @@ -967,7 +969,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap->critSection.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HEAP.critSection"); } - if (flags & HEAP_SHARED) + if (heap->shared) { /* let's assume that only one thread at a time will try to do this */ HANDLE sem = heap->critSection.LockSemaphore;

1 0

Rémi Bernon : kernel32/tests: Reduce the number of GlobalAlloc size tests.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: eb087788db19018ddb1420025d9d6a5a2a3a18e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb087788db19018ddb142002… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:30 2022 +0200 kernel32/tests: Reduce the number of GlobalAlloc size tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index a131a7f56e0..e1cda94f78c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -998,7 +998,7 @@ static void test_GlobalAlloc(void) mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); - for (alloc_size = 1; alloc_size < 0x10000000; alloc_size <<= 1) + for (alloc_size = 1; alloc_size < 0x10000000; alloc_size <<= 5) { winetest_push_context( "size %#Ix", alloc_size );

1 0

Rémi Bernon : kernel32/tests: Tweak tests results for w7pro64.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: af6dd8eb0c84287553ea982bd93f1f43f6aa13c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af6dd8eb0c84287553ea982b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:29 2022 +0200 kernel32/tests: Tweak tests results for w7pro64. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 53cff284c6f..a131a7f56e0 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -328,10 +328,12 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x80 * sizeof(void *)) ); + /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + + ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); size = HeapSize( heap, 0, ptr ); - ok( size == alloc_size - (0x400 + 0x80 * sizeof(void *)), + ok( size == alloc_size - (0x400 + 0x100 * sizeof(void *)), "HeapSize returned %#Ix, error %lu\n", size, GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); @@ -438,7 +440,7 @@ static void test_HeapCreate(void) "got Region.dwCommittedSize %#lx\n", entries[0].Region.dwCommittedSize ); todo_wine ok( entries[0].Region.dwUnCommittedSize == 0x10000 - entries[0].Region.dwCommittedSize || - entries[0].Region.dwUnCommittedSize == 0x40000 - entries[0].Region.dwCommittedSize /* win7 */, + entries[0].Region.dwUnCommittedSize == 0x10000 * sizeof(void *) - entries[0].Region.dwCommittedSize /* win7 */, "got Region.dwUnCommittedSize %#lx\n", entries[0].Region.dwUnCommittedSize ); todo_wine ok( (BYTE *)entries[0].Region.lpFirstBlock == (BYTE *)entries[0].lpData + entries[0].cbData + 2 * sizeof(void *) || @@ -493,7 +495,7 @@ static void test_HeapCreate(void) ok( entries[3].lpData == ptr, "got lpData %p\n", entries[3].lpData ); todo_wine ok( entries[3].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[3].cbData ); - ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 0x20 /* win7 */, + ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[3].cbOverhead ); todo_wine ok( entries[3].iRegionIndex == 64, "got iRegionIndex %d\n", entries[3].iRegionIndex ); @@ -520,7 +522,7 @@ static void test_HeapCreate(void) ok( entries[4].lpData == ptr1, "got lpData %p\n", entries[4].lpData ); todo_wine ok( entries[4].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[4].cbData ); - ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 0x20 /* win7 */, + ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[4].cbOverhead ); todo_wine ok( entries[4].iRegionIndex == 64, "got iRegionIndex %d\n", entries[4].iRegionIndex );

1 0

Hugh McMaster : regedit: Remove unused WCHAR szHexEditClass from main header.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 498e0da0957c573d11c31cdfec04166d9cb12dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498e0da0957c573d11c31cdf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:43 2022 +1000 regedit: Remove unused WCHAR szHexEditClass from main header. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.h | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 29ecb433916..6ad7835e4df 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -96,7 +96,6 @@ extern HFONT hFont; extern enum OPTION_FLAGS Options; extern const WCHAR szChildClass[]; -extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[]; extern DWORD g_columnToSort;

1 0

Hugh McMaster : regedit: Mark WCHAR szTitle static.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 4b964b82104fb3a0949faaa6434583ca4bd750fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b964b82104fb3a0949faaa6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:42 2022 +1000 regedit: Mark WCHAR szTitle static. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- programs/regedit/main.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 664821f6a5d..ecc06a5280e 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -51,7 +51,7 @@ HMENU hPopupMenus = 0; UINT nClipboardFormat; #define MAX_LOADSTRING 100 -WCHAR szTitle[MAX_LOADSTRING]; +static WCHAR szTitle[MAX_LOADSTRING]; const WCHAR szChildClass[] = L"REGEDIT"; static const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index d32000f78ac..29ecb433916 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -95,7 +95,6 @@ extern HMENU hPopupMenus; extern HFONT hFont; extern enum OPTION_FLAGS Options; -extern WCHAR szTitle[]; extern const WCHAR szChildClass[]; extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[];

1 0

Hugh McMaster : regedit: Mark WCHAR szFrameClass static.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: a6a92b66c7610ace096606870957463b1f314972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a92b66c7610ace09660687… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:41 2022 +1000 regedit: Mark WCHAR szFrameClass static. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- programs/regedit/main.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 99706b531d5..664821f6a5d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -53,7 +53,7 @@ UINT nClipboardFormat; #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; const WCHAR szChildClass[] = L"REGEDIT"; -const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; +static const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { diff --git a/programs/regedit/main.h b/programs/regedit/main.h index ae034405646..d32000f78ac 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -96,7 +96,6 @@ extern HFONT hFont; extern enum OPTION_FLAGS Options; extern WCHAR szTitle[]; -extern const WCHAR szFrameClass[]; extern const WCHAR szChildClass[]; extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[];

1 0

Hugh McMaster : regedit: Use wide character string literals in regproc.c.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: f55131db39372850bbf00cb90c17c97317c28d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55131db39372850bbf00cb9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:40 2022 +1000 regedit: Use wide character string literals in regproc.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 83 ++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 55 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5bb991865e6..9dea3ebd446 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -331,18 +331,13 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) { struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; - static const WCHAR quote[] = {'"'}; - static const WCHAR hex[] = {'h','e','x',':'}; - static const WCHAR dword[] = {'d','w','o','r','d',':'}; - static const WCHAR hexp[] = {'h','e','x','('}; - static const struct data_type data_types[] = { - /* tag len type parse type */ - { quote, 1, REG_SZ, REG_SZ }, - { hex, 4, REG_BINARY, REG_BINARY }, - { dword, 6, REG_DWORD, REG_DWORD }, - { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ - { NULL, 0, 0, 0 } + /* tag len type parse type */ + { L"\"", 1, REG_SZ, REG_SZ }, + { L"hex:", 4, REG_BINARY, REG_BINARY }, + { L"dword:", 6, REG_DWORD, REG_DWORD }, + { L"hex(", 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } }; const struct data_type *ptr; @@ -542,21 +537,17 @@ enum reg_versions { static enum reg_versions parse_file_header(const WCHAR *s) { - static const WCHAR header_31[] = {'R','E','G','E','D','I','T',0}; - static const WCHAR header_40[] = {'R','E','G','E','D','I','T','4',0}; - static const WCHAR header_50[] = {'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; + static const WCHAR header_31[] = L"REGEDIT"; while (*s == ' ' || *s == '\t') s++; if (!lstrcmpW(s, header_31)) return REG_VERSION_31; - if (!lstrcmpW(s, header_40)) + if (!lstrcmpW(s, L"REGEDIT4")) return REG_VERSION_40; - if (!lstrcmpW(s, header_50)) + if (!lstrcmpW(s, L"Windows Registry Editor Version 5.00")) return REG_VERSION_50; /* The Windows version accepts registry file headers beginning with "REGEDIT" and ending @@ -610,13 +601,13 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) { WCHAR *line, *value; - static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T'}; + static WCHAR hkcr[] = L"HKEY_CLASSES_ROOT"; unsigned int key_end = 0; if (!(line = get_line(parser->file))) return NULL; - if (wcsncmp(line, hkcr, ARRAY_SIZE(hkcr))) + if (wcsncmp(line, hkcr, lstrlenW(hkcr))) return line; /* get key name */ @@ -1037,8 +1028,7 @@ static WCHAR *get_lineW(FILE *fp) while (next) { - static const WCHAR line_endings[] = {'\r','\n',0}; - WCHAR *p = wcspbrk(line, line_endings); + WCHAR *p = wcspbrk(line, L"\r\n"); if (!p) { size_t len, count; @@ -1207,15 +1197,14 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) { - static const WCHAR quoted_fmt[] = {'"','%','s','"','=',0}; - static const WCHAR default_name[] = {'@','=',0}; + static const WCHAR default_name[] = L"@="; size_t line_len; if (name && *name) { WCHAR *str = REGPROC_escape_string(name, len, &line_len); WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); - line_len = swprintf(buf, line_len + 4, quoted_fmt, str); + line_len = swprintf(buf, line_len + 4, L"\"%s\"=", str); REGPROC_write_line(fp, buf, unicode); heap_free(buf); heap_free(str); @@ -1233,28 +1222,24 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) { size_t len = 0, line_len; WCHAR *str; - static const WCHAR fmt[] = {'"','%','s','"',0}; if (size) len = size / sizeof(WCHAR) - 1; str = REGPROC_escape_string(data, len, &line_len); *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); - swprintf(*buf, line_len + 3, fmt, str); + swprintf(*buf, line_len + 3, L"\"%s\"", str); heap_free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) { - static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = heap_xalloc(15 * sizeof(WCHAR)); - swprintf(*buf, 15, fmt, *data); + swprintf(*buf, 15, L"dword:%08x", *data); } static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) { - static const WCHAR hex[] = {'h','e','x',':',0}; - static const WCHAR hexp_fmt[] = {'h','e','x','(','%','x',')',':',0}; + static const WCHAR hex[] = L"hex:"; size_t line_len; if (type == REG_BINARY) @@ -1265,7 +1250,7 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) else { WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); - line_len = swprintf(buf, 15, hexp_fmt, type); + line_len = swprintf(buf, 15, L"hex(%x):", type); REGPROC_write_line(fp, buf, unicode); heap_free(buf); } @@ -1278,8 +1263,6 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, void *data, DWORD size, BOOL unicode) { - static const WCHAR fmt[] = {'%','0','2','x',0}; - static const WCHAR hex_concat[] = {'\\','\r','\n',' ',' ',0}; size_t num_commas, i, pos; line_len += export_hex_data_type(fp, type, unicode); @@ -1294,7 +1277,7 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, for (i = 0, pos = 0; i < size; i++) { - pos += swprintf(*buf + pos, 3, fmt, ((BYTE *)data)[i]); + pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); if (i == num_commas) break; (*buf)[pos++] = ','; (*buf)[pos] = 0; @@ -1303,7 +1286,7 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, if (line_len >= MAX_HEX_CHARS) { REGPROC_write_line(fp, *buf, unicode); - REGPROC_write_line(fp, hex_concat, unicode); + REGPROC_write_line(fp, L"\\\r\n ", unicode); line_len = 2; pos = 0; } @@ -1312,9 +1295,7 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, static void export_newline(FILE *fp, BOOL unicode) { - static const WCHAR newline[] = {'\r','\n',0}; - - REGPROC_write_line(fp, newline, unicode); + REGPROC_write_line(fp, L"\r\n", unicode); } static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type, @@ -1356,21 +1337,19 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; - static const WCHAR fmt[] = {'%','s','\\','%','s',0}; subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); - swprintf(subkey_path, path_len + subkey_len + 2, fmt, path, subkey_name); + swprintf(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); return subkey_path; } static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) { - static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); - swprintf(buf, lstrlenW(name) + 7, fmt, name); + swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); REGPROC_write_line(fp, buf, unicode); heap_free(buf); } @@ -1453,22 +1432,18 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) { FILE *file; - static const WCHAR hyphen[] = {'-',0}; - if (!lstrcmpW(file_name, hyphen)) + if (!lstrcmpW(file_name, L"-")) { file = stdout; _setmode(_fileno(file), _O_BINARY); } else { - static const WCHAR wb_mode[] = {'w','b',0}; - - file = _wfopen(file_name, wb_mode); + file = _wfopen(file_name, L"wb"); if (!file) { - static const WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; - _wperror(regedit); + _wperror(L"regedit"); error_exit(STRING_CANNOT_OPEN_FILE, file_name); } } @@ -1476,12 +1451,10 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if (unicode) { static const BYTE bom[] = {0xff,0xfe}; - static const WCHAR header[] = {'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; + static const WCHAR header[] = L"Windows Registry Editor Version 5.00\r\n"; fwrite(bom, sizeof(BYTE), ARRAY_SIZE(bom), file); - fwrite(header, sizeof(WCHAR), ARRAY_SIZE(header), file); + fwrite(header, sizeof(WCHAR), lstrlenW(header), file); } else fputs("REGEDIT4\r\n", file);

1 0

Hugh McMaster : regedit: Use wide character string literals in main.c.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 379c90a0ebd89b2958042549d08b5c61a5f3cebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=379c90a0ebd89b2958042549… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:39 2022 +1000 regedit: Use wide character string literals in main.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index e0f89255461..99706b531d5 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -34,16 +34,9 @@ WCHAR g_pszDefaultValueName[64]; BOOL ProcessCmdLine(WCHAR *cmdline); -static const WCHAR hkey_local_machine[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; -static const WCHAR hkey_users[] = {'H','K','E','Y','_','U','S','E','R','S',0}; -static const WCHAR hkey_classes_root[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; -static const WCHAR hkey_current_config[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; -static const WCHAR hkey_current_user[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; -static const WCHAR hkey_dyn_data[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}; - -const WCHAR *reg_class_namesW[] = {hkey_local_machine, hkey_users, - hkey_classes_root, hkey_current_config, - hkey_current_user, hkey_dyn_data +const WCHAR *reg_class_namesW[] = {L"HKEY_LOCAL_MACHINE", L"HKEY_USERS", + L"HKEY_CLASSES_ROOT", L"HKEY_CURRENT_CONFIG", + L"HKEY_CURRENT_USER", L"HKEY_DYN_DATA" }; /******************************************************************************* @@ -56,13 +49,11 @@ HWND hStatusBar; HMENU hMenuFrame; HMENU hPopupMenus = 0; UINT nClipboardFormat; -const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C','O','R','R','E','C','T',' ','F','O','R','M','A','T',0}; - #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; -const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0}; -const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; +const WCHAR szChildClass[] = L"REGEDIT"; +const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { @@ -96,7 +87,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) /* register our hex editor control */ HexEdit_Register(); - nClipboardFormat = RegisterClipboardFormatW(strClipboardFormat); + nClipboardFormat = RegisterClipboardFormatW(L"TODO: Set correct format"); hFrameWnd = CreateWindowExW(0, szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE,

1 0

Hugh McMaster : regedit: Use wide character string literals in treeview.c.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 85fb14ff284d15bb7f599117a2b80af74fb1f9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85fb14ff284d15bb7f599117… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:38 2022 +1000 regedit: Use wide character string literals in treeview.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 15a51360a30..5ba4628681a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -543,12 +543,12 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) { TVINSERTSTRUCTW tvins; HTREEITEM hRoot; - static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, - hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, - hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, - hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}, - hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, - hkdd[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}; + static WCHAR hkcr[] = L"HKEY_CLASSES_ROOT", + hkcu[] = L"HKEY_CURRENT_USER", + hklm[] = L"HKEY_LOCAL_MACHINE", + hku[] = L"HKEY_USERS", + hkcc[] = L"HKEY_CURRENT_CONFIG", + hkdd[] = L"HKEY_DYN_DATA"; tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ @@ -694,11 +694,10 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) { RECT rcClient; HWND hwndTV; - WCHAR TreeView[] = {'T','r','e','e',' ','V','i','e','w',0}; /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); - hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, + hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"Tree View", WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom,

1 0

Hugh McMaster : regedit: Use wide character string literals in regedit.c.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 039fc87827916100a574b62dceb1be6b40879e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039fc87827916100a574b62d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:37 2022 +1000 regedit: Use wide character string literals in regedit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index d2e27340300..6a50a63226f 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -107,16 +107,14 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) switch (action) { case ACTION_ADD: { WCHAR *filename = argv[*i]; - WCHAR hyphen[] = {'-',0}; WCHAR *realname = NULL; FILE *reg_file; - if (!lstrcmpW(filename, hyphen)) + if (!lstrcmpW(filename, L"-")) reg_file = stdin; else { int size; - WCHAR rb_mode[] = {'r','b',0}; size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); if (size > 0) @@ -130,11 +128,10 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) heap_free(realname); return; } - reg_file = _wfopen(realname, rb_mode); + reg_file = _wfopen(realname, L"rb"); if (reg_file == NULL) { - WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; - _wperror(regedit); + _wperror(L"regedit"); output_message(STRING_CANNOT_OPEN_FILE, filename); heap_free(realname); return;

1 0

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 April 2022