April 2020 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: Introduce a helper to convert d3d9 transform states to wined3d states.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 4393d284fd8a5995b6811f743f4a4433032353ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=4393d284fd8a5995b6811f74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:22:58 2020 +0430 d3d9: Introduce a helper to convert d3d9 transform states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 434ec8fb8f..17d643a53c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -556,6 +556,11 @@ static enum wined3d_texture_filter_type wined3d_texture_filter_type_from_d3d(D3D return (enum wined3d_texture_filter_type)type; } +static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFORMSTATETYPE type) +{ + return (enum wined3d_transform_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2164,7 +2169,8 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -2194,7 +2200,8 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_multiply_transform(device->state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d3d9: Introduce a helper to convert d3d9 render states to wined3d states.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 705de1ea00eead381f06c157788f32a505343fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=705de1ea00eead381f06c157… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:22:59 2020 +0430 d3d9: Introduce a helper to convert d3d9 render states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17d643a53c..511496edd1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -561,6 +561,11 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR return (enum wined3d_transform_state)type; } +static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE type) +{ + return (enum wined3d_render_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2404,7 +2409,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, wined3d_render_state_from_d3d(state), value); if (state == D3DRS_POINTSIZE && value == D3D9_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 91a826698780e3948eebc25abfbea5f28f09c211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a826698780e3948eebc25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:23:00 2020 +0430 d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 511496edd1..07fb906e85 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -566,6 +566,11 @@ static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYP return (enum wined3d_render_state)type; } +static enum wined3d_sampler_state wined3d_sampler_state_from_d3d(D3DSAMPLERSTATETYPE type) +{ + return (enum wined3d_sampler_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2755,7 +2760,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev sampler -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; wined3d_mutex_lock(); - wined3d_stateblock_set_sampler_state(device->update_state, sampler, state, value); + wined3d_stateblock_set_sampler_state(device->update_state, sampler, wined3d_sampler_state_from_d3d(state), value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : d3d9: Introduce a helper to convert d3d9 primitive types to wined3d types.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 49842219764c16915bab452152b8725d12aa3600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49842219764c16915bab4521… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:23:01 2020 +0430 d3d9: Introduce a helper to convert d3d9 primitive types to wined3d types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 07fb906e85..2693b94ce7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -571,6 +571,11 @@ static enum wined3d_sampler_state wined3d_sampler_state_from_d3d(D3DSAMPLERSTATE return (enum wined3d_sampler_state)type; } +static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) +{ + return (enum wined3d_primitive_type)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -3010,7 +3015,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3044,7 +3049,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); if (SUCCEEDED(hr)) @@ -3153,7 +3158,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, goto done; d3d9_generate_auto_mipmaps(device); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); @@ -3297,7 +3302,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0);

1 0

Henri Verbeet : d3d9: Introduce helpers to convert between d3d9 and wined3d query types.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: e61cd8e41d3fe620053dcd0b8d72d08120de939c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61cd8e41d3fe620053dcd0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:23:02 2020 +0430 d3d9: Introduce helpers to convert between d3d9 and wined3d query types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index e9180fb481..207ad55e5a 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -24,6 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static D3DQUERYTYPE d3dquerytype_from_wined3d(enum wined3d_query_type type) +{ + return (D3DQUERYTYPE)type; +} + +static enum wined3d_query_type wined3d_query_type_from_d3d(D3DQUERYTYPE type) +{ + return (enum wined3d_query_type)type; +} + static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) { return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface); @@ -98,7 +108,7 @@ static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - type = wined3d_query_get_type(query->wined3d_query); + type = d3dquerytype_from_wined3d(wined3d_query_get_type(query->wined3d_query)); wined3d_mutex_unlock(); return type; @@ -198,7 +208,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER query->refcount = 1; wined3d_mutex_lock(); - if (FAILED(hr = wined3d_query_create(device->wined3d_device, type, + if (FAILED(hr = wined3d_query_create(device->wined3d_device, wined3d_query_type_from_d3d(type), query, &d3d9_null_wined3d_parent_ops, &query->wined3d_query))) { wined3d_mutex_unlock();

1 0

Jacek Caban : dbghelp.c: Use local mach header declaration.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 0c56a8f87bac01488349af0ffe3923a1672e72a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c56a8f87bac01488349af0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:17:35 2020 +0200 dbghelp.c: Use local mach header declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4ca9bee48e..093b853dcd 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -92,6 +92,18 @@ union wine_all_image_infos { struct dyld_all_image_infos64 infos64; }; +struct macho_header +{ + UINT32 magic; /* mach magic number identifier */ + UINT32 cputype; /* cpu specifier */ + UINT32 cpusubtype; /* machine specifier */ + UINT32 filetype; /* type of file */ + UINT32 ncmds; /* number of load commands */ + UINT32 sizeofcmds; /* the size of all the load commands */ + UINT32 flags; /* flags */ + UINT32 reserved; /* reserved */ +}; + struct macho_segment_command { UINT32 cmd; /* LC_SEGMENT_64 */ @@ -150,7 +162,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); memory by dyld. */ #define MACHO_DYLD_IN_SHARED_CACHE 0x80000000 -#define MACHO_FAT_MAGIC 0xcafebabe +#define MACHO_FAT_MAGIC 0xcafebabe +#define MACHO_MH_MAGIC_32 0xfeedface +#define MACHO_MH_MAGIC_64 0xfeedfacf + +#define MACHO_CPU_TYPE_X86 0x00000007 +#define MACHO_CPU_TYPE_X86_64 0x01000007 #define UUID_STRING_LEN 37 /* 16 bytes at 2 hex digits apiece, 4 dashes, and the null terminator */ @@ -722,13 +739,13 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, BOOL split_segs, struct image_file_map* ifm) { struct macho_file_map* fmap = &ifm->u.macho; - struct mach_header mach_header; + struct macho_header mach_header; int i; WCHAR* filename; struct section_info info; BOOL ret = FALSE; - cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; - uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; + UINT32 target_cpu = (pcs->is_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; + UINT32 target_magic = (pcs->is_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; uint32_t target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; DWORD bytes_read; @@ -746,7 +763,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, ifm->ops = &macho_file_map_ops; ifm->alternate = NULL; ifm->addr_size = (pcs->is_64bit) ? 64 : 32; - fmap->header_size = (pcs->is_64bit) ? sizeof(struct mach_header_64) : sizeof(struct mach_header); + fmap->header_size = (pcs->is_64bit) ? sizeof(struct macho_header) : FIELD_OFFSET(struct macho_header, reserved); if (!(filename = get_dos_file_name(filenameW))) return FALSE; @@ -799,8 +816,8 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, /* Individual architecture (standalone or within a fat file) is in its native byte order. */ SetFilePointer(fmap->handle, fmap->arch_offset, 0, FILE_BEGIN); - if (!ReadFile(fmap->handle, &mach_header, sizeof(mach_header), &bytes_read, NULL) - || bytes_read != sizeof(mach_header)) + if (!ReadFile(fmap->handle, &mach_header, fmap->header_size, &bytes_read, NULL) + || bytes_read != fmap->header_size) goto done; TRACE("... got possible Mach header\n"); /* and check for a Mach-O header */ @@ -1314,11 +1331,11 @@ static BOOL image_uses_split_segs(struct process* process, ULONG_PTR load_addr) if (load_addr) { - cpu_type_t target_cpu = (process->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; - uint32_t target_magic = (process->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; - struct mach_header header; + UINT32 target_cpu = (process->is_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; + UINT32 target_magic = (process->is_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; + struct macho_header header; - if (ReadProcessMemory(process->handle, (void*)load_addr, &header, sizeof(header), NULL) && + if (ReadProcessMemory(process->handle, (void*)load_addr, &header, FIELD_OFFSET(struct macho_header, reserved), NULL) && header.magic == target_magic && header.cputype == target_cpu && header.flags & MACHO_DYLD_IN_SHARED_CACHE) {

1 0

Jacek Caban : dbghelp: Don't use stdint.h types.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 1420e64e5f1df4c8bbb016d1b8ff71337cda4884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1420e64e5f1df4c8bbb016d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:17:52 2020 +0200 dbghelp: Don't use stdint.h types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 093b853dcd..026f2191a2 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -58,28 +58,32 @@ #include <mach-o/nlist.h> #include <mach-o/dyld.h> -struct dyld_image_info32 { - uint32_t /* const struct mach_header* */ imageLoadAddress; - uint32_t /* const char* */ imageFilePath; - uint32_t /* uintptr_t */ imageFileModDate; +struct dyld_image_info32 +{ + UINT32 imageLoadAddress; /* const struct mach_header* */ + UINT32 imageFilePath; /* const char* */ + UINT32 imageFileModDate; /* uintptr_t */ }; -struct dyld_all_image_infos32 { - uint32_t version; - uint32_t infoArrayCount; - uint32_t /* const struct dyld_image_info* */ infoArray; +struct dyld_all_image_infos32 +{ + UINT32 version; + UINT32 infoArrayCount; + UINT32 infoArray; /* const struct dyld_image_info* */ }; -struct dyld_image_info64 { - uint64_t /* const struct mach_header* */ imageLoadAddress; - uint64_t /* const char* */ imageFilePath; - uint64_t /* uintptr_t */ imageFileModDate; +struct dyld_image_info64 +{ + UINT64 imageLoadAddress; /* const struct mach_header* */ + UINT64 imageFilePath; /* const char* */ + UINT64 imageFileModDate; /* uintptr_t */ }; -struct dyld_all_image_infos64 { - uint32_t version; - uint32_t infoArrayCount; - uint64_t /* const struct dyld_image_info* */ infoArray; +struct dyld_all_image_infos64 +{ + UINT32 version; + UINT32 infoArrayCount; + UINT64 infoArray; /* const struct dyld_image_info* */ }; union wine_image_info { @@ -198,7 +202,7 @@ struct macho_info static void macho_unmap_file(struct image_file_map* fmap); -static char* format_uuid(const uint8_t uuid[16], char out[UUID_STRING_LEN]) +static char* format_uuid(const UINT8 uuid[16], char out[UUID_STRING_LEN]) { sprintf(out, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], @@ -588,7 +592,7 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, static int macho_count_sections(struct image_file_map* ifm, const struct macho_load_command* lc, void* user) { char segname[16]; - uint32_t nsects; + size_t nsects; if (ifm->addr_size == 32) { @@ -624,9 +628,9 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach BOOL ignore; int i; ULONG_PTR tmp, page_mask = sysinfo.dwPageSize - 1; - uint64_t vmaddr, vmsize; + UINT64 vmaddr, vmsize; char segname[16]; - uint32_t nsects; + size_t nsects; const void *sections; if (ifm->addr_size == 32) @@ -746,7 +750,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, BOOL ret = FALSE; UINT32 target_cpu = (pcs->is_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; UINT32 target_magic = (pcs->is_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; - uint32_t target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; + UINT32 target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; DWORD bytes_read; struct @@ -1863,7 +1867,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in BOOL ret = FALSE; union wine_all_image_infos image_infos; union wine_image_info image_info; - uint32_t len; + unsigned int len; char path[PATH_MAX]; BOOL got_path = FALSE;

1 0

Jacek Caban : dbghelp: Use local constants definitions instead of mach-o/loader.h.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: e341bd7fe4f2572597ee10cbed5bb2a76ddcc03a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e341bd7fe4f2572597ee10cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:18:03 2020 +0200 dbghelp: Use local constants definitions instead of mach-o/loader.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 026f2191a2..e33313ec63 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -54,7 +54,6 @@ #ifdef HAVE_MACH_O_LOADER_H -#include <mach-o/loader.h> #include <mach-o/nlist.h> #include <mach-o/dyld.h> @@ -173,6 +172,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); #define MACHO_CPU_TYPE_X86 0x00000007 #define MACHO_CPU_TYPE_X86_64 0x01000007 +#define MACHO_MH_EXECUTE 0x2 +#define MACHO_MH_DYLIB 0x6 +#define MACHO_MH_DYLINKER 0x7 +#define MACHO_MH_BUNDLE 0x8 +#define MACHO_MH_DSYM 0xa + +#define MACHO_LC_SEGMENT 0x01 +#define MACHO_LC_SYMTAB 0x02 +#define MACHO_LC_SEGMENT_64 0x19 +#define MACHO_LC_UUID 0x1b + +#define MACHO_SECTION_TYPE 0x000000ff +#define MACHO_S_ATTR_PURE_INSTRUCTIONS 0x80000000 +#define MACHO_S_ATTR_SOME_INSTRUCTIONS 0x00000400 + #define UUID_STRING_LEN 37 /* 16 bytes at 2 hex digits apiece, 4 dashes, and the null terminator */ @@ -660,7 +674,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct mach /* Images in the dyld shared cache have their segments mapped non-contiguously. We don't know how to properly locate any of the segments other than __TEXT, so ignore them. */ - ignore = (info->split_segs && strcmp(segname, SEG_TEXT)); + ignore = (info->split_segs && strcmp(segname, "__TEXT")); if (!strncmp(segname, "WINE_", 5)) TRACE("Ignoring special Wine segment %s\n", debugstr_an(segname, sizeof(segname))); @@ -750,7 +764,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, BOOL ret = FALSE; UINT32 target_cpu = (pcs->is_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; UINT32 target_magic = (pcs->is_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; - UINT32 target_cmd = (pcs->is_64bit) ? LC_SEGMENT_64 : LC_SEGMENT; + UINT32 target_cmd = (pcs->is_64bit) ? MACHO_LC_SEGMENT_64 : MACHO_LC_SEGMENT; DWORD bytes_read; struct @@ -831,11 +845,11 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, /* Make sure the file type is one of the ones we expect. */ switch (mach_header.filetype) { - case MH_EXECUTE: - case MH_DYLIB: - case MH_DYLINKER: - case MH_BUNDLE: - case MH_DSYM: + case MACHO_MH_EXECUTE: + case MACHO_MH_DYLIB: + case MACHO_MH_DYLINKER: + case MACHO_MH_BUNDLE: + case MACHO_MH_DSYM: break; default: goto done; @@ -866,7 +880,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, TRACE("segs_start: 0x%08lx, segs_size: 0x%08lx\n", (ULONG_PTR)fmap->segs_start, (ULONG_PTR)fmap->segs_size); - if (macho_enum_load_commands(ifm, LC_UUID, find_uuid, NULL) < 0) + if (macho_enum_load_commands(ifm, MACHO_LC_UUID, find_uuid, NULL) < 0) goto done; if (fmap->uuid) { @@ -939,8 +953,8 @@ static BOOL macho_sect_is_code(struct macho_file_map* fmap, unsigned char sectid sectidx--; /* convert from 1-based to 0-based */ if (sectidx >= fmap->num_sections || fmap->sect[sectidx].ignored) return FALSE; - ret = (!(fmap->sect[sectidx].section.flags & SECTION_TYPE) && - (fmap->sect[sectidx].section.flags & (S_ATTR_PURE_INSTRUCTIONS|S_ATTR_SOME_INSTRUCTIONS))); + ret = (!(fmap->sect[sectidx].section.flags & MACHO_SECTION_TYPE) && + (fmap->sect[sectidx].section.flags & (MACHO_S_ATTR_PURE_INSTRUCTIONS | MACHO_S_ATTR_SOME_INSTRUCTIONS))); TRACE("-> %d\n", ret); return ret; } @@ -1389,7 +1403,7 @@ static BOOL macho_load_debug_info(struct process *pcs, struct module* module) mdi.module = module; pool_init(&mdi.pool, 65536); hash_table_init(&mdi.pool, &mdi.ht_symtab, 256); - result = macho_enum_load_commands(ifm, LC_SYMTAB, macho_parse_symtab, &mdi); + result = macho_enum_load_commands(ifm, MACHO_LC_SYMTAB, macho_parse_symtab, &mdi); if (result > 0) ret = TRUE; else if (result < 0) @@ -1398,7 +1412,7 @@ static BOOL macho_load_debug_info(struct process *pcs, struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY) && fmap->dsym) { mdi.fmap = &fmap->dsym->u.macho; - result = macho_enum_load_commands(fmap->dsym, LC_SYMTAB, macho_parse_symtab, &mdi); + result = macho_enum_load_commands(fmap->dsym, MACHO_LC_SYMTAB, macho_parse_symtab, &mdi); if (result > 0) ret = TRUE; else if (result < 0)

1 0

Jacek Caban : dbghelp: Don't use _NSGetExecutablePath in macho_search_loader.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: dab78486d3d0063e32e99fb795311b74eb632d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab78486d3d0063e32e99fb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:18:10 2020 +0200 dbghelp: Don't use _NSGetExecutablePath in macho_search_loader. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index e33313ec63..795b8500d9 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -55,7 +55,6 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach-o/nlist.h> -#include <mach-o/dyld.h> struct dyld_image_info32 { @@ -1923,18 +1922,6 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } } - /* If we couldn't get the executable path from the target process, try our - own. It will almost always be the same. */ - if (!got_path) - { - len = sizeof(path); - if (!_NSGetExecutablePath(path, &len)) - { - got_path = TRUE; - TRACE("using own executable path: %s\n", debugstr_a(path)); - } - } - if (got_path) { WCHAR* pathW;

1 0

Jacek Caban : dbghelp: Get rid of get_dyld_image_info_address.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: f2b8af7e7e159a5259aaab42169c4f8220b121eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b8af7e7e159a5259aaab42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 19:18:24 2020 +0200 dbghelp: Get rid of get_dyld_image_info_address. We should get the address from PEB anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 795b8500d9..8aa232e1ed 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -37,12 +37,6 @@ #include <assert.h> #include <stdarg.h> #include <errno.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -54,8 +48,6 @@ #ifdef HAVE_MACH_O_LOADER_H -#include <mach-o/nlist.h> - struct dyld_image_info32 { UINT32 imageLoadAddress; /* const struct mach_header* */ @@ -1455,41 +1447,6 @@ static void macho_module_remove(struct process* pcs, struct module_format* modfm HeapFree(GetProcessHeap(), 0, modfmt); } -/****************************************************************** - * get_dyld_image_info_address - */ -static ULONG_PTR get_dyld_image_info_address(struct process* pcs) -{ - ULONG_PTR dyld_image_info_address = 0; - -#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ - if (!dyld_image_info_address) - { - static void* dyld_all_image_infos_addr; - - /* Our next best guess is that dyld was loaded at its base address - and we can find the dyld image infos address by looking up its symbol. */ - if (!dyld_all_image_infos_addr) - { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; - } - - if (dyld_all_image_infos_addr) - { - TRACE("got dyld_image_info_address %p from /usr/lib/dyld symbol table\n", - dyld_all_image_infos_addr); - dyld_image_info_address = (ULONG_PTR)dyld_all_image_infos_addr; - } - } -#endif - - return dyld_image_info_address; -} - /****************************************************************** * macho_load_file * @@ -1964,7 +1921,7 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) struct macho_info macho_info; TRACE("(%p/%p)\n", pcs, pcs->handle); - pcs->dbg_hdr_addr = addr ? addr : get_dyld_image_info_address(pcs); + pcs->dbg_hdr_addr = addr; macho_info.flags = MACHO_INFO_MODULE; if (!macho_search_loader(pcs, &macho_info)) return FALSE; macho_info.module->format_info[DFI_MACHO]->u.macho_info->is_loader = 1;

1 0