wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Documentation() should accept NULL input.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 62ea04298bdacb4d15c97d66b1949949025a41c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea04298bdacb4d15c97d66… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:27:01 2018 +0800 taskschd: IRegistrationInfo::put_Documentation() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c226446..3a3b5e1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -689,15 +689,14 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *iface, BSTR doc) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(doc)); - if (!doc) return E_INVALIDARG; - + if (doc && !(str = heap_strdupW(doc))) return E_OUTOFMEMORY; heap_free(reginfo->documentation); - reginfo->documentation = heap_strdupW(doc); - /* FIXME: update XML on the server side */ - return reginfo->documentation ? S_OK : E_OUTOFMEMORY; + reginfo->documentation = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BSTR *xml) @@ -3331,6 +3330,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Date(info, value); } + else if (!lstrcmpW(name, Documentation)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Documentation(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 2e6a8c4..b499f0b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1427,6 +1427,7 @@ static void test_TaskDefinition(void) " <Author>author</Author>\n" " <Version>1.0</Version>\n" " <Date>2018-04-02T11:22:33</Date>\n" + " <Documentation>doc</Documentation>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1509,6 +1510,7 @@ static void test_TaskDefinition(void) static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static const WCHAR versionW[] = { '1','.','0',0 }; static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; + static const WCHAR docW[] = { 'd','o','c',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1650,7 +1652,15 @@ todo_wine hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); ok(hr == S_OK, "get_Documentation error %#x\n", hr); + ok(!lstrcmpW(bstr, docW), "expected %s, got %s\n", wine_dbgstr_w(docW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Documentation(reginfo, NULL); + ok(hr == S_OK, "put_Documentation error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); + ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_URI(reginfo, &bstr); ok(hr == S_OK, "get_URI error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Date() should accept NULL input.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 57c936b05c3c9ad02afd18236b8d657a678a2a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c936b05c3c9ad02afd1823… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:26:58 2018 +0800 taskschd: IRegistrationInfo::put_Date() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 02e7cae..c226446 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -662,15 +662,14 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR date) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(date)); - if (!date) return E_INVALIDARG; - + if (date && !(str = heap_strdupW(date))) return E_OUTOFMEMORY; heap_free(reginfo->date); - reginfo->date = heap_strdupW(date); - /* FIXME: update XML on the server side */ - return reginfo->date ? S_OK : E_OUTOFMEMORY; + reginfo->date = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *iface, BSTR *doc) @@ -3326,6 +3325,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Version(info, value); } + else if (!lstrcmpW(name, Date)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Date(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c46d849..2e6a8c4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1426,6 +1426,7 @@ static void test_TaskDefinition(void) " <Description>\"Task1\"</Description>\n" " <Author>author</Author>\n" " <Version>1.0</Version>\n" + " <Date>2018-04-02T11:22:33</Date>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1507,6 +1508,7 @@ static void test_TaskDefinition(void) "</Task>\n"; static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static const WCHAR versionW[] = { '1','.','0',0 }; + static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1637,7 +1639,15 @@ todo_wine hr = IRegistrationInfo_get_Date(reginfo, &bstr); ok(hr == S_OK, "get_Date error %#x\n", hr); + ok(!lstrcmpW(bstr, dateW), "expected %s, got %s\n", wine_dbgstr_w(dateW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Date(reginfo, NULL); + ok(hr == S_OK, "put_Date error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Date(reginfo, &bstr); + ok(hr == S_OK, "get_Date error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Version() should accept NULL input.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 8ad8d05af05a34807d6bd97147561b96a247f17e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad8d05af05a34807d6bd971… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:26:56 2018 +0800 taskschd: IRegistrationInfo::put_Version() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7ae478f..02e7cae 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -635,15 +635,14 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BSTR version) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(version)); - if (!version) return E_INVALIDARG; - + if (version && !(str = heap_strdupW(version))) return E_OUTOFMEMORY; heap_free(reginfo->version); - reginfo->version = heap_strdupW(version); - /* FIXME: update XML on the server side */ - return reginfo->version ? S_OK : E_OUTOFMEMORY; + reginfo->version = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR *date) @@ -3321,6 +3320,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Description(info, value); } + else if (!lstrcmpW(name, Version)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Version(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d006dff..c46d849 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1425,6 +1425,7 @@ static void test_TaskDefinition(void) " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" " <Author>author</Author>\n" + " <Version>1.0</Version>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1505,6 +1506,7 @@ static void test_TaskDefinition(void) " </Actions>\n" "</Task>\n"; static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; + static const WCHAR versionW[] = { '1','.','0',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1624,7 +1626,15 @@ todo_wine hr = IRegistrationInfo_get_Version(reginfo, &bstr); ok(hr == S_OK, "get_Version error %#x\n", hr); + ok(!lstrcmpW(bstr, versionW), "expected %s, got %s\n", wine_dbgstr_w(versionW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Version(reginfo, NULL); + ok(hr == S_OK, "put_Version error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Version(reginfo, &bstr); + ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Date(reginfo, &bstr); ok(hr == S_OK, "get_Date error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Author() should accept NULL input.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 6c091f879025d67395c85a644ae07386d57dc419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c091f879025d67395c85a64… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:26:53 2018 +0800 taskschd: IRegistrationInfo::put_Author() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 933d833..7ae478f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -608,15 +608,14 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR author) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(author)); - if (!author) return E_INVALIDARG; - + if (author && !(str = heap_strdupW(author))) return E_OUTOFMEMORY; heap_free(reginfo->author); - reginfo->author = heap_strdupW(author); - /* FIXME: update XML on the server side */ - return reginfo->author ? S_OK : E_OUTOFMEMORY; + reginfo->author = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BSTR *version) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 82f3315..d006dff 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1424,6 +1424,7 @@ static void test_TaskDefinition(void) "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" + " <Author>author</Author>\n" " </RegistrationInfo>\n" " <Settings>\n" " <Enabled>false</Enabled>\n" @@ -1503,6 +1504,7 @@ static void test_TaskDefinition(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const WCHAR authorW[] = { 'a','u','t','h','o','r',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1611,7 +1613,15 @@ todo_wine hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); + ok(!lstrcmpW(bstr, authorW), "expected %s, got %s\n", wine_dbgstr_w(authorW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_Author(reginfo, NULL); + ok(hr == S_OK, "put_Author error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Author(reginfo, &bstr); + ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Version(reginfo, &bstr); ok(hr == S_OK, "get_Version error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Description() should accept NULL input.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 19f4037dd5abcc40c92aea651e11570801d1f140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f4037dd5abcc40c92aea65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:26:51 2018 +0800 taskschd: IRegistrationInfo::put_Description() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 19546c0..933d833 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -581,15 +581,14 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(description)); - if (!description) return E_INVALIDARG; - + if (description && !(str = heap_strdupW(description))) return E_OUTOFMEMORY; heap_free(reginfo->description); - reginfo->description = heap_strdupW(description); - /* FIXME: update XML on the server side */ - return reginfo->description ? S_OK : E_OUTOFMEMORY; + reginfo->description = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c0f691a..82f3315 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1602,6 +1602,13 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = IRegistrationInfo_put_Description(reginfo, NULL); + ok(hr == S_OK, "put_Description error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + ok(hr == S_OK, "get_Description error %#x\n", hr); + ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Michael Stefaniuc : winex11.drv: Print a debugstr and not the pointer to it.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 121f20453bf18cbf274a0563e912e92e86bb9264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=121f20453bf18cbf274a0563… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:50 2018 +0200 winex11.drv: Print a debugstr and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f881b0f..c2c1c6a 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -335,7 +335,7 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ unsigned int i; VkResult res; - TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name)

1 0

Michael Stefaniuc : shell32: Remove redundant NULL checks before heap_free ().
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 9a270d7e2a648567175fdc62bd859df73cb40923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a270d7e2a648567175fdc62… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:45 2018 +0200 shell32: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c54fe78..c8b93d3 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -184,7 +184,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, delete_groupW)) @@ -224,7 +224,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - if (last_group) heap_free(last_group); + heap_free(last_group); last_group = path; } else if (!strcmpiW(command, add_itemW))

1 0

Michael Stefaniuc : user32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: e8411d22d5399a1fd76270f78ef70300555842c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8411d22d5399a1fd76270f7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:49 2018 +0200 user32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 12 ++++++------ dlls/user32/dialog.c | 4 ++-- dlls/user32/exticon.c | 4 ++-- dlls/user32/mdi.c | 8 ++++---- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/msgbox.c | 2 +- dlls/user32/nonclient.c | 4 ++-- dlls/user32/spy.c | 11 +++++------ dlls/user32/sysparams.c | 7 +++---- dlls/user32/text.c | 2 +- dlls/user32/win.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8411d22d5399a1fd762…

1 0

Michael Stefaniuc : user32: Remove an ARRAY_SIZE()-like macro.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 6e7f28d934d5675b1154fab818a0215bb8d9b603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7f28d934d5675b1154fab8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:48 2018 +0200 user32: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2c4ff5e..2fcf2fb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1300,7 +1300,6 @@ static struct sysparam_rgb_entry system_colors[] = RGB_ENTRY( COLOR_MENUBAR, RGB(212, 208, 200) ) #undef RGB_ENTRY }; -#define NUM_SYS_COLORS (sizeof(system_colors) / sizeof(system_colors[0])) /* entries that are initialized by default in the registry */ static union sysparam_all_entry * const default_entries[] = @@ -2690,7 +2689,8 @@ COLORREF WINAPI DECLSPEC_HOTPATCH GetSysColor( INT nIndex ) { COLORREF ret = 0; - if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) get_entry( &system_colors[nIndex], 0, &ret ); + if (nIndex >= 0 && nIndex < ARRAY_SIZE( system_colors )) + get_entry( &system_colors[nIndex], 0, &ret ); return ret; } @@ -2705,7 +2705,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= NUM_SYS_COLORS) + if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */ @@ -2735,7 +2735,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes */ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) { - if (index < 0 || index >= NUM_SYS_COLORS) return 0; + if (index < 0 || index >= ARRAY_SIZE( system_colors )) return 0; if (!system_colors[index].brush) { @@ -2757,7 +2757,7 @@ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) HPEN SYSCOLOR_GetPen( INT index ) { /* We can assert here, because this function is internal to Wine */ - assert (0 <= index && index < NUM_SYS_COLORS); + assert (0 <= index && index < ARRAY_SIZE( system_colors )); if (!system_colors[index].pen) {

1 0

Michael Stefaniuc : wsdapi: Remove redundant NULL checks before heap_free( ).
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: aae4f1142f81e7964f64859267cfe945cc9a29c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4f1142f81e7964f648592… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:47 2018 +0200 wsdapi: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index cfcae6b..bea63fb 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -215,7 +215,7 @@ BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, U ret = TRUE; cleanup: - if (adapter_addresses != NULL) heap_free(adapter_addresses); + heap_free(adapter_addresses); return ret; } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 7779317..970bc4f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -127,8 +127,7 @@ static inline void free_xml_string(WS_XML_STRING *value) if (value == NULL) return; - if (value->bytes != NULL) - heap_free(value->bytes); + heap_free(value->bytes); heap_free(value); }

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 2018