July 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Use a helper function to export hex data and REG_DWORD data.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 6515837adadf1bb6869385b9171ac4f867e03ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6515837adadf1bb6869385b91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:28:56 2017 +0000 regedit: Use a helper function to export hex data and REG_DWORD data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 109 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 75843c5..d7a55fd 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1246,11 +1246,7 @@ static void export_hkey(FILE *file, DWORD value_type, BYTE **val_buf, DWORD *val { DWORD line_len = 0; DWORD val_size1 = *val_size; - - switch (value_type) { - case REG_SZ: - { - WCHAR* wstr = (WCHAR*)*val_buf; + WCHAR *wstr = (WCHAR *)*val_buf; if (val_size1 < sizeof(WCHAR) || val_size1 % sizeof(WCHAR) || wstr[val_size1 / sizeof(WCHAR) - 1]) { @@ -1270,15 +1266,6 @@ static void export_hkey(FILE *file, DWORD value_type, BYTE **val_buf, DWORD *val REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); lstrcpyW(*line_buf + line_len, end); } - break; - } - case REG_NONE: - case REG_EXPAND_SZ: - case REG_MULTI_SZ: - case REG_BINARY: - default: - REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); - } REGPROC_write_line(file, *line_buf, unicode); } @@ -1427,15 +1414,93 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) return line_len; } -static void export_dword_data(FILE *fp, void *data, BOOL unicode) +static void export_dword_data(WCHAR **buf, DWORD *data) { - static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; - WCHAR *buf; + static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; + + *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + sprintfW(*buf, fmt, *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}; + size_t line_len; + + if (type == REG_BINARY) + { + line_len = lstrlenW(hex); + REGPROC_write_line(fp, hex, unicode); + } + else + { + WCHAR *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + line_len = sprintfW(buf, hexp_fmt, type); + REGPROC_write_line(fp, buf, unicode); + HeapFree(GetProcessHeap(), 0, buf); + } + + return line_len; +} + +#define MAX_HEX_CHARS 77 + +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); + + if (!unicode && (type == REG_EXPAND_SZ || type == REG_MULTI_SZ)) + data = GetMultiByteStringN(data, size / sizeof(WCHAR), &size); + + num_commas = size - 1; + *buf = resize_buffer(NULL, (size * 3) * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < size; i++) + { + pos += sprintfW(*buf + pos, fmt, ((BYTE *)data)[i]); + if (i == num_commas) break; + (*buf)[pos++] = ','; + (*buf)[pos] = 0; + line_len += 3; + + if (line_len >= MAX_HEX_CHARS) + { + REGPROC_write_line(fp, *buf, unicode); + REGPROC_write_line(fp, hex_concat, unicode); + line_len = 2; + pos = 0; + } + } +} + +static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode) +{ + WCHAR *buf = NULL; + static const WCHAR newline[] = {'\r','\n',0}; + + switch (type) + { + case REG_DWORD: + export_dword_data(&buf, data); + break; + case REG_NONE: + case REG_EXPAND_SZ: + case REG_BINARY: + case REG_MULTI_SZ: + default: + export_hex_data(fp, &buf, type, line_len, data, size, unicode); + break; + } - buf = resize_buffer(NULL, 17 * sizeof(WCHAR)); - sprintfW(buf, fmt, *(DWORD *)data); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); + REGPROC_write_line(fp, newline, unicode); } static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) @@ -1491,9 +1556,9 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - export_value_name(fp, value_name, value_len, unicode); - if (type == REG_DWORD) - export_dword_data(fp, data, unicode); + size_t line_len = export_value_name(fp, value_name, value_len, unicode); + if (type != REG_SZ) + export_data(fp, type, line_len, data, data_size, unicode); else export_hkey(fp, type, &data, &data_size, &line_buf, &line_buf_size, unicode); i++;

1 0

Hugh McMaster : regedit: Re-implement some parts of the export operation.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: efe3bc87e77d9723bd4a8ce1d6afc6982ed965a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe3bc87e77d9723bd4a8ce1d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:28:21 2017 +0000 regedit: Re-implement some parts of the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 274 +++++++++++++++++++++++---------------------- 1 file changed, 143 insertions(+), 131 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4c52a19..5a0d222 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1403,137 +1403,6 @@ static void export_hkey(FILE *file, HKEY key, } /****************************************************************************** - * Open file in binary mode for export. - */ -static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) -{ - FILE *file; - WCHAR dash = '-'; - - if (strncmpW(file_name,&dash,1)==0) { - file=stdout; - _setmode(_fileno(file), _O_BINARY); - } else - { - WCHAR wb_mode[] = {'w','b',0}; - WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; - - file = _wfopen(file_name, wb_mode); - if (!file) { - _wperror(regedit); - error_exit(STRING_CANNOT_OPEN_FILE, file_name); - } - } - if(unicode) - { - const BYTE unicode_seq[] = {0xff,0xfe}; - 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'}; - fwrite(unicode_seq, sizeof(BYTE), sizeof(unicode_seq)/sizeof(unicode_seq[0]), file); - fwrite(header, sizeof(WCHAR), sizeof(header)/sizeof(header[0]), file); - } else - { - fputs("REGEDIT4\r\n", file); - } - - return file; -} - -/****************************************************************************** - * Writes contents of the registry key to the specified file stream. - * - * Parameters: - * file_name - name of a file to export registry branch to. - * reg_key_name - registry branch to export. The whole registry is exported if - * reg_key_name is NULL or contains an empty string. - */ -BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) -{ - WCHAR *reg_key_name_buf; - WCHAR *val_name_buf; - BYTE *val_buf; - WCHAR *line_buf; - DWORD reg_key_name_size = KEY_MAX_LEN; - DWORD val_name_size = KEY_MAX_LEN; - DWORD val_size = REG_VAL_BUF_SIZE; - DWORD line_buf_size = KEY_MAX_LEN + REG_VAL_BUF_SIZE; - FILE *file = NULL; - BOOL unicode = (format == REG_FORMAT_5); - - reg_key_name_buf = HeapAlloc(GetProcessHeap(), 0, - reg_key_name_size * sizeof(*reg_key_name_buf)); - val_name_buf = HeapAlloc(GetProcessHeap(), 0, - val_name_size * sizeof(*val_name_buf)); - val_buf = HeapAlloc(GetProcessHeap(), 0, val_size); - line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size * sizeof(*line_buf)); - CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf && line_buf); - - if (reg_key_name && reg_key_name[0]) { - HKEY reg_key_class; - WCHAR *branch_name = NULL; - HKEY key; - - REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_size, - lstrlenW(reg_key_name)); - lstrcpyW(reg_key_name_buf, reg_key_name); - - /* open the specified key */ - if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) - { - if (branch_name) *(branch_name - 1) = 0; - error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); - } - - if (!branch_name || !*branch_name) { - /* no branch - registry class is specified */ - file = REGPROC_open_export_file(file_name, unicode); - export_hkey(file, reg_key_class, - &reg_key_name_buf, &reg_key_name_size, - &val_name_buf, &val_name_size, - &val_buf, &val_size, &line_buf, - &line_buf_size, unicode); - } else if (RegOpenKeyW(reg_key_class, branch_name, &key) == ERROR_SUCCESS) { - file = REGPROC_open_export_file(file_name, unicode); - export_hkey(file, key, - &reg_key_name_buf, &reg_key_name_size, - &val_name_buf, &val_name_size, - &val_buf, &val_size, &line_buf, - &line_buf_size, unicode); - RegCloseKey(key); - } else { - output_message(STRING_REG_KEY_NOT_FOUND, reg_key_name); - } - } else { - unsigned int i; - - /* export all registry classes */ - file = REGPROC_open_export_file(file_name, unicode); - for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { - /* do not export HKEY_CLASSES_ROOT */ - if (reg_class_keys[i] != HKEY_CLASSES_ROOT && - reg_class_keys[i] != HKEY_CURRENT_USER && - reg_class_keys[i] != HKEY_CURRENT_CONFIG && - reg_class_keys[i] != HKEY_DYN_DATA) { - lstrcpyW(reg_key_name_buf, reg_class_namesW[i]); - export_hkey(file, reg_class_keys[i], - &reg_key_name_buf, &reg_key_name_size, - &val_name_buf, &val_name_size, - &val_buf, &val_size, &line_buf, - &line_buf_size, unicode); - } - } - } - - if (file) { - fclose(file); - } - HeapFree(GetProcessHeap(), 0, reg_key_name); - HeapFree(GetProcessHeap(), 0, val_name_buf); - HeapFree(GetProcessHeap(), 0, val_buf); - HeapFree(GetProcessHeap(), 0, line_buf); - return TRUE; -} - -/****************************************************************************** * Reads contents of the specified file into the registry. */ BOOL import_registry_file(FILE *reg_file) @@ -1603,3 +1472,146 @@ void delete_registry_key(WCHAR *reg_key_name) RegDeleteTreeW(key_class, key_name); } + +static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) +{ + WCHAR *reg_key_name_buf, *val_name_buf, *line_buf; + BYTE *val_buf; + DWORD reg_key_name_size = KEY_MAX_LEN; + DWORD val_name_size = KEY_MAX_LEN; + DWORD val_size = REG_VAL_BUF_SIZE; + DWORD line_buf_size = KEY_MAX_LEN + REG_VAL_BUF_SIZE; + + reg_key_name_buf = HeapAlloc(GetProcessHeap(), 0, reg_key_name_size * sizeof(WCHAR)); + val_name_buf = HeapAlloc(GetProcessHeap(), 0, val_name_size * sizeof(WCHAR)); + val_buf = HeapAlloc(GetProcessHeap(), 0, val_size); + line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf && line_buf); + + lstrcpyW(reg_key_name_buf, path); + + export_hkey(fp, key, &reg_key_name_buf, &reg_key_name_size, &val_name_buf, &val_name_size, + &val_buf, &val_size, &line_buf, &line_buf_size, unicode); + + HeapFree(GetProcessHeap(), 0, reg_key_name_buf); + HeapFree(GetProcessHeap(), 0, val_name_buf); + HeapFree(GetProcessHeap(), 0, val_buf); + HeapFree(GetProcessHeap(), 0, line_buf); + + return 0; +} + +static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) +{ + FILE *file; + static const WCHAR hyphen[] = {'-',0}; + + if (!strcmpW(file_name, hyphen)) + { + file = stdout; + _setmode(_fileno(file), _O_BINARY); + } + else + { + static const WCHAR wb_mode[] = {'w','b',0}; + + file = _wfopen(file_name, wb_mode); + if (!file) + { + static const WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; + _wperror(regedit); + error_exit(STRING_CANNOT_OPEN_FILE, file_name); + } + } + + 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'}; + + fwrite(bom, sizeof(BYTE), ARRAY_SIZE(bom), file); + fwrite(header, sizeof(WCHAR), ARRAY_SIZE(header), file); + } + else + fputs("REGEDIT4\r\n", file); + + return file; +} + +static HKEY open_export_key(HKEY key_class, WCHAR *subkey, WCHAR *path) +{ + HKEY key; + + if (!RegOpenKeyExW(key_class, subkey, 0, KEY_READ, &key)) + return key; + + output_message(STRING_OPEN_KEY_FAILED, path); + return NULL; +} + +static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) +{ + HKEY key_class, key; + WCHAR *subkey; + FILE *fp; + BOOL ret; + + if (!(key_class = parse_key_name(path, &subkey))) + { + if (subkey) *(subkey - 1) = 0; + output_message(STRING_INVALID_SYSTEM_KEY, path); + return FALSE; + } + + if (!(key = open_export_key(key_class, subkey, path))) + return FALSE; + + fp = REGPROC_open_export_file(file_name, unicode); + ret = export_registry_data(fp, key, path, unicode); + fclose(fp); + + RegCloseKey(key); + return ret; +} + +static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) +{ + FILE *fp; + int i; + HKEY classes[] = {HKEY_LOCAL_MACHINE, HKEY_USERS}, key; + WCHAR *class_name; + + fp = REGPROC_open_export_file(file_name, unicode); + + for (i = 0; i < ARRAY_SIZE(classes); i++) + { + if (!(key = open_export_key(classes[i], NULL, path))) + { + fclose(fp); + return FALSE; + } + + class_name = resize_buffer(NULL, (lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); + lstrcpyW(class_name, reg_class_namesW[i]); + + export_registry_data(fp, classes[i], class_name, unicode); + + HeapFree(GetProcessHeap(), 0, class_name); + RegCloseKey(key); + } + + fclose(fp); + return TRUE; +} + +BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format) +{ + BOOL unicode = (format == REG_FORMAT_5); + + if (path && *path) + return export_key(file_name, path, unicode); + else + return export_all(file_name, path, unicode); +}

1 0

Michael Stefaniuc : dmloader: Initialize a stack variable to avoid erratic test behavior.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 0f202ac84b562980e454bbafe700a7f4e2af5097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f202ac84b562980e454bbafe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 19 02:24:03 2017 +0200 dmloader: Initialize a stack variable to avoid erratic test behavior. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 1 + dlls/dmloader/tests/loader.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 41418b8..aa5dfed 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -529,6 +529,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad if (clear) FIXME("clear flag ignored\n"); + current_path[0] = 0; DMUSIC_GetLoaderSettings(iface, class, current_path, NULL); if (!strncmpW(current_path, path, MAX_PATH)) return S_FALSE; diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 6b2ee3a..1735994 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -66,11 +66,11 @@ static void test_directory(void) /* Two consecutive SetSearchDirectory with the same path */ GetTempPathW(ARRAY_SIZE(path), path); hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); - todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); - ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + todo_wine ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); - ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);

1 0

Michael Stefaniuc : include: Fix the name of a method of IDirectMusicLoader.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 9b1281c021ec177f9f3d32c3d3d917462f5d8074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1281c021ec177f9f3d32c3d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 19 02:24:02 2017 +0200 include: Fix the name of a method of IDirectMusicLoader. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dmusici.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dmusici.h b/include/dmusici.h index 60f5f01..7e393ea 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -855,7 +855,7 @@ DECLARE_INTERFACE_(IDirectMusicLoader,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusicLoader methods ***/ - STDMETHOD(_GetObject)(THIS_ LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID *ppv) PURE; + STDMETHOD(GetObject)(THIS_ LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID *ppv) PURE; STDMETHOD(SetObject)(THIS_ LPDMUS_OBJECTDESC pDesc) PURE; STDMETHOD(SetSearchDirectory)(THIS_ REFGUID rguidClass, WCHAR *pwzPath, BOOL fClear) PURE; STDMETHOD(ScanDirectory)(THIS_ REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) PURE; @@ -873,7 +873,7 @@ DECLARE_INTERFACE_(IDirectMusicLoader,IUnknown) #define IDirectMusicLoader_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirectMusicLoader_Release(p) (p)->lpVtbl->Release(p) /*** IDirectMusicLoader methods ***/ -#define IDirectMusicLoader_GetObject(p,a,b,c) (p)->lpVtbl->_GetObject(p,a,b,c) +#define IDirectMusicLoader_GetObject(p,a,b,c) (p)->lpVtbl->GetObject(p,a,b,c) #define IDirectMusicLoader_SetObject(p,a) (p)->lpVtbl->SetObject(p,a) #define IDirectMusicLoader_SetSearchDirectory(p,a,b,c) (p)->lpVtbl->SetSearchDirectory(p,a,b,c) #define IDirectMusicLoader_ScanDirectory(p,a,b,c) (p)->lpVtbl->ScanDirectory(p,a,b,c) @@ -896,7 +896,7 @@ DECLARE_INTERFACE_(IDirectMusicLoader8,IDirectMusicLoader) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusicLoader methods ***/ - STDMETHOD(_GetObject)(THIS_ LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID *ppv) PURE; + STDMETHOD(GetObject)(THIS_ LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID *ppv) PURE; STDMETHOD(SetObject)(THIS_ LPDMUS_OBJECTDESC pDesc) PURE; STDMETHOD(SetSearchDirectory)(THIS_ REFGUID rguidClass, WCHAR *pwzPath, BOOL fClear) PURE; STDMETHOD(ScanDirectory)(THIS_ REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) PURE; @@ -918,7 +918,7 @@ DECLARE_INTERFACE_(IDirectMusicLoader8,IDirectMusicLoader) #define IDirectMusicLoader8_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirectMusicLoader8_Release(p) (p)->lpVtbl->Release(p) /*** IDirectMusicLoader methods ***/ -#define IDirectMusicLoader8_GetObject(p,a,b,c) (p)->lpVtbl->_GetObject(p,a,b,c) +#define IDirectMusicLoader8_GetObject(p,a,b,c) (p)->lpVtbl->GetObject(p,a,b,c) #define IDirectMusicLoader8_SetObject(p,a) (p)->lpVtbl->SetObject(p,a) #define IDirectMusicLoader8_SetSearchDirectory(p,a,b,c) (p)->lpVtbl->SetSearchDirectory(p,a,b,c) #define IDirectMusicLoader8_ScanDirectory(p,a,b,c) (p)->lpVtbl->ScanDirectory(p,a,b,c)

1 0

Michael Stefaniuc : dmloader/tests: NUL terminate a wide string.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: f42d14fdd0cdde3a3504d9f925a0305560ea9606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42d14fdd0cdde3a3504d9f92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 19 02:24:04 2017 +0200 dmloader/tests: NUL terminate a wide string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 1735994..b24b2e2 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -47,7 +47,7 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n'}; + WCHAR con[] = {'c', 'o', 'n', 0}; WCHAR path[MAX_PATH]; WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0};

1 0

Hugh McMaster : regedit: Export value names from a separate function.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 40ce665836caafd0e7afcc1bff89f514f7c71a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ce665836caafd0e7afcc1bf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:28:38 2017 +0000 regedit: Export value names from a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 92 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 77 insertions(+), 15 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b5bc3bf..8bdbcd2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1241,24 +1241,12 @@ static void REGPROC_write_line(FILE *file, const WCHAR* str, BOOL unicode) * Is resized if necessary. * val_size - size of the buffer for storing values in bytes. */ -static void export_hkey(FILE *file, WCHAR **val_name_buf, DWORD *val_name_size, - DWORD value_type, BYTE **val_buf, DWORD *val_size, +static void export_hkey(FILE *file, DWORD value_type, BYTE **val_buf, DWORD *val_size, WCHAR **line_buf, DWORD *line_buf_size, BOOL unicode) { DWORD line_len = 0; DWORD val_size1 = *val_size; - if (*val_name_buf && (*val_name_buf)[0]) { - const WCHAR val_start[] = {'"','%','s','"','=',0}; - - REGPROC_export_string(line_buf, line_buf_size, &line_len, *val_name_buf, lstrlenW(*val_name_buf)); - line_len = sprintfW(*line_buf, val_start, *val_name_buf); - } else { - const WCHAR std_val[] = {'@','=',0}; - line_len = 2; - lstrcpyW(*line_buf, std_val); - } - switch (value_type) { case REG_SZ: { @@ -1375,6 +1363,80 @@ void delete_registry_key(WCHAR *reg_key_name) RegDeleteTreeW(key_class, key_name); } +static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len) +{ + size_t i, escape_count, pos; + WCHAR *buf; + + for (i = 0, escape_count = 0; i < str_len; i++) + { + WCHAR c = str[i]; + if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + escape_count++; + } + + buf = resize_buffer(NULL, (str_len + escape_count + 1) * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < str_len; i++, pos++) + { + WCHAR c = str[i]; + + switch (c) + { + case '\r': + buf[pos++] = '\\'; + buf[pos] = 'r'; + break; + case '\n': + buf[pos++] = '\\'; + buf[pos] = 'n'; + break; + case '\\': + buf[pos++] = '\\'; + buf[pos] = '\\'; + break; + case '"': + buf[pos++] = '\\'; + buf[pos] = '"'; + break; + case '\0': + buf[pos++] = '\\'; + buf[pos] = '0'; + break; + default: + buf[pos] = c; + } + } + + buf[pos] = 0; + *line_len = pos; + return buf; +} + +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}; + size_t line_len; + + if (name && *name) + { + WCHAR *str = REGPROC_escape_string(name, len, &line_len); + WCHAR *buf = resize_buffer(NULL, (line_len + 4) * sizeof(WCHAR)); + line_len = sprintfW(buf, quoted_fmt, str); + REGPROC_write_line(fp, buf, unicode); + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, str); + } + else + { + line_len = lstrlenW(default_name); + REGPROC_write_line(fp, default_name, unicode); + } + + return line_len; +} + static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; @@ -1428,8 +1490,8 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - export_hkey(fp, &value_name, &value_len, type, &data, &data_size, - &line_buf, &line_buf_size, unicode); + export_value_name(fp, value_name, value_len, unicode); + export_hkey(fp, type, &data, &data_size, &line_buf, &line_buf_size, unicode); i++; } else if (rc == ERROR_MORE_DATA)

1 0

Hugh McMaster : regedit: Read registry value information before exporting.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: c189effeb3fdeab43c56eb54c840011dcf97c3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c189effeb3fdeab43c56eb54c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:28:29 2017 +0000 regedit: Read registry value information before exporting. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 218 ++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c189effeb3fdeab43c56e…

1 0

Hugh McMaster : regedit: Export REG_DWORD data from a separate function.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: bb147fbaa71f3e2d0b5d847e89815da23ad4750e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb147fbaa71f3e2d0b5d847e8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:28:47 2017 +0000 regedit: Export REG_DWORD data from a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 8bdbcd2..75843c5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1272,16 +1272,6 @@ static void export_hkey(FILE *file, DWORD value_type, BYTE **val_buf, DWORD *val } break; } - - case REG_DWORD: - { - WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; - - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); - sprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); - break; - } - case REG_NONE: case REG_EXPAND_SZ: case REG_MULTI_SZ: @@ -1437,6 +1427,17 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) return line_len; } +static void export_dword_data(FILE *fp, void *data, BOOL unicode) +{ + static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; + WCHAR *buf; + + buf = resize_buffer(NULL, 17 * sizeof(WCHAR)); + sprintfW(buf, fmt, *(DWORD *)data); + REGPROC_write_line(fp, buf, unicode); + HeapFree(GetProcessHeap(), 0, buf); +} + static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; @@ -1491,7 +1492,10 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) if (rc == ERROR_SUCCESS) { export_value_name(fp, value_name, value_len, unicode); - export_hkey(fp, type, &data, &data_size, &line_buf, &line_buf_size, unicode); + if (type == REG_DWORD) + export_dword_data(fp, data, unicode); + else + export_hkey(fp, type, &data, &data_size, &line_buf, &line_buf_size, unicode); i++; } else if (rc == ERROR_MORE_DATA)

1 0

Rosanne DiMesio : Only delete distributions from the queue if there are no other tests attached
by Jeremy Newman July 19, 2017

July 19, 2017

Module: appdb Branch: master Commit: 195a145da4b65421fd969a7088d998bbd5b21637 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=195a145da4b65421fd969a70… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 19 12:25:56 2017 -0500 Only delete distributions from the queue if there are no other tests attached Fixes a bug introduced by 8cf9bd53fc0f5251bdba75ae88215fa1c0da8880. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index c226b6e..8af655c 100644 --- a/include/testData.php +++ b/include/testData.php @@ -157,7 +157,7 @@ class testData{ $oOldDist = new distribution($oOldTest->iDistributionId); $sWhatChanged .= "Operating system was changed from $oOldDist->sName ". "to $oNewDist->sName.\n"; - if($oOldTest->iDistributionId != "accepted") + if(sizeof($oOldDist->aTestingIds)<=1) { $oOldDist->delete(); addmsg("Rejected operating system has been deleted.", "red");

1 0

Rosanne DiMesio : Delete distributions rejected in test queue
by Jeremy Newman July 19, 2017

July 19, 2017

Module: appdb Branch: master Commit: 8cf9bd53fc0f5251bdba75ae88215fa1c0da8880 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8cf9bd53fc0f5251bdba75ae… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 19 08:19:09 2017 -0500 Delete distributions rejected in test queue Fixes bug 27378. Also removes unnecessary and incorrect notifications from distributions.php. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/distribution.php | 98 +++++------------------------------------------- include/testData.php | 5 +++ 2 files changed, 15 insertions(+), 88 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 0dda338..9cbf538 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -99,7 +99,6 @@ class distribution { { if(query_num_rows($hResult)) { - addmsg("There was an existing operating system called ".$this->sName.".", "red"); $this->distribution($oRow->distributionId); /* Even though we did not create a new distribution, the caller is provided @@ -120,7 +119,6 @@ class distribution { { $this->iDistributionId = query_appdb_insert_id(); $this->distribution($this->iDistributionId); - $this->SendNotificationMail(); return true; } else @@ -135,14 +133,14 @@ class distribution { { // is the current user allowed to update this Distribution? if(!$_SESSION['current']->hasPriv("admin") && - !($_SESSION['current']->iUserId == $this->iSubmitterId)) + !maintainer::isUserMaintainer($_SESSION['current']) && + !($_SESSION['current']->iUserId == $this->iSubmitterId)) { return; } if(query_parameters("UPDATE distributions SET name = '?', url = '?' WHERE distributionId = '?'", $this->sName, $this->sUrl, $this->iDistributionId)) { - $this->SendNotificationMail("edit"); return true; } else { @@ -151,6 +149,7 @@ class distribution { } } + // Removes the distribution from the database. function purge() { /* Is the current user allowed to delete this distribution? We allow @@ -183,21 +182,16 @@ class distribution { return $bSuccess; } - // Delete Distributution. + // Marks distribution as deleted in the database. function delete() { - /* Is the current user allowed to delete this distribution? We allow - everyone to delete a queued, empty distribution, because it should be - deleted along with the last testData associated with it */ - if(!($this->canEdit() || (!sizeof($this->aTestingIds) && - $this->sState != 'accepted'))) + /* admins and maintainers can delete any distribution; + users can only delete distributions they submitted that are still in their queue */ + if(!$_SESSION['current']->hasPriv("admin") && + !maintainer::isUserMaintainer($_SESSION['current']) && + !(($_SESSION['current']->iUserId == $this->iSubmitterId) && $this->sState != 'accepted')) return false; - - // if the distribution has test results only enable an admin to delete - // the distribution - if(sizeof($this->aTestingIds) && !$_SESSION['current']->hasPriv("admin")) - return FALSE; - + $bSuccess = TRUE; foreach($this->objectGetChildren() as $oChild) @@ -231,9 +225,6 @@ class distribution { 'accepted', $this->iDistributionId)) { $this->sState = 'accepted'; - // we send an e-mail to interested people - $this->mailSubmitter("add"); - $this->SendNotificationMail(); return true; } else { @@ -303,8 +294,6 @@ class distribution { 'queued', $this->iDistributionId)) { $this->sState = 'queued'; - // we send an e-mail to interested people - $this->SendNotificationMail(); // the test data has been resubmitted addmsg("The operating system has been resubmitted", "green"); @@ -388,73 +377,6 @@ class distribution { } } - - function SendNotificationMail($sAction="add",$sMsg=null) - { - global $aClean; - - switch($sAction) - { - case "add": - if($this->sState == 'accepted') - { - $sSubject = "Operating system ".$this->sName." added by ". - $_SESSION['current']->sRealname; - $sMsg = $this->objectMakeUrl()."\n"; - if($this->iSubmitterId) - { - $oSubmitter = new User($this->iSubmitterId); - $sMsg .= "This operating system has been submitted by ".$oSubmitter->sRealname."."; - $sMsg .= "\n"; - $sMsg .= "Appdb admin reply text:\n"; - $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any - } - addmsg("The operating system was successfully added into the database.", "green"); - } else // test data queued. - { - $sSubject = "Operating system ".$this->sName." submitted by ".$_SESSION['current']->sRealname; - $sMsg .= "This test data has been queued."; - $sMsg .= "\n"; - addmsg("The operating system you submitted will be added to the database after being reviewed.", "green"); - } - break; - case "edit": - $sSubject = "Operating system ".$this->sName." has been modified by ".$_SESSION['current']->sRealname; - $sMsg = $this->objectMakeUrl()."\n"; - addmsg("Operating system modified.", "green"); - break; - case "delete": - $sSubject = "Operating system ".$this->sName." has been deleted by ".$_SESSION['current']->sRealname; - - // if sReplyText is set we should report the reason the data was deleted - if($aClean['sReplyText']) - { - $sMsg .= "Reason given:\n"; - $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any - } - - addmsg("Operating system deleted.", "green"); - break; - case "reject": - $sSubject = "Operating system '".$this->sName." has been rejected by ". - $_SESSION['current']->sRealname; - $sMsg = $this->objectMakeUrl()."\n"; - - // if sReplyText is set we should report the reason the data was rejected - if($aClean['sReplyText']) - { - $sMsg .= "Reason given:\n"; - $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any - } - - addmsg("Operating system rejected.", "green"); - break; - } - $sEmail = User::get_notify_email_address_list(null, null); - if($sEmail) - mail_appdb($sEmail, $sSubject ,$sMsg); - } - function outputEditor() { echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; diff --git a/include/testData.php b/include/testData.php index cd3fc8b..c226b6e 100644 --- a/include/testData.php +++ b/include/testData.php @@ -157,6 +157,11 @@ class testData{ $oOldDist = new distribution($oOldTest->iDistributionId); $sWhatChanged .= "Operating system was changed from $oOldDist->sName ". "to $oNewDist->sName.\n"; + if($oOldTest->iDistributionId != "accepted") + { + $oOldDist->delete(); + addmsg("Rejected operating system has been deleted.", "red"); + } } if($this->sInstalls != $oOldTest->sInstalls)

1 0