June 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Export hex data types without warning about unsupported data types.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: a1924ae2da1d86000f61eefed5e59150a74468ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1924ae2da1d86000f61eefed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:11 2017 +0000 regedit: Export hex data types without warning about unsupported data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 49 ++-------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e977c1a..f7e8d2a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -400,46 +400,6 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) return 0; } -/* Registry data types */ -static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; -static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; -static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; -static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; -static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; -static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; -static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; -static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; - -static const struct -{ - DWORD type; - const WCHAR *name; -} -type_rels[] = -{ - {REG_NONE, type_none}, - {REG_SZ, type_sz}, - {REG_EXPAND_SZ, type_expand_sz}, - {REG_BINARY, type_binary}, - {REG_DWORD, type_dword}, - {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, - {REG_DWORD_BIG_ENDIAN, type_dword_be}, - {REG_MULTI_SZ, type_multi_sz}, -}; - -static const WCHAR *reg_type_to_wchar(DWORD type) -{ - int i, array_size = ARRAY_SIZE(type_rels); - - for (i = 0; i < array_size; i++) - { - if (type == type_rels[i].type) - return type_rels[i].name; - } - return NULL; -} - - static void close_key(struct parser *parser) { if (parser->hkey) @@ -1308,16 +1268,11 @@ static void export_hkey(FILE *file, HKEY key, break; } - default: - { - output_message(STRING_UNSUPPORTED_TYPE, reg_type_to_wchar(value_type), *reg_key_name_buf); - output_message(STRING_EXPORT_AS_BINARY, *val_name_buf); - } - /* falls through */ + case REG_NONE: case REG_EXPAND_SZ: case REG_MULTI_SZ: - /* falls through */ 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);

1 0

Hugh McMaster : regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 8504a1563de17f7c93023cf317a7bccde7718d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8504a1563de17f7c93023cf31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:23 2017 +0000 regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value. We use a BOOL to handle all hex types, including those that are undefined (e.g.0x100). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f7e8d2a..416938d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -163,6 +163,7 @@ struct parser DWORD data_type; /* data type */ void *data; /* value data */ DWORD data_size; /* size of the data (in bytes) */ + BOOL hex_type; /* parsing a hex data type */ enum parser_state state; /* current parser state */ }; @@ -322,6 +323,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) return FALSE; parser->data_type = val; + parser->hex_type = TRUE; *line = end + 2; } return TRUE; @@ -826,6 +828,13 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); + if (parser->data_type == REG_DWORD || parser->hex_type) + { + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->hex_type = FALSE; + } + if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE); else @@ -1463,6 +1472,7 @@ BOOL import_registry_file(FILE *reg_file) parser.data_type = 0; parser.data = NULL; parser.data_size = 0; + parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars;

1 0

Hugh McMaster : regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: f535341d2ba9c18cdacb561a38152d3215af305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f535341d2ba9c18cdacb561a3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:31 2017 +0000 regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 416938d..2ce77c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,7 +392,7 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(key_name, reg_class_namesW[i], len) && + if (!strncmpiW(key_name, reg_class_namesW[i], len) && (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 254073b..49e2396 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1231,20 +1231,20 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + verify_key_exist(hkey, "Subkey3a"); + verify_key_exist(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - verify_key_nonexist(hkey, "Subkey3b"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Allow the deletion of registry keys beginning with a lowercase 'H'.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 1f08ee245366958147789ec2ae0c7d80d03ac9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f08ee245366958147789ec2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:41 2017 +0000 regedit: Allow the deletion of registry keys beginning with a lowercase 'H'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2ce77c4..e08ffa6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -624,7 +624,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; - if (*p == 'H') + if (*p == 'H' || *p == 'h') delete_registry_key(p); set_state(parser, LINE_START); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 49e2396..ec488bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1238,13 +1238,13 @@ static void test_key_creation_and_deletion(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Use the correct mask flags with LVM_GETNEXTITEM.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 7f76cf6c26012bc6ad9488e96b08133f86f148c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f76cf6c26012bc6ad9488e96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:50 2017 +0000 regedit: Use the correct mask flags with LVM_GETNEXTITEM. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0503dc8..539be96 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -187,7 +187,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index);

1 0

Hugh McMaster : regedit: Re-insert the default value item after deleting its data.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: cb563dbac61c320032ee14bdb2b6def1960393ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb563dbac61c320032ee14bdb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:59 2017 +0000 regedit: Re-insert the default value item after deleting its data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 3 ++- programs/regedit/framewnd.c | 15 ++++++++++++++- programs/regedit/listview.c | 8 ++++---- programs/regedit/main.h | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d88061c..403def4 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -483,7 +483,8 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&valueDword, sizeof(DWORD)); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, + (BYTE *)&valueDword, sizeof(DWORD), -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 539be96..361da7e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -806,7 +806,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { - unsigned int num_selected, index; + unsigned int num_selected, index, focus_idx; WCHAR *keyPath; if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) @@ -821,7 +821,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + focus_idx = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); + while (index != -1) { WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); @@ -832,6 +834,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, valueName); SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); + /* the default value item is always visible, so add it back in */ + if (!index) + { + AddEntryToList(g_pChildWnd->hListWnd, NULL, REG_SZ, NULL, 0, 0); + if (!focus_idx) + { + LVITEMW item; + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + } + } index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } HeapFree(GetProcessHeap(), 0, keyPath); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index caa9a23..1365259 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -157,7 +157,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz } } -int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { LINE_INFO* linfo; LVITEMW item; @@ -178,7 +178,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.iItem = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); + item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; item.iSubItem = 0; item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; @@ -557,7 +557,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, -1); } for(index = 0; index < val_count; index++) { valNameLen = max_val_name_len; @@ -566,7 +566,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, -1); } memset(&item, 0, sizeof(item)); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index f09de34..5331189 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -118,7 +118,7 @@ extern void UpdateStatusBar(void); /* listview.c */ extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); +extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV);

1 0

Jacek Caban : widl: Try to find imported typelib using .tlb extension if it wasn't specified.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: fbdf119e2c8ac4233c4323835ff82fe3ad3de3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf119e2c8ac4233c4323835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 16 15:25:48 2017 +0200 widl: Try to find imported typelib using .tlb extension if it wasn't specified. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 6ac748f..e8dfcb1 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -326,22 +326,42 @@ static void read_msft_importlib(importlib_t *importlib, int fd) free(typeinfo_offs); } +static int open_typelib(const char *name) +{ + char *file_name; + int fd; + + file_name = wpp_find_include(name, NULL); + if(!file_name) + return open(name, O_RDONLY | O_BINARY ); + + fd = open(file_name, O_RDONLY | O_BINARY ); + free(file_name); + return fd; +} + static void read_importlib(importlib_t *importlib) { int fd; INT magic; - char *file_name; - file_name = wpp_find_include(importlib->name, NULL); - if(file_name) { - fd = open(file_name, O_RDONLY | O_BINARY ); - free(file_name); - }else { - fd = open(importlib->name, O_RDONLY | O_BINARY ); + fd = open_typelib(importlib->name); + + /* widl extension: if importlib name has no .tlb extension, try using .tlb */ + if(fd < 0) { + const char *p = strrchr(importlib->name, '.'); + size_t len = p ? p - importlib->name : strlen(importlib->name); + if(strcmp(importlib->name + len, ".tlb")) { + char *tlb_name = xmalloc(len + 5); + memcpy(tlb_name, importlib->name, len); + strcpy(tlb_name + len, ".tlb"); + fd = open_typelib(tlb_name); + free(tlb_name); + } } if(fd < 0) - error("Could not open importlib %s.\n", importlib->name); + error("Could not find importlib %s.\n", importlib->name); tlb_read(fd, &magic, sizeof(magic));

1 0

Nils Kuhnhenn : oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 0dde88202a97578ffd346ae24d904a4f89cfb9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dde88202a97578ffd346ae24… Author: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Date: Fri Jun 16 16:05:07 2017 +0200 oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b88e663..311cca3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4728,10 +4728,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4781,7 +4780,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type);

1 0

Paul Gofman : d3dx9: Avoid casting each value separately in set_constants( ).
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: f48d38e5ac72ff0d5cb5951a40072e92a77b4b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48d38e5ac72ff0d5cb5951a4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:36 2017 +0300 d3dx9: Avoid casting each value separately in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 101 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e9c8387..f10a3c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -22,6 +22,7 @@ #include "d3dx9_private.h" #include <float.h> +#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -1037,6 +1038,73 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->count = info->major_count * info->minor; } +static void pres_int_from_float(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_float = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = in_float[i]; +} + +static void pres_bool_from_value(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const DWORD *in_dword = in; + BOOL *out_bool = out; + + for (i = 0; i < count; ++i) + out_bool[i] = !!in_dword[i]; +} + +static void pres_float_from_int(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const int *in_int = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = in_int[i]; +} + +static void pres_float_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const BOOL *in_bool = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = !!in_bool[i]; +} + +static void pres_int_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_bool = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = !!in_bool[i]; +} + +static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, + unsigned int offset, const unsigned int *in, unsigned int count, enum pres_value_type param_type) +{ + typedef void (*conv_func)(void *out, const void *in, unsigned int count); + static const conv_func set_const_funcs[PRES_VT_COUNT][PRES_VT_COUNT] = + { + {NULL, NULL, pres_int_from_float, pres_bool_from_value}, + {NULL, NULL, NULL, NULL}, + {pres_float_from_int, NULL, NULL, pres_bool_from_value}, + {pres_float_from_bool, NULL, pres_int_from_bool, NULL} + }; + enum pres_value_type table_type = table_info[table].type; + + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); + regstore_set_modified(rs, table, offset, count); +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1047,11 +1115,11 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const struct d3dx_const_param_eval_output *const_set = &const_tab->const_set[const_idx]; unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; - enum pres_value_type table_type = table_info[table].type; unsigned int element, i, j, start_offset; unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; + enum pres_value_type param_type; if (!is_param_dirty(param, const_tab->update_version)) continue; @@ -1063,22 +1131,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_offset_reg(table, const_set->register_count)); continue; } + param_type = table_type_from_param_type(param->type); get_const_upload_info(const_set, &info); - for (element = 0; element < const_set->element_count; ++element) { + unsigned int *out = (unsigned int *)rs->tables[table] + start_offset; + + /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. + * All the supported types of parameters and table values have the same size. */ for (i = 0; i < info.major_count; ++i) { for (j = 0; j < info.minor; ++j) { - unsigned int out; - unsigned int *in; unsigned int offset; offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) break; - offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else @@ -1088,23 +1157,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); break; } - - in = (unsigned int *)data + param_offset; - switch (table_type) - { - case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; - case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; - case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; - default: - FIXME("Unexpected type %#x.\n", table_info[table].type); - break; - } - regstore_set_values(rs, table, &out, offset, 1); + out[offset] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns; } + start_offset = get_offset_reg(table, const_set->register_index); + if (table_info[table].type == param_type) + regstore_set_modified(rs, table, start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count); + else + regstore_set_data(rs, table, start_offset, (unsigned int *)rs->tables[table] + start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count, param_type); } const_tab->update_version = new_update_version; } @@ -1310,6 +1375,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC ERR("Unexpected register set %u.\n", desc.RegisterSet); return D3DERR_INVALIDCALL; } + assert(table_info[const_set.table].component_size == sizeof(unsigned int)); + assert(param->bytes / (param->rows * param->columns) == sizeof(unsigned int)); const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info);

1 0

Paul Gofman : d3dx9: Add scalar and vector setting path to set_constants() .
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 95a49bdce6cd5a35d5035456e576ab81239fb081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a49bdce6cd5a35d5035456e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:37 2017 +0300 d3dx9: Add scalar and vector setting path to set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index f10a3c6..2785ca3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,11 +372,14 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { + void *out; + if (!count) return; - memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, - data, count * table_info[table].component_size); + out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; + assert(data != out); + memcpy(out, data, count * table_info[table].component_size); regstore_set_modified(rs, table, start_offset, count); } @@ -1101,6 +1104,12 @@ static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, }; enum pres_value_type table_type = table_info[table].type; + if (param_type == table_type) + { + regstore_set_values(rs, table, in, offset, count); + return; + } + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); regstore_set_modified(rs, table, offset, count); } @@ -1132,6 +1141,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const continue; } param_type = table_type_from_param_type(param->type); + if (const_set->constant_class == D3DXPC_SCALAR || const_set->constant_class == D3DXPC_VECTOR) + { + unsigned int count = max(param->rows, param->columns); + + if (count >= get_reg_components(table)) + { + regstore_set_data(rs, table, start_offset, data, + count * const_set->element_count, param_type); + } + else + { + for (element = 0; element < const_set->element_count; ++element) + regstore_set_data(rs, table, start_offset + get_offset_reg(table, element), + &data[element * count], count, param_type); + } + continue; + } get_const_upload_info(const_set, &info); for (element = 0; element < const_set->element_count; ++element) {

1 0