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

Francois Gouget : xcopy: Spelling fix in a comment.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

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 Aug. 23, 2018

Aug. 23, 2018

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 : schedsvc: Fix a typo in a parameter name.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

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 Aug. 23, 2018

Aug. 23, 2018

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

Francois Gouget : dbghelp/tests: Make stack_walk_thread() static.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 44598d335e415267b247ba911b481830ea81f6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=44598d335e415267b247ba91… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:10 2018 +0200 dbghelp/tests: Make stack_walk_thread() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1292b66..214adb7 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -23,7 +23,7 @@ #if defined(__i386__) || defined(__x86_64__) -DWORD CALLBACK stack_walk_thread(void *arg) +static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); ok(!count, "got %d\n", count);

1 0

Józef Kucia : wined3d: Store max point size in d3d_info.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 95a051b333777ecbb27d38caa94f8d2bdc041a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a051b333777ecbb27d38ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:04 2018 +0200 wined3d: Store max point size in d3d_info. 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/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 8 +++----- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3a7270f..8c1cce4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->limits.vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d6bc739..7bd51f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1928,8 +1928,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2795,7 +2794,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; if (!(cs = heap_alloc_zero(sizeof(*cs)))) @@ -2804,8 +2803,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6e788b..ab67a96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4922,8 +4922,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_delete_opengl_contexts(device); memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->gl_info, - &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -5163,8 +5162,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return hr; } - state_init(&device->state, &device->fb, &adapter->gl_info, - &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 984cdbb..774cd48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } caps->MaxAnisotropy = gl_info->limits.anisotropy; - caps->MaxPointSize = gl_info->limits.pointsize_max; + caps->MaxPointSize = d3d_info->limits.pointsize_max; caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b4d1751..45a4008 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1113,21 +1113,22 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) +static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { union { struct wined3d_line_pattern lp; DWORD d; } lp; - union { + union + { float f; DWORD d; } tmpfloat; unsigned int i; struct wined3d_matrix identity; - TRACE("state %p, gl_info %p.\n", state, gl_info); + TRACE("state %p, d3d_info %p.\n", state, d3d_info); get_identity_matrix(&identity); state->gl_primitive_type = ~0u; @@ -1222,7 +1223,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d tmpfloat.f = 1.0f; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; - tmpfloat.f = gl_info->limits.pointsize_max; + tmpfloat.f = d3d_info->limits.pointsize_max; state->render_states[WINED3D_RS_POINTSIZE_MAX] = tmpfloat.d; state->render_states[WINED3D_RS_INDEXEDVERTEXBLENDENABLE] = FALSE; state->render_states[WINED3D_RS_COLORWRITEENABLE] = 0x0000000f; @@ -1316,8 +1317,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1330,7 +1330,7 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, } if (flags & WINED3D_STATE_INIT_DEFAULT) - state_init_default(state, gl_info); + state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1340,7 +1340,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0); + state_init(&stateblock->state, NULL, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6693a8..de0b486 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -163,6 +163,8 @@ struct wined3d_d3d_limits unsigned int ffp_blend_stages; unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + + float pointsize_max; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); @@ -3537,8 +3539,7 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id

1 0

Ken Thomases : winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: f0ad5b5c546d17b281aef13fde996cda08d0c14e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ad5b5c546d17b281aef13f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Aug 23 14:34:15 2018 -0500 winemac: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret);

1 0

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

Aug. 23, 2018

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 Aug. 23, 2018

Aug. 23, 2018

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 Aug. 23, 2018

Aug. 23, 2018

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