June 2018 - Wine-commits - list.winehq.org

Zebediah Figura : dbghelp: Read the ELF program header corresponding to the target's architecture.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: bd620ffb443eaa2dba997dc5597cb37c44d757b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd620ffb443eaa2dba997dc5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 16:51:30 2018 -0500 dbghelp: Read the ELF program header corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 31 ++++++++++++++++++++++++------- dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8049210..f84df83 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -332,7 +332,6 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; unsigned int i; - Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; @@ -429,13 +428,31 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + if (fmap->addr_size == 32) { - tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; - if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; - if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + Elf32_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } + } + else + { + Elf64_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } } } /* if non relocatable ELF, then remove fixed address from computation diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 42781e4..3951464 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,12 +59,10 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t

1 0

Zebediah Figura : dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: bb53152faab705d972de3763ddd9bb3351e92460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb53152faab705d972de3763… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 16:51:31 2018 -0500 dbghelp: Read the Elf_Dyn struct corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 59 ++++++++++++++++++++++++++++++++------------ dlls/dbghelp/image_private.h | 2 -- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f84df83..2b444f8 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1270,29 +1270,56 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { - Elf_Dyn dyn; char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; if (load_offset) ptr += load_offset - fmap->u.elf.elf_start; - do + if (fmap->addr_size == 32) { - if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || - len != sizeof(dyn)) - return ret; - if (dyn.d_tag == DT_DEBUG) + Elf32_Dyn dyn; + + do { - elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; - if (load_offset == 0 && dyn_addr == 0) /* likely the case */ - /* Assume this module (the Wine loader) has been loaded at its preferred address */ - dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; - break; - } - ptr += sizeof(dyn); - } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) return ret; - } + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + else + { + Elf64_Dyn dyn; + + do + { + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + return ret; + if (dyn.d_tag == DT_DEBUG) + { + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + if (load_offset == 0 && dyn_addr == 0) /* likely the case */ + /* Assume this module (the Wine loader) has been + * loaded at its preferred address */ + dyn_addr = ism.fmap->u.elf.sect[ism.sidx].shdr.sh_addr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) return ret; + } + } elf_end_find(fmap); } diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 3951464..a0df390 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,11 +59,9 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t #endif

1 0

Zebediah Figura : dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 51ada19ac235df104e95476e9b3fa8204357bb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ada19ac235df104e95476e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 16:51:32 2018 -0500 dbghelp: Read the Elf_auxv_t struct corresponding to the target's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 30 ++++++++++++++++++++++++------ dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 2b444f8..0cbeb98 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1522,7 +1522,6 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l void* addr; void* str; void* str_max; - Elf_auxv_t auxv; si->SizeOfStruct = sizeof(*si); si->MaxNameLen = MAX_SYM_NAME; @@ -1548,14 +1547,33 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL) addr = (void*)((DWORD_PTR)addr + sizeof(str)); - while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + if (pcs->is_64bit) { - if (auxv.a_type == type) + Elf64_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) { - *val = auxv.a_un.a_val; - return TRUE; + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); + } + } + else + { + Elf32_auxv_t auxv; + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + { + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } - addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); } return FALSE; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index a0df390..e95d0d1 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -60,10 +60,8 @@ typedef struct section macho_section; #ifdef _WIN64 #define Elf_Sym Elf64_Sym -#define Elf_auxv_t Elf64_auxv_t #else #define Elf_Sym Elf32_Sym -#define Elf_auxv_t Elf32_auxv_t #endif #else #ifndef SHT_NULL

1 0

Zebediah Figura : dbghelp: Translate the 32-bit ELF symbol struct to the 64-bit one.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 7e4fd17d5b62e888fd6a3a452dc3ee22dfb74ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4fd17d5b62e888fd6a3a45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 16:51:33 2018 -0500 dbghelp: Translate the 32-bit ELF symbol struct to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 87 +++++++++++++++++++++++++++----------------- dlls/dbghelp/image_private.h | 9 +---- 2 files changed, 54 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e4fd17d5b62e888fd6a…

1 0

Józef Kucia : libs/vkd3d-shader: Factor out shader_dump_version().
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: vkd3d Branch: master Commit: 988cf2154b80ba3ae8adcbd49b5dadb0d82bd5e7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=988cf2154b80ba3ae8adcbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 5 13:52:56 2018 +0200 libs/vkd3d-shader: Factor out shader_dump_version(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 58 +++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index faa009e..ce8db46 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1234,58 +1234,62 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -void vkd3d_shader_trace(void *data) +static void shader_dump_version(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_version *shader_version) { - struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *type_prefix; - const char *p, *q; - const DWORD *ptr; - DWORD i; + const char *prefix; - if (!string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return; - } - - shader_sm4_read_header(data, &ptr, &shader_version); - - TRACE("Parsing %p.\n", ptr); - - switch (shader_version.type) + switch (shader_version->type) { case VKD3D_SHADER_TYPE_VERTEX: - type_prefix = "vs"; + prefix = "vs"; break; case VKD3D_SHADER_TYPE_HULL: - type_prefix = "hs"; + prefix = "hs"; break; case VKD3D_SHADER_TYPE_DOMAIN: - type_prefix = "ds"; + prefix = "ds"; break; case VKD3D_SHADER_TYPE_GEOMETRY: - type_prefix = "gs"; + prefix = "gs"; break; case VKD3D_SHADER_TYPE_PIXEL: - type_prefix = "ps"; + prefix = "ps"; break; case VKD3D_SHADER_TYPE_COMPUTE: - type_prefix = "cs"; + prefix = "cs"; break; default: - FIXME("Unhandled shader type %#x.\n", shader_version.type); - type_prefix = "unknown"; + FIXME("Unhandled shader type %#x.\n", shader_version->type); + prefix = "unknown"; break; } - shader_addline(&buffer, "%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor); + shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); +} + +void vkd3d_shader_trace(void *data) +{ + struct vkd3d_shader_version shader_version; + struct vkd3d_string_buffer buffer; + const char *p, *q; + const DWORD *ptr; + DWORD i; + + if (!string_buffer_init(&buffer)) + { + ERR("Failed to initialize string buffer.\n"); + return; + } + + shader_sm4_read_header(data, &ptr, &shader_version); + shader_dump_version(&buffer, &shader_version); while (!shader_sm4_is_end(data, &ptr)) {

1 0

Józef Kucia : libs/vkd3d-shader: Factor out shader_dump_instruction_flags().
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: vkd3d Branch: master Commit: 49e936ae2ac88a74215f8f3c35ce40f332468e35 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49e936ae2ac88a74215f8f3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 5 13:52:57 2018 +0200 libs/vkd3d-shader: Factor out shader_dump_instruction_flags(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 126 ++++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_private.h | 12 +-- 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ce8db46..f987e3c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1274,6 +1274,72 @@ static void shader_dump_version(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); } +static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, + const struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_version *shader_version) +{ + switch (ins->handler_idx) + { + case VKD3DSIH_BREAKP: + case VKD3DSIH_CONTINUEP: + case VKD3DSIH_IF: + case VKD3DSIH_RETP: + case VKD3DSIH_TEXKILL: + switch (ins->flags) + { + case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(buffer, "_nz"); break; + case VKD3D_SHADER_CONDITIONAL_OP_Z: shader_addline(buffer, "_z"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); break; + } + break; + + case VKD3DSIH_IFC: + case VKD3DSIH_BREAKC: + switch (ins->flags) + { + case VKD3D_SHADER_REL_OP_GT: shader_addline(buffer, "_gt"); break; + case VKD3D_SHADER_REL_OP_EQ: shader_addline(buffer, "_eq"); break; + case VKD3D_SHADER_REL_OP_GE: shader_addline(buffer, "_ge"); break; + case VKD3D_SHADER_REL_OP_LT: shader_addline(buffer, "_lt"); break; + case VKD3D_SHADER_REL_OP_NE: shader_addline(buffer, "_ne"); break; + case VKD3D_SHADER_REL_OP_LE: shader_addline(buffer, "_le"); break; + default: shader_addline(buffer, "_(%u)", ins->flags); + } + break; + + case VKD3DSIH_RESINFO: + switch (ins->flags) + { + case VKD3DSI_NONE: break; + case VKD3DSI_RESINFO_RCP_FLOAT: shader_addline(buffer, "_rcpFloat"); break; + case VKD3DSI_RESINFO_UINT: shader_addline(buffer, "_uint"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); + } + break; + + case VKD3DSIH_SAMPLE_INFO: + switch (ins->flags) + { + case VKD3DSI_NONE: break; + case VKD3DSI_SAMPLE_INFO_UINT: shader_addline(buffer, "_uint"); break; + default: shader_addline(buffer, "_unrecognized(%#x)", ins->flags); + } + break; + + case VKD3DSIH_SYNC: + shader_dump_sync_flags(buffer, ins->flags); + break; + + case VKD3DSIH_TEX: + if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + shader_addline(buffer, "p"); + break; + + default: + shader_dump_precise_flags(buffer, ins->flags); + break; + } +} + void vkd3d_shader_trace(void *data) { struct vkd3d_shader_version shader_version; @@ -1518,65 +1584,7 @@ void vkd3d_shader_trace(void *data) shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - if (ins.handler_idx == VKD3DSIH_BREAKP - || ins.handler_idx == VKD3DSIH_CONTINUEP - || ins.handler_idx == VKD3DSIH_IF - || ins.handler_idx == VKD3DSIH_RETP - || ins.handler_idx == VKD3DSIH_TEXKILL) - { - switch (ins.flags) - { - case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(&buffer, "_nz"); break; - case VKD3D_SHADER_CONDITIONAL_OP_Z: shader_addline(&buffer, "_z"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); break; - } - } - else if (ins.handler_idx == VKD3DSIH_IFC - || ins.handler_idx == VKD3DSIH_BREAKC) - { - switch (ins.flags) - { - case VKD3D_SHADER_REL_OP_GT: shader_addline(&buffer, "_gt"); break; - case VKD3D_SHADER_REL_OP_EQ: shader_addline(&buffer, "_eq"); break; - case VKD3D_SHADER_REL_OP_GE: shader_addline(&buffer, "_ge"); break; - case VKD3D_SHADER_REL_OP_LT: shader_addline(&buffer, "_lt"); break; - case VKD3D_SHADER_REL_OP_NE: shader_addline(&buffer, "_ne"); break; - case VKD3D_SHADER_REL_OP_LE: shader_addline(&buffer, "_le"); break; - default: shader_addline(&buffer, "_(%u)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_TEX - && shader_version.major >= 2 - && (ins.flags & VKD3DSI_TEXLD_PROJECT)) - { - shader_addline(&buffer, "p"); - } - else if (ins.handler_idx == VKD3DSIH_RESINFO && ins.flags) - { - switch (ins.flags) - { - case VKD3DSI_RESINFO_RCP_FLOAT: shader_addline(&buffer, "_rcpFloat"); break; - case VKD3DSI_RESINFO_UINT: shader_addline(&buffer, "_uint"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_SAMPLE_INFO && ins.flags) - { - switch (ins.flags) - { - case VKD3DSI_SAMPLE_INFO_UINT: shader_addline(&buffer, "_uint"); break; - default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); - } - } - else if (ins.handler_idx == VKD3DSIH_SYNC) - { - shader_dump_sync_flags(&buffer, ins.flags); - } - else - { - shader_dump_precise_flags(&buffer, ins.flags); - } - + shader_dump_instruction_flags(&buffer, &ins, &shader_version); if (vkd3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8ed700b..7fc4262 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -480,12 +480,12 @@ enum vkd3d_tessellator_partitioning }; -#define VKD3DSI_TEXLD_PROJECT 0x1 - -#define VKD3DSI_INDEXED_DYNAMIC 0x4 -#define VKD3DSI_RESINFO_RCP_FLOAT 0x1 -#define VKD3DSI_RESINFO_UINT 0x2 -#define VKD3DSI_SAMPLE_INFO_UINT 0x1 +#define VKD3DSI_NONE 0x0 +#define VKD3DSI_TEXLD_PROJECT 0x1 +#define VKD3DSI_INDEXED_DYNAMIC 0x4 +#define VKD3DSI_RESINFO_RCP_FLOAT 0x1 +#define VKD3DSI_RESINFO_UINT 0x2 +#define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 #define VKD3DSI_PRECISE_X 0x100

1 0

Józef Kucia : libs/vkd3d-shader: Factor out shader_dump_instruction().
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: vkd3d Branch: master Commit: 3d74e65a1fb5adec844800020f6a078c94c699bd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d74e65a1fb5adec8448000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 5 13:52:58 2018 +0200 libs/vkd3d-shader: Factor out shader_dump_instruction(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 484 ++++++++++++++++++++++++---------------------- 1 file changed, 249 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3d74e65a1fb5adec844…

1 0

Józef Kucia : demos: Get rid of code for compiling shaders using d3dcompiler.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: vkd3d Branch: master Commit: b084a4a153fc775f82dbcbca9aee8b7ff96974ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b084a4a153fc775f82dbcbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 5 13:52:59 2018 +0200 demos: Get rid of code for compiling shaders using d3dcompiler. It's unused. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_win32.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index 3b61bcf..d2a5498 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -25,10 +25,6 @@ struct demo { - HMODULE d3dcompiler; - HRESULT (WINAPI *compile_from_file)(const WCHAR *filename, const void *defines, void *include, - const char *entry_point, const char *profile, UINT flags1, UINT flags2, - ID3DBlob **code, ID3DBlob **errors); size_t window_count; bool quit; @@ -198,11 +194,6 @@ static inline bool demo_init(struct demo *demo, void *user_data) { WNDCLASSEXW wc; - if (!(demo->d3dcompiler = LoadLibraryW(L"d3dcompiler_47"))) - return false; - if (!(demo->compile_from_file = (void *)GetProcAddress(demo->d3dcompiler, "D3DCompileFromFile"))) - goto fail; - wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = demo_window_proc; @@ -216,7 +207,7 @@ static inline bool demo_init(struct demo *demo, void *user_data) wc.lpszClassName = DEMO_WINDOW_CLASS_NAME; wc.hIconSm = LoadIconW(NULL, IDI_WINLOGO); if (!RegisterClassExW(&wc)) - goto fail; + return false; demo->window_count = 0; demo->quit = false; @@ -224,16 +215,11 @@ static inline bool demo_init(struct demo *demo, void *user_data) demo->idle_func = NULL; return true; - -fail: - FreeLibrary(demo->d3dcompiler); - return false; } static inline void demo_cleanup(struct demo *demo) { UnregisterClassW(DEMO_WINDOW_CLASS_NAME, GetModuleHandle(NULL)); - FreeLibrary(demo->d3dcompiler); } static inline void demo_set_idle_func(struct demo *demo,

1 0

Alex Henrie : gdi32: Fix memory leak on error in PATH_WidenPath (Coverity) .
by Alexandre Julliard 04 Jun '18

04 Jun '18

Module: wine Branch: master Commit: 7c57461d299620f2e0fa3b9f02bdbe910de41e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c57461d299620f2e0fa3b9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 1 07:15:44 2018 -0600 gdi32: Fix memory leak on error in PATH_WidenPath (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60..49e270c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } }

1 0

Jacek Caban : ole32: Don' t try to unregister window class if it was never registered.
by Alexandre Julliard 04 Jun '18

04 Jun '18

Module: wine Branch: master Commit: fd67e394e69ec59a23ca89ce729d1d72a61954ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd67e394e69ec59a23ca89ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 1 20:51:24 2018 +0200 ole32: Don't try to unregister window class if it was never registered. UnregisterClass may load display driver, which is may be problematic inside DLL_PROCESS_DETACH (esp. in Android drivers, which imports ole32 itself). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a9e94c5..fb69a66 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -479,6 +479,8 @@ struct apartment_loaded_dll static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',0}; +static ATOM apt_win_class; + /***************************************************************************** * This section contains OpenDllList implementation */ @@ -1695,7 +1697,7 @@ static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context wclass.lpfnWndProc = apartment_wndproc; wclass.hInstance = hProxyDll; wclass.lpszClassName = wszAptWinClass; - RegisterClassW(&wclass); + apt_win_class = RegisterClassW(&wclass); return TRUE; } @@ -5270,7 +5272,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; release_std_git(); - UnregisterClassW( wszAptWinClass, hProxyDll ); + if(apt_win_class) + UnregisterClassW( (const WCHAR*)MAKEINTATOM(apt_win_class), hProxyDll ); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); DeleteCriticalSection(&csRegisteredClassList);

1 0