February 2018 - Wine-Commits

Michael Stefaniuc : wmp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: b3a24b58d4b431b48548583be5563713cc9d15c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a24b58d4b431b48548583b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:04 2018 +0100 wmp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/wmp_private.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index acf38f3..4799712 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,6 +20,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 7b7f51c..04173f3 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,18 +46,3 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Alexandre Julliard : server: Add a macro to define SIDs.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 6b758dd1dc5231b55684e17a5bb64cc42f8ab641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b758dd1dc5231b55684e17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 10:25:07 2018 +0100 server: Add a macro to define SIDs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/server/token.c b/server/token.c index 85aab73..7deddc4 100644 --- a/server/token.c +++ b/server/token.c @@ -64,6 +64,14 @@ const LUID SeManageVolumePrivilege = { 28, 0 }; const LUID SeImpersonatePrivilege = { 29, 0 }; const LUID SeCreateGlobalPrivilege = { 30, 0 }; +#define SID_N(n) struct /* same fields as struct SID */ \ + { \ + BYTE Revision; \ + BYTE SubAuthorityCount; \ + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; \ + DWORD SubAuthority[n]; \ + } + static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } }; static const SID local_sid = { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } }; static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } }; @@ -71,34 +79,10 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[5]; -} local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; -} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; +static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; +static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; +static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid;

1 0

Aric Stewart : loader: Add LNXEV to the critical event database.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 3e276f7e39fa0fabb8250c1f0dcbf180cd43247a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e276f7e39fa0fabb8250c1f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:44 2018 -0600 loader: Add LNXEV to the critical event database. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a991319..c03fc26 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -472,6 +472,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CriticalDevice] HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\LNXEV,"Service",,"WineHID" [CurrentVersion] HKCU,%CurrentVersion%\Run,,16

1 0

Hans Leidekker : msi: Don' t mark uncompressed global assembly files as installed until they are in the assembly cache.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: ff754f4edef05ab967ace9dc61400b32187de699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff754f4edef05ab967ace9dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 7 10:46:09 2018 +0100 msi: Don't mark uncompressed global assembly files as installed until they are in the assembly cache. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/files.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 02ff8ec..adffcaf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -200,8 +200,6 @@ static UINT copy_file(MSIFILE *file, LPWSTR source) return GetLastError(); SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); - - file->state = msifs_installed; return ERROR_SUCCESS; } @@ -249,7 +247,6 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { - file->state = msifs_installed; package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } @@ -365,6 +362,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + BOOL is_global_assembly = msi_is_global_assembly( file->Component ); + msi_file_update_ui( package, file, szInstallFiles ); rc = msi_load_media_info( package, file->Sequence, mi ); @@ -412,7 +411,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!msi_is_global_assembly( file->Component )) + if (!is_global_assembly) { msi_create_directory(package, file->Component->Directory); } @@ -424,10 +423,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_free(source); goto done; } + if (!is_global_assembly) file->state = msifs_installed; msi_free(source); } - else if (!msi_is_global_assembly( file->Component ) && - file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!is_global_assembly && file->state != msifs_installed && + !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE;

1 0

Henri Verbeet : winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: fc3ea7d1ef6860ab04fcfaa24353c5a8d06ff8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3ea7d1ef6860ab04fcfaa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 17:09:17 2018 +0330 winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from(). Like for example the recently added floating-point TagWord on AMD64. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5fa4883..618c5df 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -517,6 +517,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) { switch (cpu_register_map[idx].ctx_length) { + case 1: return *(BYTE*)cpu_register_ptr(ctx, idx); case 2: return *(WORD*)cpu_register_ptr(ctx, idx); case 4: return *(DWORD*)cpu_register_ptr(ctx, idx); case 8: return *(DWORD64*)cpu_register_ptr(ctx, idx); @@ -545,6 +546,7 @@ static inline void cpu_register_hex_from(CONTEXT* ctx, unsigned idx, const } switch (cpu_register_map[idx].ctx_length) { + case 1: *(BYTE*)cpu_register_ptr(ctx, idx) = (BYTE)val; break; case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break;

1 0

Aric Stewart : winebus.sys: Process device reports for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 52cafe87133c9a88b5cba071de60ecd536f82266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cafe87133c9a88b5cba071… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:35 2018 -0600 winebus.sys: Process device reports for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 233 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52cafe87133c9a88b5cb…

1 0

Henri Verbeet : ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData ().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: c8dd71bbc4617631a986bce404b8efbc56ef300c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8dd71bbc4617631a986bce4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:31 2018 +0330 ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b1afcf5..d710b34 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -620,7 +620,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_buffer_desc desc; desc.byte_width = new_size * sizeof(D3DVERTEX); - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = 0; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; @@ -660,9 +660,8 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), + 0, &map_desc, &box, 0))) return hr; memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset,

1 0

Henri Verbeet : d3d9: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 31250d6d4daa6a907aa4d595a13f7a1c142d5097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31250d6d4daa6a907aa4d595… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:32 2018 +0330 d3d9: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 84 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 12 +++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 28 +++++++-------- dlls/d3d9/volume.c | 2 +- 13 files changed, 70 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31250d6d4daa6a907aa4…

1 0

Michael Stefaniuc : regedit: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 505a9e0283bb7acc6d3647dd602c1c1df8a0c4a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a9e0283bb7acc6d3647dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:07 2018 +0100 regedit: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 3 ++- programs/regedit/edit.c | 1 + programs/regedit/framewnd.c | 1 + programs/regedit/hexedit.c | 1 + programs/regedit/listview.c | 1 + programs/regedit/regedit.c | 1 + programs/regedit/regproc.c | 15 +++------------ programs/regedit/regproc.h | 1 - programs/regedit/treeview.c | 1 + 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 7a5633f..0c6d895 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -27,8 +27,9 @@ #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" - + WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 6ccce00..c8b77bd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,6 +29,7 @@ #include <shellapi.h> #include <shlwapi.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c6fcee4..94da217 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -31,6 +31,7 @@ #include "main.h" #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 3f05aa6..fc6c3a3 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "commctrl.h" +#include "wine/heap.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4c2ec36..0934e03 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -27,6 +27,7 @@ #include "main.h" #include "regproc.h" +#include "wine/heap.h" #include "wine/unicode.h" static INT Image_String; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index fe0163c..a69e929 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -24,6 +24,7 @@ #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0911b50..35b0322 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -29,6 +29,7 @@ #include <windows.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); @@ -46,7 +47,7 @@ static HKEY reg_class_keys[] = { void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -57,12 +58,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -73,11 +69,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 9364fde..bfb0cba 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -30,7 +30,6 @@ void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 77befb5..4bbec40 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -30,6 +30,7 @@ #include <wine/debug.h> #include <shlwapi.h> +#include "wine/heap.h" #include "main.h" #include "regproc.h"

1 0

Michael Stefaniuc : wscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: e68620c044848b2bc5251238ac23b322d6a5ea14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68620c044848b2bc5251238… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:08 2018 +0100 wscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 1 + programs/wscript/wscript.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3c30c3c..fb95c0c 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/heap.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 2a64b34..d624a2d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,18 +33,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0