- Wine-Commits - list.winehq.org

Eric Pouech : wined3d: Set resource's priority field's type as unsigned int.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 29c2bb54e25c1e27a05e39021c3034c7ec6a720f URL: https://gitlab.winehq.org/wine/wine/-/commit/29c2bb54e25c1e27a05e39021c3034… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 1 00:18:52 2022 +0100 wined3d: Set resource's priority field's type as unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/resource.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a00e235a29b..e2100627198 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -265,9 +265,9 @@ void resource_unload(struct wined3d_resource *resource) ERR("Resource %p is being unloaded while mapped.\n", resource); } -DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority) +unsigned int CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, unsigned int priority) { - DWORD prev; + unsigned int prev; if (!(resource->usage & WINED3DUSAGE_MANAGED)) { @@ -281,7 +281,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO return prev; } -DWORD CDECL wined3d_resource_get_priority(const struct wined3d_resource *resource) +unsigned int CDECL wined3d_resource_get_priority(const struct wined3d_resource *resource) { TRACE("resource %p, returning %u.\n", resource, resource->priority); return resource->priority; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff09a014dac..a8f9921736b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4424,7 +4424,7 @@ struct wined3d_resource UINT height; UINT depth; UINT size; - DWORD priority; + unsigned int priority; void *heap_memory; uint32_t pin_sysmem : 1; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a8008fe87e2..ae0bc309b3f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2675,12 +2675,12 @@ ULONG __cdecl wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *s void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc); void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); -DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource); +unsigned int __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource); HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags); void __cdecl wined3d_resource_preload(struct wined3d_resource *resource); void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); -DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); +unsigned int __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, unsigned int priority); HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_view_desc *desc,

1 0

Eric Pouech : wined3d: Store version information as unsigned int.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: dec7da286041f4eff7a588faeb0745720489fd43 URL: https://gitlab.winehq.org/wine/wine/-/commit/dec7da286041f4eff7a588faeb0745… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 1 00:18:49 2022 +0100 wined3d: Store version information as unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 7 ++++--- dlls/wined3d/shader_sm1.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3131fdadeae..7ea14a4abd5 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1142,7 +1142,7 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_cap test_pbo_functionality(gl_info); } -static DWORD wined3d_parse_gl_version(const char *gl_version) +static unsigned int wined3d_parse_gl_version(const char *gl_version) { const char *ptr = gl_version; int major, minor; @@ -3394,7 +3394,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, }; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; - DWORD gl_version, gl_ext_emul_mask; + unsigned int gl_version; + DWORD gl_ext_emul_mask; const char *WGL_Extensions = NULL; enum wined3d_gl_vendor gl_vendor; GLint context_profile = 0; @@ -5284,7 +5285,7 @@ end: static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { - static const DWORD supported_gl_versions[] = + static const unsigned int supported_gl_versions[] = { MAKEDWORD_VERSION(4, 4), MAKEDWORD_VERSION(3, 2), diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 50969c058f2..1a2f0fe17dc 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -428,7 +428,7 @@ static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token) { - DWORD shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); + unsigned int shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table; unsigned int i = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7c9c75364c..2a6cbd29313 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -510,7 +510,7 @@ enum wined3d_shader_backend struct wined3d_settings { unsigned int cs_multithreaded; - DWORD max_gl_version; + unsigned int max_gl_version; int offscreen_rendering_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; @@ -3374,8 +3374,8 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g struct wined3d_gl_info { - DWORD selected_gl_version; - DWORD glsl_version; + unsigned int selected_gl_version; + unsigned int glsl_version; struct wined3d_gl_limits limits; DWORD reserved_glsl_constants, reserved_arb_constants; DWORD quirks; @@ -3451,8 +3451,8 @@ struct wined3d_driver_info char description[WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH]; UINT64 vram_bytes; UINT64 sysmem_bytes; - DWORD version_high; - DWORD version_low; + unsigned int version_high; + unsigned int version_low; }; bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info,

1 0

Eric Pouech : wined3d: Convert fbo_entry.rt_mask to uint32_t type.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: ccaa09e66fb3de55c537c399873864c9f2171c9d URL: https://gitlab.winehq.org/wine/wine/-/commit/ccaa09e66fb3de55c537c399873864… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 1 00:18:54 2022 +0100 wined3d: Convert fbo_entry.rt_mask to uint32_t type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2f6db56a961..8c285f3eba7 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3666,7 +3666,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); const struct wined3d_fb_state *fb = &state->fb; DWORD color_location = 0; - DWORD *cur_mask; + uint32_t *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7fd94b133a..4435b9e5b34 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7590,7 +7590,7 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff } else { - DWORD mask = shader->reg_maps.rt_mask; + uint32_t mask = shader->reg_maps.rt_mask; while (mask) { @@ -7841,7 +7841,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ } else { - DWORD mask = reg_maps->rt_mask; + uint32_t mask = reg_maps->rt_mask; while (mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8f9921736b..ebbf0e8cba0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4875,7 +4875,7 @@ struct fbo_entry { struct list entry; uint32_t flags; - DWORD rt_mask; + uint32_t rt_mask; GLuint id; struct wined3d_fbo_entry_key {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 4febd9d880abe22e77a3d8283de245a691cf2b7f URL: https://gitlab.winehq.org/wine/wine/-/commit/4febd9d880abe22e77a3d8283de245… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Dec 1 23:36:38 2022 +0200 po: Update Lithuanian translation. --- po/lt.po | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/po/lt.po b/po/lt.po index 06e15d4288d..d1064ad7dd4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-09-23 23:24+0300\n" +"PO-Revision-Date: 2022-12-01 23:35+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3752,25 +3752,23 @@ msgstr "" #: dlls/joy.cpl/joy.rc:55 msgid "DInput" -msgstr "" +msgstr "DInput" #: dlls/joy.cpl/joy.rc:59 msgid "Axes" -msgstr "" +msgstr "Ašys" #: dlls/joy.cpl/joy.rc:60 msgid "POVs" -msgstr "" +msgstr "POV" #: dlls/joy.cpl/joy.rc:61 msgid "Buttons" msgstr "Mygtukai" #: dlls/joy.cpl/joy.rc:62 -#, fuzzy -#| msgid "Test Force Feedback" msgid "Force Feedback Effect" -msgstr "Testuoti „Force Feedback“" +msgstr "„Force Feedback“ efektas" #: dlls/joy.cpl/joy.rc:64 msgid "" @@ -3782,60 +3780,60 @@ msgstr "" #: dlls/joy.cpl/joy.rc:70 msgid "XInput" -msgstr "" +msgstr "XInput" #: dlls/joy.cpl/joy.rc:73 -#, fuzzy -#| msgid "User" msgid "User #0" -msgstr "Naudotojas" +msgstr "Naudotojas #0" #: dlls/joy.cpl/joy.rc:74 -#, fuzzy -#| msgid "User" msgid "User #1" -msgstr "Naudotojas" +msgstr "Naudotojas #1" #: dlls/joy.cpl/joy.rc:75 -#, fuzzy -#| msgid "User" msgid "User #2" -msgstr "Naudotojas" +msgstr "Naudotojas #2" #: dlls/joy.cpl/joy.rc:76 -#, fuzzy -#| msgid "User" msgid "User #3" -msgstr "Naudotojas" +msgstr "Naudotojas #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Nerastas naudotojas lizde #0, įsitikinkite, kad žaidimų pultas prijungtas ir " +"nenustelbtas dėl DInput Vairasvirčių kortelėje." #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Nerastas naudotojas lizde #1, įsitikinkite, kad žaidimų pultas prijungtas ir " +"nenustelbtas dėl DInput Vairasvirčių kortelėje." #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Nerastas naudotojas lizde #2, įsitikinkite, kad žaidimų pultas prijungtas ir " +"nenustelbtas dėl DInput Vairasvirčių kortelėje." #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " "overriden for DInput in the Joysticks tab." msgstr "" +"Nerastas naudotojas lizde #3, įsitikinkite, kad žaidimų pultas prijungtas ir " +"nenustelbtas dėl DInput Vairasvirčių kortelėje." #: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 msgid "Rumble" -msgstr "" +msgstr "Vibravimas" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers"

1 0

Rémi Bernon : inetcomm: Allocate PROPVARIANT value with CoTaskMemAlloc.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 87cf8129c60761fd51ee741b4a6c94cf5450c8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/87cf8129c60761fd51ee741b4a6c94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 21:08:09 2022 +0100 inetcomm: Allocate PROPVARIANT value with CoTaskMemAlloc. --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a64bc7c1d5d..977cdfa16d9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -714,7 +714,7 @@ static void read_value(header_t *header, char **cur) } while(*end == ' ' || *end == '\t'); len = end - *cur; - value = malloc(len + 1); + value = CoTaskMemAlloc(len + 1); memcpy(value, *cur, len); value[len] = '\0';

1 0

Rémi Bernon : inetcomm: Free IMoniker_GetDisplayName value with CoTaskMemFree.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 1523b15ae30e2bcd63301606248d8fa46c93db12 URL: https://gitlab.winehq.org/wine/wine/-/commit/1523b15ae30e2bcd63301606248d8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 21:08:32 2022 +0100 inetcomm: Free IMoniker_GetDisplayName value with CoTaskMemFree. --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 977cdfa16d9..ceacf5ded42 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3707,7 +3707,7 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx lstrcpyW(mhtml_url, L"mhtml:"); lstrcatW(mhtml_url, display_name); - free(display_name); + CoTaskMemFree(display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); free(mhtml_url);

1 0

Rémi Bernon : taskschd: Use CRT functions for remaining heap allocations.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 9f29812504db22895fd324c1f664e88cdd8b0d03 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f29812504db22895fd324c1f664e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 15:00:12 2022 +0100 taskschd: Use CRT functions for remaining heap allocations. --- dlls/taskschd/folder.c | 16 ++++++++-------- dlls/taskschd/task.c | 22 +++++++++++----------- dlls/taskschd/taskschd_private.h | 2 -- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index f7f43d9348b..87eac46f882 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -58,8 +58,8 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(folder->path); - heap_free(folder); + free(folder->path); + free(folder); } return ref; @@ -211,7 +211,7 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) if (parent) len += lstrlenW(parent); /* +1 if parent is not '\' terminated */ - folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + folder_path = malloc((len + 2) * sizeof(WCHAR)); if (!folder_path) return NULL; folder_path[0] = 0; @@ -253,7 +253,7 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON if (!folder_path) return E_OUTOFMEMORY; hr = SchRpcDelete(folder_path, 0); - heap_free(folder_path); + free(folder_path); return hr; } @@ -304,7 +304,7 @@ static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG if (!folder_path) return E_OUTOFMEMORY; hr = SchRpcDelete(folder_path, 0); - heap_free(folder_path); + free(folder_path); return hr; } @@ -448,14 +448,14 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (FAILED(hr)) { - heap_free(folder_path); + free(folder_path); return hr; } - folder = heap_alloc(sizeof(*folder)); + folder = malloc(sizeof(*folder)); if (!folder) { - heap_free(folder_path); + free(folder_path); return E_OUTOFMEMORY; } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b84d693dced..d9ddf9d12b8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -310,7 +310,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) { DailyTrigger *daily_trigger; - daily_trigger = heap_alloc(sizeof(*daily_trigger)); + daily_trigger = malloc(sizeof(*daily_trigger)); if (!daily_trigger) return E_OUTOFMEMORY; @@ -809,7 +809,7 @@ static HRESULT RegistrationInfo_create(IRegistrationInfo **obj) { registration_info *reginfo; - reginfo = heap_alloc_zero(sizeof(*reginfo)); + reginfo = calloc(1, sizeof(*reginfo)); if (!reginfo) return E_OUTOFMEMORY; reginfo->IRegistrationInfo_iface.lpVtbl = &RegistrationInfo_vtbl; @@ -1442,7 +1442,7 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) { TaskSettings *taskset; - taskset = heap_alloc(sizeof(*taskset)); + taskset = malloc(sizeof(*taskset)); if (!taskset) return E_OUTOFMEMORY; taskset->ITaskSettings_iface.lpVtbl = &TaskSettings_vtbl; @@ -1650,7 +1650,7 @@ static HRESULT Principal_create(IPrincipal **obj) { Principal *principal; - principal = heap_alloc(sizeof(*principal)); + principal = malloc(sizeof(*principal)); if (!principal) return E_OUTOFMEMORY; principal->IPrincipal_iface.lpVtbl = &Principal_vtbl; @@ -1897,7 +1897,7 @@ static HRESULT ExecAction_create(IExecAction **obj) { ExecAction *action; - action = heap_alloc(sizeof(*action)); + action = malloc(sizeof(*action)); if (!action) return E_OUTOFMEMORY; action->IExecAction_iface.lpVtbl = &Action_vtbl; @@ -2086,7 +2086,7 @@ static HRESULT Actions_create(IActionCollection **obj) { Actions *actions; - actions = heap_alloc(sizeof(*actions)); + actions = malloc(sizeof(*actions)); if (!actions) return E_OUTOFMEMORY; actions->IActionCollection_iface.lpVtbl = &Actions_vtbl; @@ -2242,7 +2242,7 @@ static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITrigg { trigger_collection *collection; - collection = heap_alloc(sizeof(*collection)); + collection = malloc(sizeof(*collection)); if (!collection) return E_OUTOFMEMORY; collection->ITriggerCollection_iface.lpVtbl = &TriggerCollection_vtbl; @@ -3668,7 +3668,7 @@ HRESULT TaskDefinition_create(ITaskDefinition **obj) { TaskDefinition *taskdef; - taskdef = heap_alloc_zero(sizeof(*taskdef)); + taskdef = calloc(1, sizeof(*taskdef)); if (!taskdef) return E_OUTOFMEMORY; taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl; @@ -3998,7 +3998,7 @@ HRESULT TaskService_create(void **obj) { TaskService *task_svc; - task_svc = heap_alloc(sizeof(*task_svc)); + task_svc = malloc(sizeof(*task_svc)); if (!task_svc) return E_OUTOFMEMORY; task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; @@ -4013,10 +4013,10 @@ HRESULT TaskService_create(void **obj) void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { - return HeapAlloc(GetProcessHeap(), 0, n); + return malloc(n); } void __RPC_USER MIDL_user_free(void __RPC_FAR *p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); } diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index e8d834edc3d..8f83c9f42bd 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -19,8 +19,6 @@ #ifndef __WINE_TASKSCHD_PRIVATE_H__ #define __WINE_TASKSCHD_PRIVATE_H__ -#include "wine/heap.h" - HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskDefinition_create(ITaskDefinition **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : mountmgr.sys: Allocate UNICODE_STRING buffers with RtlAllocateHeap.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 77d2f6ae74c64950734f08e884931d3a924ff13a URL: https://gitlab.winehq.org/wine/wine/-/commit/77d2f6ae74c64950734f08e884931d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 19:31:44 2022 +0100 mountmgr.sys: Allocate UNICODE_STRING buffers with RtlAllocateHeap. --- dlls/mountmgr.sys/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c95faa172f7..22c17025e87 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -631,7 +631,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** } name.MaximumLength = (lstrlenW(format) + 10) * sizeof(WCHAR); - name.Buffer = malloc( name.MaximumLength ); + name.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, name.MaximumLength ); for (i = first; i < 32; i++) { swprintf( name.Buffer, name.MaximumLength / sizeof(WCHAR), format, i ); @@ -655,7 +655,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** UNICODE_STRING symlink; symlink.MaximumLength = (lstrlenW(link_format) + 10) * sizeof(WCHAR); - if ((symlink.Buffer = malloc( symlink.MaximumLength ))) + if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength ))) { swprintf( symlink.Buffer, symlink.MaximumLength / sizeof(WCHAR), link_format, i ); symlink.Length = lstrlenW(symlink.Buffer) * sizeof(WCHAR);

1 0

Eric Pouech : configure: Log pkg-config error messages.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: ede777d11dc6a4739f7d6e10d3014929c3277240 URL: https://gitlab.winehq.org/wine/wine/-/commit/ede777d11dc6a4739f7d6e10d30149… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 23 15:58:44 2022 +0100 configure: Log pkg-config error messages. While investigating https://bugs.winehq.org/show_bug.cgi?id=53953, it may be a good idea to log any pkg-config error messages instead of ignoring them. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- aclocal.m4 | 8 ++- configure | 190 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 159 insertions(+), 39 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: f98ba4fa9b4bd451959b344d5f7dafa64c777ecb URL: https://gitlab.winehq.org/wine/wine/-/commit/f98ba4fa9b4bd451959b344d5f7daf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 1 16:57:17 2022 +0200 mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID. There is actually an "invalid" event type (sent on invalid input for example), so this avoids confusion with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlimg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 70dbb1890b4..54cc5b5932a 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,7 +17,7 @@ */ typedef enum { - EVENTID_INVALID = -1, + EVENTID_INVALID_ID = -1, EVENTID_DOMCONTENTLOADED, EVENTID_ABORT, EVENTID_AFTERPRINT, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index d8c377413f0..c0333cab858 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -301,7 +301,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) DOMEvent *event; /* Synchronously send load event if the image was completed immediately (such as from cache) */ - This->skip_event = EVENTID_INVALID; + This->skip_event = EVENTID_INVALID_ID; nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete); if(NS_SUCCEEDED(nsres) && complete) { @@ -707,7 +707,7 @@ static HRESULT HTMLImgElement_dispatch_nsevent_hook(HTMLDOMNode *iface, DOMEvent HTMLImg *This = impl_from_HTMLDOMNode(iface); if(event->event_id == This->skip_event) { - This->skip_event = EVENTID_INVALID; + This->skip_event = EVENTID_INVALID_ID; return S_OK; } @@ -799,7 +799,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTML ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; - ret->skip_event = EVENTID_INVALID; + ret->skip_event = EVENTID_INVALID_ID; HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex);

1 0