August 2018 - Wine-commits - list.winehq.org

Francois Gouget : winebus.sys: Avoid calling strdup().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: a53591ad3cd5a7e549451587fd2b6a696da2c109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53591ad3cd5a7e549451587… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:28 2018 +0200 winebus.sys: Avoid calling strdup(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c..788b564 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -65,6 +65,7 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #ifdef HAS_PROPER_INPUT_HEADER @@ -1046,7 +1047,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, DWORD *product_id, WCHAR **serial_number) { DWORD bus_type; - char *tmp = strdup(uevent); + char *tmp; char *saveptr = NULL; char *line; char *key; @@ -1055,6 +1056,8 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, int found_id = 0; int found_serial = 0; + tmp = heap_alloc(strlen(uevent) + 1); + strcpy(tmp, uevent); line = strtok_r(tmp, "\n", &saveptr); while (line != NULL) { @@ -1092,7 +1095,7 @@ next_line: line = strtok_r(NULL, "\n", &saveptr); } - free(tmp); + heap_free(tmp); return (found_id && found_serial); }

1 0

Francois Gouget : wsdapi/tests: Avoid calls to malloc() and free().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: ad5457335117880274dc724c440c0b26ad57d14b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5457335117880274dc724c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:41 2018 +0200 wsdapi/tests: Avoid calls to malloc() and free(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 43a4b2c..f33f469 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -1029,20 +1029,20 @@ static void Publish_tests(void) another_name.LocalName = (WCHAR *) name_cider; another_name.Space = &ns2; - types_list.Next = malloc(sizeof(WSD_NAME_LIST)); + types_list.Next = heap_alloc(sizeof(WSD_NAME_LIST)); types_list.Element = &another_name; types_list.Next->Next = NULL; types_list.Next->Element = &header_any_name; /* Create scopes and xaddrs lists */ - scopes_list.Next = malloc(sizeof(WSD_URI_LIST)); + scopes_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); scopes_list.Element = uri; scopes_list.Next->Next = NULL; scopes_list.Next->Element = uri_more_tests; - xaddrs_list.Next = malloc(sizeof(WSD_URI_LIST)); + xaddrs_list.Next = heap_alloc(sizeof(WSD_URI_LIST)); xaddrs_list.Element = uri_more_tests; xaddrs_list.Next->Next = NULL; @@ -1056,9 +1056,9 @@ static void Publish_tests(void) WSDFreeLinkedMemory(body_any_element); WSDFreeLinkedMemory(endpoint_any_element); WSDFreeLinkedMemory(ref_param_any_element); - free(types_list.Next); - free(scopes_list.Next); - free(xaddrs_list.Next); + heap_free(types_list.Next); + heap_free(scopes_list.Next); + heap_free(xaddrs_list.Next); ok(rc == S_OK, "Publish failed: %08x\n", rc);

1 0

Francois Gouget : winevulkan: Spelling fix in a perl comment.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 67bd05669d98ac3aa38e600389d25e0657ee55ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bd05669d98ac3aa38e6003… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:49 2018 +0200 winevulkan: Spelling fix in a perl comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3be6a8d..5b0f82c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2165,7 +2165,7 @@ class VkGenerator(object): f.write(define.definition()) for handle in self.registry.handles: - # For backwards compatiblity also create definitions for aliases. + # For backward compatibility also create definitions for aliases. # These types normally don't get pulled in as we use the new types # even in legacy functions if they are aliases. if handle.is_required() or handle.is_alias():

1 0

Francois Gouget : xcopy: Spelling fix in a comment.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: fb6b48d3e2dada84792adf7c27a63d964e231128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6b48d3e2dada84792adf7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:57 2018 +0200 xcopy: Spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 616c7d2..eb8c3f0 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -872,7 +872,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, goto out; } - /* Unless overriden above, skip over the '/' and the first character */ + /* Unless overridden above, skip over the '/' and the first character */ if (rest == NULL) rest = &word[2]; /* By now, rest should point either to the null after the

1 0

Francois Gouget : winedump: Spelling fix in a comment.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 4522fcf0b0024814e2fbf3dcc5b6134998234989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4522fcf0b0024814e2fbf3dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:03 2018 +0200 winedump: Spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 701c527..bed5393 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1165,7 +1165,7 @@ static const char *lookup_code(const BYTE *table, DWORD table_size, struct bitst if (p + 1 < table + table_size && *(p + 1)) { - /* FIXME: Whats the meaning of *p? */ + /* FIXME: What is the meaning of *p? */ const BYTE *q = p + 1; while (q < table + table_size && *q) q++; return (q < table + table_size) ? (const char *)(p + 1) : NULL;

1 0

Francois Gouget : ntdll/tests: Spelling fixes in comments.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: f466fb4e53770dc03310669de2b529463daee96e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f466fb4e53770dc03310669d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:20 2018 +0200 ntdll/tests: Spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 07fa1cd..5fe72ec 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1458,9 +1458,9 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correct + /* win_broken: older versions of windows do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. - ex_skip: test doesnt make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ + ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; } ipv6_tests[] = { @@ -2284,7 +2284,7 @@ static void test_RtlIpv6StringToAddressEx(void) /* sanity check */ ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); - /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ + /* first we run all ip related tests, to make sure someone didn't accidentally reimplement instead of re-use. */ for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { ULONG scope = 0xbadf00d;

1 0

Francois Gouget : include: Fix the name of a Wininet error code.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: d5f4e0402d5bd98d5cbe65a32697f2bf9605da67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f4e0402d5bd98d5cbe65a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:27 2018 +0200 include: Fix the name of a Wininet error code. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winerror.h b/include/winerror.h index 886182f..6193c24 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3042,7 +3042,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) #define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) #define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) -#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_INVALID_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072f01) #define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) #define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) #define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05)

1 0

Francois Gouget : schedsvc: Fix a typo in a parameter name.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: b76cd9c588bc6aa29e4784c52719f9c8d9e791c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b76cd9c588bc6aa29e4784c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:35 2018 +0200 schedsvc: Fix a typo in a parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/atsvc.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index 5c723ed..e95e6cf 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -65,7 +65,7 @@ interface atsvc [in] DWORD MinJobId, [in] DWORD MaxJobId); DWORD NetrJobEnum([in,string,unique] ATSVC_HANDLE ServerName, - [in,out] LPAT_ENUM_CONTAINER pEnumContainer, [in] DWORD PreferedMaximumLength, + [in,out] LPAT_ENUM_CONTAINER pEnumContainer, [in] DWORD PreferredMaximumLength, [out] LPDWORD pTotalEntries, [in,out,unique] LPDWORD pResumeHandle); DWORD NetrJobGetInfo([in,string,unique] ATSVC_HANDLE ServerName,

1 0

Alistair Leslie-Hughes : odbccp32: Fake success from SQLWriteDSNToIni/W.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: ab6dfd058115025bc37c72c7daa082defef29529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6dfd058115025bc37c72c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 23 06:11:59 2018 +0000 odbccp32: Fake success from SQLWriteDSNToIni/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 60254d0..694a90c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1545,16 +1545,14 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { clear_errors(); FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { clear_errors(); FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName,

1 0

Józef Kucia : wined3d: Get rid of unused gl_info parameters.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 4df05c37db3885b124e4eeeea30efd1b9c25ba22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df05c37db3885b124e4eeee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:02 2018 +0200 wined3d: Get rid of unused gl_info parameters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de1f9d9..3e898c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1227,8 +1227,8 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) @@ -1247,8 +1247,8 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1315,8 +1315,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { - if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) + && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) { TRACE("Formats match.\n"); return WINED3D_OK; @@ -1381,7 +1381,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, enum wined3d_gl_resource_type gl_type) { /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + if (!(ds_format->depth_size || ds_format->stencil_size)) + return FALSE; /* Blacklist formats not supported on Windows */ switch (ds_format->id) @@ -1409,8 +1410,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) + if (wined3d_check_pixel_format_color(cfg, display_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } } @@ -1449,7 +1450,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) + && wined3d_check_pixel_format_color(&cfgs[i], check_format)) { TRACE("Pixel format %d is compatible with format %s.\n", cfgs[i].iPixelFormat, debug_d3dformat(check_format->id));

1 0