wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 7fda9dcf5889a2f4245d882a5aa84665d8b6f61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda9dcf5889a2f4245d882a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 26 10:29:23 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 027a4af..212285c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-21 14:36+0300\n" +"PO-Revision-Date: 2017-04-26 10:24+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12101,10 +12101,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: не удалось удалить класс «%1».\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: строка «%1» не распознана.\n" +msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 0351f7ed93b68a7fc47153fb3206e79c28833033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f7ed93b68a7fc47153fb3… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 26 09:06:25 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2cd4fa6..07ab574 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-03-22 23:05+0300\n" +"PO-Revision-Date: 2017-04-26 09:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9383,7 +9383,7 @@ msgstr "Atributas ar reikšmė egzistuoja" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Neteisinga sintaksė" +msgstr "Netinkama sintaksė" #: wldap32.rc:64 msgid "No Such Object" @@ -12107,10 +12107,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Eilutė „%1“ neatpažinta.\n" +msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Jactry Zeng : zh-cn: Update the Downloads page.
by Jeremy Newman 26 Apr '17

26 Apr '17

Module: website Branch: master Commit: ae9d6d0f30f9f20da3ea801f360f7e412437e4cc URL: http://source.winehq.org/git/website.git/?a=commit;h=ae9d6d0f30f9f20da3ea80… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 25 10:50:04 2017 +0800 zh-cn: Update the Downloads page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/download.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 32d5b5e..a372d44 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -71,15 +71,15 @@ <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> <div class="col-md-10"> <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 供给 Ubuntu 12.04，14.04，15.04，15.10，16.04 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Ubuntu 14.04、16.04、16.10 和 17.04 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - 供给 Debian Wheezy，Jessie，Stretch 及 Sid 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Debian Wheezy、Jessie、Stretch 和 Sid 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - 供给 Fedora 22 及 23 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Fedora 24 和 25 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - 供给 Mageia 4 及 5 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Mageia 5 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - 供给 macOS 10.8 或更新版本的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 macOS 10.8 或更新版本的 WineHQ 安装包</p> </div> </div>

1 0

Michael Stefaniuc : dmscript/tests: Just use proper IUnknown implementations for aggregation.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 89ef7b59f548a76960b2278d819a8f915c81e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ef7b59f548a76960b2278d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 20:47:40 2017 +0200 dmscript/tests: Just use proper IUnknown implementations for aggregation. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 82e874c..13540ff 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -88,11 +88,7 @@ static void test_COM(void) ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScript, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dms); - todo_wine ok(hr == E_POINTER, "DirectMusicScript create failed: %08x, expected E_POINTER\n", hr); - /* An invalid non-NULL pUnkOuter crashes newer Windows versions */ + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, @@ -137,15 +133,16 @@ static void test_COM_scripttrack(void) IDirectMusicTrack *dmt; IPersistStream *ps; IUnknown *unk; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dmt); + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dmt, "dmt = %p\n", dmt); + ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER,

1 0

Daniel Lehman : server: Fix copy & paste for number of subkeys.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 47df3778aa85c20a05d12f8d2869e268c8e979f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47df3778aa85c20a05d12f8d2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 25 09:46:18 2017 -0700 server: Fix copy & paste for number of subkeys. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 0731b22..734a111 100644 --- a/server/registry.c +++ b/server/registry.c @@ -568,7 +568,7 @@ static int grow_subkeys( struct key *key ) } else { - nb_subkeys = MIN_VALUES; + nb_subkeys = MIN_SUBKEYS; if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; } key->subkeys = new_subkeys;

1 0

Hugh McMaster : regedit: Re-implement processSetValue().
by Alexandre Julliard 25 Apr '17

25 Apr '17

1 0

Hugh McMaster : regedit: Validate REG_SZ import data before processing it any further.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 9aff5c88ad874698e07c44bd3825a70414ee77e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aff5c88ad874698e07c44bd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 25 13:31:10 2017 +0000 regedit: Validate REG_SZ import data before processing it any further. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 30 ++++++++++++++++++++++-------- programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1672f22..22c4d9e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -264,13 +264,19 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) } /****************************************************************************** - * Replaces escape sequences with the characters. + * Replaces escape sequences with their character equivalents and + * null-terminates the string on the first non-escaped double quote. + * + * Assigns a pointer to the remaining unparsed data in the line. + * Returns TRUE or FALSE to indicate whether a closing double quote was found. */ -static int REGPROC_unescape_string(WCHAR* str) +static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) { int str_idx = 0; /* current character under analysis */ int val_idx = 0; /* the last character of the unescaped string */ int len = lstrlenW(str); + BOOL ret; + for (str_idx = 0; str_idx < len; str_idx++, val_idx++) { if (str[str_idx] == '\\') { str_idx++; @@ -293,12 +299,17 @@ static int REGPROC_unescape_string(WCHAR* str) str[val_idx] = str[str_idx]; break; } + } else if (str[str_idx] == '"') { + break; } else { str[val_idx] = str[str_idx]; } } + + ret = (str[str_idx] == '"'); + *unparsed = str + str_idx + 1; str[val_idx] = '\0'; - return val_idx; + return ret; } static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) @@ -397,12 +408,14 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) if (dwParseType == REG_SZ) /* no conversion for string */ { - dwLen = REGPROC_unescape_string(val_data); - if(!dwLen || val_data[dwLen-1] != '"') + WCHAR *line; + if (!REGPROC_unescape_string(val_data, &line)) + return ERROR_INVALID_DATA; + while (*line == ' ' || *line == '\t') line++; + if (*line && *line != ';') return ERROR_INVALID_DATA; - val_data[dwLen-1] = '\0'; /* remove last quotes */ lpbData = (BYTE*) val_data; - dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */ + dwLen = (lstrlenW(val_data) + 1) * sizeof(WCHAR); /* size is in bytes */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */ { @@ -520,6 +533,7 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) { WCHAR* val_name; /* registry value name */ WCHAR* val_data; /* registry value data */ + WCHAR* p; int line_idx = 0; /* current character under analysis */ LONG res; @@ -570,7 +584,7 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) while (line_idx > 0 && isspaceW(val_data[line_idx-1])) line_idx--; val_data[line_idx] = '\0'; - REGPROC_unescape_string(val_name); + REGPROC_unescape_string(val_name, &p); res = setValue(val_name, val_data, is_unicode); if ( res != ERROR_SUCCESS ) output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 7584ed4..8010a47 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -560,8 +560,8 @@ static void test_invalid_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test15a\"=\"foo\"bar\"\n" "\"Test15b\"=\"foo\"\"bar\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Test15a"); - todo_wine verify_reg_nonexist(hkey, "Test15b"); + verify_reg_nonexist(hkey, "Test15a"); + verify_reg_nonexist(hkey, "Test15b"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -607,7 +607,7 @@ static void test_comments(void) "\"Wine5\"=dword:01020304 #comment\n" "\"Wine6\"=dword:02040608 ;comment\n\n"); verify_reg_nonexist(hkey, "Wine3"); - todo_wine verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); + verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); verify_reg_nonexist(hkey, "Wine5"); dword = 0x2040608; verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); @@ -639,9 +639,9 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Comment2"); verify_reg_nonexist(hkey, "Comment3"); verify_reg_nonexist(hkey, "Comment4"); - todo_wine verify_reg_nonexist(hkey, "Wine11"); + verify_reg_nonexist(hkey, "Wine11"); verify_reg_nonexist(hkey, "Comment5"); - verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, 0); verify_reg_nonexist(hkey, "Comment6"); exec_import_str("REGEDIT4\n\n" @@ -690,8 +690,8 @@ static void test_comments(void) "\"Wine26b\"=\"Value2\"\t\t;comment\n" "\"Wine26c\"=\"Value3\" #comment\n" "\"Wine26d\"=\"Value4\"\t\t#comment\n\n"); - todo_wine verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); - todo_wine verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); verify_reg_nonexist(hkey, "Wine26c"); verify_reg_nonexist(hkey, "Wine26d");

1 0

Hugh McMaster : regedit: Simplify parseKeyName.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 0481f31d4c2f546d2e5fd2fdd58a6d190af9d044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0481f31d4c2f546d2e5fd2fdd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 25 13:30:56 2017 +0000 regedit: Simplify parseKeyName. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 53 +++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 96c4564..1672f22 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -301,50 +301,27 @@ static int REGPROC_unescape_string(WCHAR* str) return val_idx; } -static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) +static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) { - WCHAR* lpSlash = NULL; - unsigned int i, len; + unsigned int i; if (lpKeyName == NULL) - return FALSE; + return 0; - for(i = 0; *(lpKeyName+i) != 0; i++) - { - if(*(lpKeyName+i) == '\\') - { - lpSlash = lpKeyName+i; - break; - } - } + *lpKeyPath = strchrW(lpKeyName, '\\'); + if (*lpKeyPath) (*lpKeyPath)++; - if (lpSlash) - { - len = lpSlash-lpKeyName; - } - else + for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { - len = lstrlenW(lpKeyName); - lpSlash = lpKeyName+len; - } - *hKey = NULL; - - for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { - if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], -1) == CSTR_EQUAL && - len == lstrlenW(reg_class_namesW[i])) { - *hKey = reg_class_keys[i]; - break; + int len = lstrlenW(reg_class_namesW[i]); + if (!strncmpW(lpKeyName, reg_class_namesW[i], len) && + (lpKeyName[len] == 0 || lpKeyName[len] == '\\')) + { + return reg_class_keys[i]; } } - if (*hKey == NULL) - return FALSE; - - - if (*lpSlash != '\0') - lpSlash++; - *lpKeyPath = lpSlash; - return TRUE; + return 0; } /* Globals used by the setValue() & co */ @@ -490,7 +467,7 @@ static LONG openKeyW(WCHAR* stdInput) return ERROR_INVALID_PARAMETER; /* Get the registry class */ - if (!parseKeyName(stdInput, &keyClass, &keyPath)) + if (!(keyClass = parseKeyName(stdInput, &keyPath))) return ERROR_INVALID_PARAMETER; res = RegCreateKeyExW( @@ -1323,7 +1300,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!parseKeyName(reg_key_name, &reg_key_class, &branch_name)) { + if (!(reg_key_class = parseKeyName(reg_key_name, &branch_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } @@ -1408,7 +1385,7 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!parseKeyName(reg_key_name, &key_class, &key_name)) { + if (!(key_class = parseKeyName(reg_key_name, &key_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); }

1 0

Paul Gofman : d3dx9: Factor out free_parameter_data() function.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: bb52c5983ddb371eee5c61773e4fc7c213439ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52c5983ddb371eee5c61773… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:50 2017 +0300 d3dx9: Factor out free_parameter_data() function. 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/effect.c | 61 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1fd99832..0f5e3e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -502,37 +502,8 @@ static void free_sampler(struct d3dx_sampler *sampler) HeapFree(GetProcessHeap(), 0, sampler->states); } -static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +static void free_parameter_data(struct d3dx_parameter *param, BOOL child) { - unsigned int i; - - TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, - debug_d3dxparameter_type(param->type), child ? "yes" : "no"); - - if (param->param_eval) - { - d3dx_free_param_eval(param->param_eval); - param->param_eval = NULL; - } - - if (param->annotations) - { - for (i = 0; i < param->annotation_count; ++i) - free_parameter(&param->annotations[i], FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, param->annotations); - param->annotations = NULL; - } - - if (param->members) - { - unsigned int count = param->element_count ? param->element_count : param->member_count; - - for (i = 0; i < count; ++i) - free_parameter(&param->members[i], param->element_count != 0, TRUE); - HeapFree(GetProcessHeap(), 0, param->members); - param->members = NULL; - } - if (param->class == D3DXPC_OBJECT && !param->element_count) { switch (param->type) @@ -564,12 +535,38 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil break; } } - if (!child) - { HeapFree(GetProcessHeap(), 0, param->data); +} + +static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +{ + unsigned int i; + + TRACE("Free parameter %p, name %s, type %s, element %#x, child %#x.\n", param, param->name, + debug_d3dxparameter_type(param->type), element, child); + + if (param->param_eval) + d3dx_free_param_eval(param->param_eval); + + if (param->annotations) + { + for (i = 0; i < param->annotation_count; ++i) + free_parameter(&param->annotations[i], FALSE, FALSE); + HeapFree(GetProcessHeap(), 0, param->annotations); } + if (param->members) + { + unsigned int count = param->element_count ? param->element_count : param->member_count; + + for (i = 0; i < count; ++i) + free_parameter(&param->members[i], param->element_count != 0, TRUE); + HeapFree(GetProcessHeap(), 0, param->members); + } + + free_parameter_data(param, child); + /* only the parent has to release name and semantic */ if (!element) {

1 0

Paul Gofman : d3dx9: Fix IsParameterUsed() for the case when state references child parameter.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 1bd3cc24af577f1787d630d89562f58053ba8876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd3cc24af577f1787d630d89… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:48 2017 +0300 d3dx9: Fix IsParameterUsed() for the case when state references child parameter. 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/effect.c | 1 + dlls/d3dx9_36/tests/effect.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8861a05..1fd99832 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3728,6 +3728,7 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ unsigned int i; unsigned int member_count; + param = param->top_level_param; if (param_func(data, param)) return TRUE; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fdbc579..9a436d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5949,16 +5949,14 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); ok(!!param, "GetParameterByName failed.\n"); + todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), "Unexpected IsParameterUsed result.\n");

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
76
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 April 2017