- Wine-Commits - list.winehq.org

Eric Pouech : wined3d: Reduce usage of long integral types in device.c.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 47ea1cb8105d9f931bfc6edd3576fbd2459cb63c URL: https://gitlab.winehq.org/wine/wine/-/commit/47ea1cb8105d9f931bfc6edd3576fb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:38:36 2022 +0100 wined3d: Reduce usage of long integral types in device.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5c2659850f5..bb1979a3d3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2889,7 +2889,7 @@ unsigned int CDECL wined3d_device_get_max_frame_latency(const struct wined3d_dev return device->max_frame_latency; } -static unsigned int wined3d_get_flexible_vertex_size(DWORD fvf) +static unsigned int wined3d_get_flexible_vertex_size(uint32_t fvf) { unsigned int texcoord_count = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; unsigned int i, size = 0; @@ -3433,7 +3433,7 @@ static void update_fog_factor(float *fog_factor, struct lights_settings *ls) /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, uint32_t flags, DWORD dst_fvf) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, uint32_t flags, uint32_t dst_fvf) { enum wined3d_material_color_source diffuse_source, specular_source, ambient_source, emissive_source; const struct wined3d_color *material_specular_state_colour; @@ -4580,7 +4580,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device { const struct wined3d_state *state = device->cs->c.state; struct wined3d_texture *texture; - DWORD i; + unsigned i; TRACE("device %p, num_passes %p.\n", device, num_passes);

1 0

Eric Pouech : wined3d: Enable long types in device.c.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 894e46365faeb21fa221dd72b11dd4b3cadc9a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/894e46365faeb21fa221dd72b11dd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:38:37 2022 +0100 wined3d: Enable long types in device.c. --- dlls/wined3d/device.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb1979a3d3c..c0646148c4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -23,7 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -324,7 +323,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { - ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); + ERR("Wine logo requested, but failed to create texture, hr %#lx.\n", hr); goto out; } @@ -553,7 +552,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc */ if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->default_sampler))) { - ERR("Failed to create default sampler, hr %#x.\n", hr); + ERR("Failed to create default sampler, hr %#lx.\n", hr); device->default_sampler = NULL; } @@ -566,7 +565,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc desc.mip_filter = WINED3D_TEXF_LINEAR; if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->null_sampler))) { - ERR("Failed to create null sampler, hr %#x.\n", hr); + ERR("Failed to create null sampler, hr %#lx.\n", hr); device->null_sampler = NULL; } } @@ -1264,7 +1263,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); + ERR("Failed to allocate shader private data, hr %#lx.\n", hr); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); @@ -1341,7 +1340,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; goto err_out; @@ -1868,7 +1867,7 @@ static void wined3d_device_set_render_state(struct wined3d_device *device, static void wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { - TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", + TRACE("device %p, sampler_idx %u, state %s, value %#lx.\n", device, sampler_idx, debug_d3dsamplerstate(state), value); if (value == device->cs->c.state->sampler_states[sampler_idx][state]) @@ -3485,7 +3484,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO box.right = box.left + dwCount * vertex_size; if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, WINED3D_MAP_WRITE))) { - WARN("Failed to map buffer, hr %#x.\n", hr); + WARN("Failed to map buffer, hr %#lx.\n", hr); return hr; } dest_ptr = map_desc.data; @@ -3835,7 +3834,7 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - TRACE("device %p, stage %u, state %s, value %#x.\n", + TRACE("device %p, stage %u, state %s, value %lx.\n", device, stage, debug_d3dtexturestate(state), value); if (stage >= d3d_info->limits.ffp_blend_stages) @@ -5703,7 +5702,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, focus_window = swapchain->state.device_window; if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) { - ERR("Failed to acquire focus window, hr %#x.\n", hr); + ERR("Failed to acquire focus window, hr %#lx.\n", hr); return hr; } } @@ -5728,7 +5727,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, * up their mess. Guild Wars also loses the device during that. */ if (FAILED(hr = wined3d_output_get_desc(swapchain_desc->output, &output_desc))) { - ERR("Failed to get output description, hr %#x.\n", hr); + ERR("Failed to get output description, hr %#lx.\n", hr); return hr; } @@ -5784,7 +5783,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &texture))) { - ERR("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); + ERR("Failed to create the auto depth/stencil surface, hr %#lx.\n", hr); return WINED3DERR_INVALIDCALL; } @@ -5799,7 +5798,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(texture); if (FAILED(hr)) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); return hr; } } @@ -5822,7 +5821,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { - ERR("Failed to create rendertarget view, hr %#x.\n", hr); + ERR("Failed to create rendertarget view, hr %#lx.\n", hr); return hr; } } @@ -6141,7 +6140,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined &adapter->d3d_info, supported_extensions, vertex_pipeline, fragment_pipeline, adapter->misc_state_template))) { - ERR("Failed to compile state table, hr %#x.\n", hr); + ERR("Failed to compile state table, hr %#lx.\n", hr); wine_rb_destroy(&device->samplers, NULL, NULL); wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL);

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in adapter_gl.c.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: f96630f04f68207db7c4ed2b95431d6bc36d94c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f96630f04f68207db7c4ed2b95431d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:47:13 2022 +0100 wined3d: Reduce usage of long integral types in adapter_gl.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8353a10a87a..fa9b24948d3 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -719,7 +719,7 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - DWORD data[4]; + unsigned int data[4]; GLuint tex, fbo; GLenum status; float color[4] = {0.0f, 1.0f, 0.0f, 0.0f};

1 0

Alex Henrie : include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 1a7efafbab61d54595f347527ce06f24593ddedb URL: https://gitlab.winehq.org/wine/wine/-/commit/1a7efafbab61d54595f347527ce06f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:01:13 2022 -0700 include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC). --- include/shlobj.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 20144fbc503..c7452cf5f0a 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1914,17 +1914,17 @@ WINSHELLAPI HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWOR #define PID_IS_DESCRIPTION 12 #define PID_IS_COMMENT 13 +WINSHELLAPI void WINAPI ILFree(ITEMIDLIST*); +WINSHELLAPI ITEMIDLIST* WINAPI ILClone(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCloneFirst(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCreateFromPathA(const char*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCreateFromPathW(const WCHAR*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +#define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath) +WINSHELLAPI ITEMIDLIST* WINAPI ILCombine(const ITEMIDLIST*,const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; WINSHELLAPI LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL); -WINSHELLAPI LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST); -WINSHELLAPI LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST); -WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR); -WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR); -#define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath) -WINSHELLAPI LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST); -WINSHELLAPI void WINAPI ILFree(LPITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST); WINSHELLAPI UINT WINAPI ILGetSize(LPCITEMIDLIST); WINSHELLAPI BOOL WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);

1 0

Jacek Caban : winex11: Remove no longer used declarations.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 1d3bf575e7fb019ddfca04f4e050bef2cb2856a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d3bf575e7fb019ddfca04f4e050be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 17:19:28 2022 +0100 winex11: Remove no longer used declarations. --- dlls/winex11.drv/graphics.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 6365c9a30ad..54e6b9b2084 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1643,18 +1643,6 @@ static char *get_icm_profile( unsigned long *size ) return ret; } -typedef struct -{ - unsigned int unknown[6]; - unsigned int state[5]; - unsigned int count[2]; - unsigned char buffer[64]; -} sha_ctx; - -extern void WINAPI A_SHAInit( sha_ctx * ); -extern void WINAPI A_SHAUpdate( sha_ctx *, const unsigned char *, unsigned int ); -extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * ); - static const WCHAR mntr_key[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',

1 0

Brendan Shanks : loader: In macOS preloader, set NXArgc, NXArgv, and environ on i386 and x86_64.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: f99eef6847dffad30e3d06942b532a77545eb098 URL: https://gitlab.winehq.org/wine/wine/-/commit/f99eef6847dffad30e3d06942b532a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 6 11:58:12 2022 -0800 loader: In macOS preloader, set NXArgc, NXArgv, and environ on i386 and x86_64. --- loader/preloader_mac.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index bb9336ead2c..5df185d0960 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -640,6 +640,34 @@ static void fixup_stack( void *stack ) memmove(&argv[0], &argv[1], (char *)apple_end - (char *)&argv[1]); } +static void set_program_vars( void *stack, void *mod ) +{ + int *pargc; + char **argv, **env; + int *wine_NXArgc = pdlsym( mod, "NXArgc" ); + char ***wine_NXArgv = pdlsym( mod, "NXArgv" ); + char ***wine_environ = pdlsym( mod, "environ" ); + + pargc = stack; + argv = (char **)pargc + 1; + env = &argv[*pargc-1] + 2; + + if (wine_NXArgc) + *wine_NXArgc = *pargc; + else + wld_printf( "preloader: Warning: failed to set NXArgc\n" ); + + if (wine_NXArgv) + *wine_NXArgv = argv; + else + wld_printf( "preloader: Warning: failed to set NXArgv\n" ); + + if (wine_environ) + *wine_environ = env; + else + wld_printf( "preloader: Warning: failed to set environ\n" ); +} + void *wld_start( void *stack, int *is_unix_thread ) { struct wine_preload_info builtin_dlls = { (void *)0x7a000000, 0x02000000 }; @@ -704,21 +732,14 @@ void *wld_start( void *stack, int *is_unix_thread ) /* decrement argc and "remove" argv[0] */ fixup_stack(stack); -#if defined(__x86_64__) - /* For LC_UNIXTHREAD binaries on Monterey and later, 'environ' is not set and is NULL. - * Set the correct value here. + /* Set NXArgc, NXArgv, and environ in the new binary. + * On different configurations these were either NULL/0 or still had their + * values from this preloader's launch. + * + * In particular, environ was not being updated, resulting in environ[0] being lost. + * And for LC_UNIXTHREAD binaries on Monterey and later, environ was just NULL. */ - if (*is_unix_thread) - { - char **env, ***wine_environ = pdlsym( mod, "environ" ); - - pargc = stack; - argv = (char **)pargc + 1; - env = &argv[*pargc-1] + 2; - - *wine_environ = env; - } -#endif + set_program_vars( stack, mod ); return entry; }

1 0

Eric Pouech : wined3d: Enable long integral types in cs.c.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 386414fbdcaf0bcc20fb6381e1d3b06ce32cacc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/386414fbdcaf0bcc20fb6381e1d3b0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:46:19 2022 +0100 wined3d: Enable long integral types in cs.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/cs.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f5208c6bd9..4579cba27fe 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -15,7 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -3153,8 +3152,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size = packet_size - header_size; if (packet_size >= WINED3D_CS_QUEUE_SIZE) { - ERR("Packet size %lu >= queue size %u.\n", - (unsigned long)packet_size, WINED3D_CS_QUEUE_SIZE); + ERR("Packet size %Iu >= queue size %u.\n", packet_size, WINED3D_CS_QUEUE_SIZE); return NULL; } @@ -3164,8 +3162,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t nop_size = remaining - header_size; struct wined3d_cs_nop *nop; - TRACE("Inserting a nop for %lu + %lu bytes.\n", - (unsigned long)header_size, (unsigned long)nop_size); + TRACE("Inserting a nop for %Iu + %Iu bytes.\n", header_size, nop_size); nop = wined3d_cs_queue_require_space(queue, nop_size, cs); if (nop_size) @@ -3194,8 +3191,8 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size if (new_pos < tail && new_pos) break; - TRACE("Waiting for free space. Head %u, tail %u, packet size %lu.\n", - head, tail, (unsigned long)packet_size); + TRACE("Waiting for free space. Head %lu, tail %lu, packet size %Iu.\n", + head, tail, packet_size); } packet = (struct wined3d_cs_packet *)&queue->data[head];

1 0

Alex Henrie : include: Annotate GdipAlloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: dfb025c39ea254f270707cfb693dae3b83cb3231 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb025c39ea254f270707cfb693dae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:33:57 2022 -0700 include: Annotate GdipAlloc with __WINE_(DEALLOC|MALLOC). --- include/gdiplusmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/gdiplusmem.h b/include/gdiplusmem.h index fad8ed6772d..896fdf43a03 100644 --- a/include/gdiplusmem.h +++ b/include/gdiplusmem.h @@ -25,8 +25,8 @@ extern "C" { #endif -void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1); void WINGDIPAPI GdipFree(void*); +void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(GdipFree) __WINE_MALLOC; #ifdef __cplusplus }

1 0

Alex Henrie : include: Annotate (Alloc|Realloc)ADs* with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 5e943f6e1a4a09297ba74e2c7c1c893efa5ff89b URL: https://gitlab.winehq.org/wine/wine/-/commit/5e943f6e1a4a09297ba74e2c7c1c89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:26:18 2022 -0700 include: Annotate (Alloc|Realloc)ADs* with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/adshlp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/adshlp.h b/include/adshlp.h index dac57857edb..5dacbb6b821 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -23,14 +23,17 @@ extern "C" { #endif +BOOL WINAPI FreeADsMem(void*); +void* WINAPI AllocADsMem(DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +BOOL WINAPI FreeADsStr(WCHAR*); +WCHAR* WINAPI AllocADsStr(WCHAR*) __WINE_DEALLOC(FreeADsStr) __WINE_MALLOC; + HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -LPWSTR WINAPI AllocADsStr(LPWSTR); -BOOL WINAPI FreeADsMem(LPVOID); -BOOL WINAPI FreeADsStr(LPWSTR); #ifdef __cplusplus }

1 0

Alex Henrie : include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC).
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 803c616f7e9ed99353bc6729627e72c26d59756a URL: https://gitlab.winehq.org/wine/wine/-/commit/803c616f7e9ed99353bc6729627e72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 00:23:57 2022 -0700 include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC). --- include/wsdutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wsdutil.h b/include/wsdutil.h index 402a4130bbc..b118fcf7861 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -19,7 +19,7 @@ #ifndef WSDUTIL_H #define WSDUTIL_H -void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize); +void * WINAPI WSDAllocateLinkedMemory(void *parent, SIZE_T size) __WINE_ALLOC_SIZE(2) __WINE_MALLOC; void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); void WINAPI WSDFreeLinkedMemory(void *pVoid);

1 0