October 2023 - Wine-Commits

Eric Pouech : dbghelp: Remove unneeded parameter to pe_map_file.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 43598133e693b007f749abfc61e63f6c7c5c836d URL: https://gitlab.winehq.org/wine/wine/-/commit/43598133e693b007f749abfc61e63f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:39:41 2023 +0200 dbghelp: Remove unneeded parameter to pe_map_file. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/module.c | 4 +- dlls/dbghelp/pe_module.c | 124 ++++++++++++++++++++----------------------- 3 files changed, 61 insertions(+), 69 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 964e974e49d..5730c5c79d9 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -197,7 +197,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; -BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) DECLSPEC_HIDDEN; +BOOL pe_map_file(HANDLE file, struct image_file_map* fmap) DECLSPEC_HIDDEN; struct image_file_map_ops { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a7a83e47f31..e6ee9534ff4 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -497,7 +497,7 @@ static BOOL image_check_debug_link_crc(const WCHAR* file, struct image_file_map* SetFilePointer(handle, 0, 0, FILE_BEGIN); if (ReadFile(handle, &magic, sizeof(magic), &read_bytes, NULL) && magic == IMAGE_DOS_SIGNATURE) - ret = pe_map_file(handle, fmap, DMT_PE); + ret = pe_map_file(handle, fmap); else ret = elf_map_handle(handle, fmap); CloseHandle(handle); @@ -521,7 +521,7 @@ static BOOL image_check_debug_link_gnu_id(const WCHAR* file, struct image_file_m TRACE("Located debug information file at %s\n", debugstr_w(file)); if (ReadFile(handle, &magic, sizeof(magic), &read_bytes, NULL) && magic == IMAGE_DOS_SIGNATURE) - ret = pe_map_file(handle, fmap, DMT_PE); + ret = pe_map_file(handle, fmap); else ret = elf_map_handle(handle, fmap); CloseHandle(handle); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index fc3542b4db5..77f1aae9283 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -243,11 +243,14 @@ static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* * * Maps an PE file into memory (and checks it's a real PE file) */ -BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) +BOOL pe_map_file(HANDLE file, struct image_file_map* fmap) { - void* mapping; + void* mapping; + IMAGE_NT_HEADERS* nthdr; + IMAGE_SECTION_HEADER* section; + unsigned i; - fmap->modtype = mt; + fmap->modtype = DMT_PE; fmap->ops = &pe_file_map_ops; fmap->alternate = NULL; fmap->u.pe.hMap = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); @@ -256,72 +259,61 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) fmap->u.pe.full_map = NULL; if (!(mapping = pe_map_full(fmap, NULL))) goto error; - switch (mt) + if (!(nthdr = RtlImageNtHeader(mapping))) goto error; + memcpy(&fmap->u.pe.file_header, &nthdr->FileHeader, sizeof(fmap->u.pe.file_header)); + switch (nthdr->OptionalHeader.Magic) { - case DMT_PE: - { - IMAGE_NT_HEADERS* nthdr; - IMAGE_SECTION_HEADER* section; - unsigned i; - - if (!(nthdr = RtlImageNtHeader(mapping))) goto error; - memcpy(&fmap->u.pe.file_header, &nthdr->FileHeader, sizeof(fmap->u.pe.file_header)); - switch (nthdr->OptionalHeader.Magic) - { - case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - fmap->addr_size = 32; - memcpy(&fmap->u.pe.opt.header32, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header32)); - break; - case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - if (sizeof(void*) == 4) return FALSE; - fmap->addr_size = 64; - memcpy(&fmap->u.pe.opt.header64, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header64)); - break; - default: - return FALSE; - } + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + fmap->addr_size = 32; + memcpy(&fmap->u.pe.opt.header32, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header32)); + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + if (sizeof(void*) == 4) return FALSE; + fmap->addr_size = 64; + memcpy(&fmap->u.pe.opt.header64, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header64)); + break; + default: + return FALSE; + } - fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); - section = IMAGE_FIRST_SECTION( nthdr ); - fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0, - nthdr->FileHeader.NumberOfSections * sizeof(fmap->u.pe.sect[0])); - if (!fmap->u.pe.sect) goto error; - for (i = 0; i < nthdr->FileHeader.NumberOfSections; i++) - { - memcpy(&fmap->u.pe.sect[i].shdr, section + i, sizeof(IMAGE_SECTION_HEADER)); - fmap->u.pe.sect[i].mapped = IMAGE_NO_MAP; - } - if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) - { - LARGE_INTEGER li; + fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); + section = IMAGE_FIRST_SECTION( nthdr ); + fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0, + nthdr->FileHeader.NumberOfSections * sizeof(fmap->u.pe.sect[0])); + if (!fmap->u.pe.sect) goto error; + for (i = 0; i < nthdr->FileHeader.NumberOfSections; i++) + { + memcpy(&fmap->u.pe.sect[i].shdr, section + i, sizeof(IMAGE_SECTION_HEADER)); + fmap->u.pe.sect[i].mapped = IMAGE_NO_MAP; + } + if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) + { + LARGE_INTEGER li; - if (GetFileSizeEx(file, &li) && pe_is_valid_pointer_table(nthdr, mapping, li.QuadPart)) - { - /* FIXME ugly: should rather map the relevant content instead of copying it */ - const char* src = (const char*)mapping + - nthdr->FileHeader.PointerToSymbolTable + - nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - char* dst; - DWORD sz = *(DWORD*)src; - - if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) - memcpy(dst, src, sz); - fmap->u.pe.strtable = dst; - } - else - { - WARN("Bad coff table... wipping out\n"); - /* we have bad information here, wipe it out */ - fmap->u.pe.file_header.PointerToSymbolTable = 0; - fmap->u.pe.file_header.NumberOfSymbols = 0; - fmap->u.pe.strtable = NULL; - } - } - else fmap->u.pe.strtable = NULL; + if (GetFileSizeEx(file, &li) && pe_is_valid_pointer_table(nthdr, mapping, li.QuadPart)) + { + /* FIXME ugly: should rather map the relevant content instead of copying it */ + const char* src = (const char*)mapping + + nthdr->FileHeader.PointerToSymbolTable + + nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + char* dst; + DWORD sz = *(DWORD*)src; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) + memcpy(dst, src, sz); + fmap->u.pe.strtable = dst; + } + else + { + WARN("Bad coff table... wipping out\n"); + /* we have bad information here, wipe it out */ + fmap->u.pe.file_header.PointerToSymbolTable = 0; + fmap->u.pe.file_header.NumberOfSymbols = 0; + fmap->u.pe.strtable = NULL; } - break; - default: assert(0); goto error; } + else fmap->u.pe.strtable = NULL; + pe_unmap_full(fmap); return TRUE; @@ -757,7 +749,7 @@ static BOOL search_builtin_pe(void *param, HANDLE handle, const WCHAR *path) { struct builtin_search *search = param; - if (!pe_map_file(handle, &search->fmap, DMT_PE)) return FALSE; + if (!pe_map_file(handle, &search->fmap)) return FALSE; search->path = wcsdup(path); return TRUE; @@ -815,7 +807,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if ((modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) { modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); - if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) + if (pe_map_file(hFile, &modfmt->u.pe_info->fmap)) { struct builtin_search builtin = { NULL }; if (opened && modfmt->u.pe_info->fmap.u.pe.builtin &&

1 0

Eric Pouech : dbghelp: Simplified module_find_by_addr().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: d4104e8505301c860a910bcda061587a41a5eee7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4104e8505301c860a910bcda06158… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:39:41 2023 +0200 dbghelp: Simplified module_find_by_addr(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 4 +--- dlls/dbghelp/module.c | 38 +++++++++++++++++--------------------- dlls/dbghelp/source.c | 2 +- dlls/dbghelp/symbol.c | 6 +++--- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 957ce36cc5d..8c9228747b0 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -962,7 +962,7 @@ static BOOL x86_64_fetch_minidump_module(struct dump_context* dc, unsigned index ULONG size; if (!(pcs = process_find_by_handle(dc->process->handle)) || - !(module = module_find_by_addr(pcs, dc->modules[index].base, DMT_UNKNOWN))) + !(module = module_find_by_addr(pcs, dc->modules[index].base))) return FALSE; rtf = (const RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); if (rtf) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b90c5c57513..ae11771f1d9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -398,7 +398,6 @@ struct symt_udt enum module_type { - DMT_UNKNOWN, /* for lookup, not actually used for a module */ DMT_ELF, /* a real ELF shared module */ DMT_PE, /* a native or builtin PE module */ DMT_MACHO, /* a real Mach-O shared module */ @@ -732,8 +731,7 @@ extern const struct loader_ops empty_loader_ops DECLSPEC_HIDDEN; extern BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, DWORD64 addr) DECLSPEC_HIDDEN; extern struct module* - module_find_by_addr(const struct process* pcs, DWORD64 addr, - enum module_type type) DECLSPEC_HIDDEN; + module_find_by_addr(const struct process* pcs, DWORD64 addr) DECLSPEC_HIDDEN; extern struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 75567127f37..a7a83e47f31 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -262,7 +262,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, DWORD64 addr) { if (!(pair->pcs = process_find_by_handle(hProcess))) return FALSE; - pair->requested = module_find_by_addr(pair->pcs, addr, DMT_UNKNOWN); + pair->requested = module_find_by_addr(pair->pcs, addr); return module_get_debug(pair); } @@ -413,29 +413,25 @@ BOOL module_get_debug(struct module_pair* pair) /*********************************************************************** * module_find_by_addr * - * either the addr where module is loaded, or any address inside the + * either the addr where module is loaded, or any address inside the * module */ -struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, - enum module_type type) +struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr) { - struct module* module; - - if (type == DMT_UNKNOWN) + struct module* module; + + for (module = pcs->lmodules; module; module = module->next) { - if ((module = module_find_by_addr(pcs, addr, DMT_PE)) || - (module = module_find_by_addr(pcs, addr, DMT_ELF)) || - (module = module_find_by_addr(pcs, addr, DMT_MACHO))) + if (module->type == DMT_PE && addr >= module->module.BaseOfImage && + addr < module->module.BaseOfImage + module->module.ImageSize) return module; } - else + for (module = pcs->lmodules; module; module = module->next) { - for (module = pcs->lmodules; module; module = module->next) - { - if (type == module->type && addr >= module->module.BaseOfImage && - addr < module->module.BaseOfImage + module->module.ImageSize) - return module; - } + if ((module->type == DMT_ELF || module->type == DMT_MACHO) && + addr >= module->module.BaseOfImage && + addr < module->module.BaseOfImage + module->module.ImageSize) + return module; } SetLastError(ERROR_MOD_NOT_FOUND); return module; @@ -1094,7 +1090,7 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; - module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); + module = module_find_by_addr(pcs, BaseOfDll); if (!module) return FALSE; module_remove(pcs, module); return TRUE; @@ -1498,7 +1494,7 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, if (!pcs) return FALSE; if (ModuleInfo->SizeOfStruct > sizeof(*ModuleInfo)) return FALSE; - module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + module = module_find_by_addr(pcs, dwAddr); if (!module) return FALSE; miw64 = module->module; @@ -1537,7 +1533,7 @@ DWORD64 WINAPI SymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) struct module* module; if (!pcs) return 0; - module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + module = module_find_by_addr(pcs, dwAddr); if (!module) return 0; return module->module.BaseOfImage; } @@ -1595,7 +1591,7 @@ PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) struct module* module; if (!pcs) return NULL; - module = module_find_by_addr(pcs, AddrBase, DMT_UNKNOWN); + module = module_find_by_addr(pcs, AddrBase); if (!module || !module->cpu->find_runtime_function) return NULL; return module->cpu->find_runtime_function(module, AddrBase); diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 3e35c7e62d2..f2dc84d4769 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -152,7 +152,7 @@ BOOL WINAPI SymEnumSourceFilesW(HANDLE hProcess, ULONG64 ModBase, PCWSTR Mask, if (ModBase) { - pair.requested = module_find_by_addr(pair.pcs, ModBase, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, ModBase); if (!module_get_debug(&pair)) return FALSE; } else diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7d7dc9b40a3..68ab81816cd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1148,7 +1148,7 @@ static BOOL symt_enum_locals(struct process* pcs, const WCHAR* mask, se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); pair.pcs = pcs; - pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc); if (!module_get_debug(&pair)) return FALSE; if (symt_check_tag(pcs->localscope_symt, SymTagFunction) || @@ -1318,7 +1318,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, HeapFree(GetProcessHeap(), 0, mod); return TRUE; } - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, BaseOfDll); if (!module_get_debug(&pair)) return FALSE; @@ -1624,7 +1624,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) /* search first in local context */ pair.pcs = pcs; - pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc); if (module_get_debug(&pair) && (symt_check_tag(pcs->localscope_symt, SymTagFunction) || symt_check_tag(pcs->localscope_symt, SymTagInlineSite)))

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetOutputSignatureBlob().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 9ce98f9be5b9d9db48b37d36fa8ba182e2a4005a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ce98f9be5b9d9db48b37d36fa8ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 16:08:50 2023 +0100 vkd3d-utils: Implement D3DGetOutputSignatureBlob(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index 50d3c0e5..794f58a9 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -92,6 +92,7 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 3678fee9..297750b1 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -113,6 +113,8 @@ VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_siz VKD3D_UTILS_API HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index e1650618..0001b7da 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -15,6 +15,7 @@ global: D3DGetDebugInfo; D3DGetInputAndOutputSignatureBlob; D3DGetInputSignatureBlob; + D3DGetOutputSignatureBlob; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 46d40a26..45b1a0ce 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -780,6 +780,13 @@ HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D return get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); } +HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetInputSignatureBlob().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 9d9f762ededd4b4c7447854969dcf5c1c5c01a31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d9f762ededd4b4c7447854969dcf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 16:01:37 2023 +0100 vkd3d-utils: Implement D3DGetInputSignatureBlob(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index 2c773cf0..50d3c0e5 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -91,6 +91,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 886987e8..3678fee9 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -111,6 +111,8 @@ VKD3D_UTILS_API HRESULT WINAPI D3DGetBlobPart(const void *data, VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 8cc9248b..e1650618 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -14,6 +14,7 @@ global: D3DGetBlobPart; D3DGetDebugInfo; D3DGetInputAndOutputSignatureBlob; + D3DGetInputSignatureBlob; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 4efa7870..46d40a26 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -773,6 +773,13 @@ HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_s return get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); } +HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Conor McCarthy : vkd3d-shader/d3d-asm: Recognise the 'rasteriser ordered view' UAV flag.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: a4ed06bc5b2a2c4387e95800866d457b6290db5b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4ed06bc5b2a2c4387e95800866d4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Aug 28 14:17:17 2023 +1000 vkd3d-shader/d3d-asm: Recognise the 'rasteriser ordered view' UAV flag. --- libs/vkd3d-shader/d3d_asm.c | 5 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 5a75cf25..197c689d 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -478,6 +478,11 @@ static void shader_dump_uav_flags(struct vkd3d_d3d_asm_compiler *compiler, uint3 vkd3d_string_buffer_printf(&compiler->buffer, "_opc"); uav_flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; } + if (uav_flags & VKD3DSUF_RASTERISER_ORDERED_VIEW) + { + vkd3d_string_buffer_printf(&compiler->buffer, "_rov"); + uav_flags &= ~VKD3DSUF_RASTERISER_ORDERED_VIEW; + } if (uav_flags) vkd3d_string_buffer_printf(&compiler->buffer, "_unknown_flags(%#x)", uav_flags); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index acf8036f..e4e294d8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -682,7 +682,8 @@ enum vkd3d_shader_sync_flags enum vkd3d_shader_uav_flags { - VKD3DSUF_GLOBALLY_COHERENT = 0x2, + VKD3DSUF_GLOBALLY_COHERENT = 0x002, + VKD3DSUF_RASTERISER_ORDERED_VIEW = 0x004, VKD3DSUF_ORDER_PRESERVING_COUNTER = 0x100, };

1 0

Eric Pouech : dbghelp: Use is_host_64bit for handling bitness of mach-o libs.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 0a1de579a7df620932c0928f036560ed4583d667 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a1de579a7df620932c0928f036560… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Oct 9 09:39:41 2023 +0200 dbghelp: Use is_host_64bit for handling bitness of mach-o libs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55650 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/macho_module.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f1b3107408c..d5f7df9001f 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -744,9 +744,9 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, WCHAR* filename; struct section_info info; 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) ? MACHO_LC_SEGMENT_64 : MACHO_LC_SEGMENT; + UINT32 target_cpu = (pcs->is_host_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; + UINT32 target_magic = (pcs->is_host_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; + UINT32 target_cmd = (pcs->is_host_64bit) ? MACHO_LC_SEGMENT_64 : MACHO_LC_SEGMENT; DWORD bytes_read; struct @@ -762,8 +762,8 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, ifm->modtype = DMT_MACHO; 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 macho_header) : FIELD_OFFSET(struct macho_header, reserved); + ifm->addr_size = (pcs->is_host_64bit) ? 64 : 32; + fmap->header_size = (pcs->is_host_64bit) ? sizeof(struct macho_header) : FIELD_OFFSET(struct macho_header, reserved); if (!(filename = get_dos_file_name(filenameW))) return FALSE; @@ -1339,8 +1339,8 @@ static BOOL image_uses_split_segs(struct process* process, ULONG_PTR load_addr) if (load_addr) { - 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; + UINT32 target_cpu = (process->is_host_64bit) ? MACHO_CPU_TYPE_X86_64 : MACHO_CPU_TYPE_X86; + UINT32 target_magic = (process->is_host_64bit) ? MACHO_MH_MAGIC_64 : MACHO_MH_MAGIC_32; struct macho_header header; if (read_process_memory(process, load_addr, &header, FIELD_OFFSET(struct macho_header, reserved)) && @@ -1608,14 +1608,14 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, TRACE("(%p/%p, %s, %p, %p)\n", pcs, pcs->handle, debugstr_w(main_name), cb, user); - if (pcs->is_64bit) + if (pcs->is_host_64bit) len = sizeof(image_infos.infos64); else len = sizeof(image_infos.infos32); if (!pcs->dbg_hdr_addr || !read_process_memory(pcs, pcs->dbg_hdr_addr, &image_infos, len)) goto done; - if (!pcs->is_64bit) + if (!pcs->is_host_64bit) { struct dyld_all_image_infos32 temp = image_infos.infos32; image_infos.infos64.infoArrayCount = temp.infoArrayCount; @@ -1625,7 +1625,7 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, goto done; TRACE("Process has %u image infos at %I64x\n", image_infos.infos64.infoArrayCount, image_infos.infos64.infoArray); - if (pcs->is_64bit) + if (pcs->is_host_64bit) len = sizeof(info_array->info64); else len = sizeof(info_array->info32); @@ -1639,7 +1639,7 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, for (i = 0; i < image_infos.infos64.infoArrayCount; i++) { struct dyld_image_info64 info; - if (pcs->is_64bit) + if (pcs->is_host_64bit) info = info_array[i].info64; else { @@ -1829,13 +1829,13 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in char path[1024]; BOOL got_path = FALSE; - if (pcs->is_64bit) + if (pcs->is_host_64bit) len = sizeof(image_infos.infos64); else len = sizeof(image_infos.infos32); if (read_process_memory(pcs, pcs->dbg_hdr_addr, &image_infos, len)) { - if (pcs->is_64bit) + if (pcs->is_host_64bit) len = sizeof(image_info.info64); else { @@ -1847,7 +1847,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in if (image_infos.infos64.infoArray && image_infos.infos64.infoArrayCount && read_process_memory(pcs, image_infos.infos64.infoArray, &image_info, len)) { - if (!pcs->is_64bit) + if (!pcs->is_host_64bit) { struct dyld_image_info32 temp = image_info.info32; image_info.info64.imageLoadAddress = temp.imageLoadAddress;

1 0

Eric Pouech : dbghelp: Rename internal field (system -> host).
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: d6096057f59e25b3ae8815eeb3ebb7446959dec3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6096057f59e25b3ae8815eeb3ebb7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:39:41 2023 +0200 dbghelp: Rename internal field (system -> host). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 4 ++-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 6 +++--- dlls/dbghelp/module.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b15ece25c88..d0f711761d4 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -378,7 +378,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) peb_addr += 0x1000; if (!ReadProcessMemory(pcs->handle, peb_addr, &peb32, sizeof(peb32), NULL)) return FALSE; base = *(const DWORD*)((const char*)&peb32 + 0x460 /* CloudFileFlags */); - pcs->is_system_64bit = FALSE; + pcs->is_host_64bit = FALSE; if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32; } if (pcs->is_64bit || base == 0) @@ -388,7 +388,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) if (!pcs->is_64bit) peb_addr -= 0x1000; /* PEB32 => PEB64 */ if (!ReadProcessMemory(pcs->handle, peb_addr, &peb, sizeof(peb), NULL)) return FALSE; base = *(const DWORD64*)&peb.CloudFileFlags; - pcs->is_system_64bit = TRUE; + pcs->is_host_64bit = TRUE; if (pcs->is_64bit) ReadProcessMemory(pcs->handle, (char *)(ULONG_PTR)peb.ProcessParameters + FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment), diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1ce221a0f27..b90c5c57513 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -517,7 +517,7 @@ struct process void* buffer; BOOL is_64bit; - BOOL is_system_64bit; + BOOL is_host_64bit; }; static inline BOOL read_process_memory(const struct process *process, UINT64 addr, void *buf, size_t size) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a2a60752a68..5ada8c70c9b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1345,7 +1345,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* { char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; - const unsigned ptr_size = pcs->is_system_64bit ? 8 : 4; + const unsigned ptr_size = pcs->is_host_64bit ? 8 : 4; UINT64 envp; UINT64 addr; UINT64 str; @@ -1385,7 +1385,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* if (str) break; } - if (pcs->is_system_64bit) + if (pcs->is_host_64bit) { struct { @@ -1479,7 +1479,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, char bufstr[256]; ULONG_PTR lm_addr; - if (pcs->is_system_64bit) + if (pcs->is_host_64bit) { struct { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 22b58950b43..75567127f37 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -134,7 +134,7 @@ WCHAR *get_wine_loader_name(struct process *pcs) unsigned len; name = process_getenv(pcs, L"WINELOADER"); - if (!name) name = pcs->is_system_64bit ? L"wine64" : L"wine"; + if (!name) name = pcs->is_host_64bit ? L"wine64" : L"wine"; len = lstrlenW(name); /* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block @@ -145,14 +145,14 @@ WCHAR *get_wine_loader_name(struct process *pcs) if (altname) { memcpy(altname, name, len * sizeof(WCHAR)); - if (pcs->is_system_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + if (pcs->is_host_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) { lstrcpyW(altname + len, L"64"); /* in multi-arch wow configuration, wine64 doesn't exist */ if (GetFileAttributesW(altname) == INVALID_FILE_ATTRIBUTES) altname[len] = L'\0'; } - else if (!pcs->is_system_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) + else if (!pcs->is_host_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) altname[len - 2] = '\0'; else altname[len] = '\0';

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetInputAndOutputSignatureBlob().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: be8efb9c9cd89d2e58b749f1028eae67b947c625 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/be8efb9c9cd89d2e58b749f1028ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 15:42:25 2023 +0100 vkd3d-utils: Implement D3DGetInputAndOutputSignatureBlob(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index f3f46212..2c773cf0 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -90,6 +90,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 65c86591..886987e8 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -109,6 +109,8 @@ VKD3D_UTILS_API HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 03d87e8a..8cc9248b 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -13,6 +13,7 @@ global: D3DCreateBlob; D3DGetBlobPart; D3DGetDebugInfo; + D3DGetInputAndOutputSignatureBlob; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 85f679d8..4efa7870 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -766,6 +766,13 @@ HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **bl return get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetDebugInfo().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 247eaa6b7db7acec8f3ad0f8fbc572c331b45a09 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/247eaa6b7db7acec8f3ad0f8fbc57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 15:41:51 2023 +0100 vkd3d-utils: Implement D3DGetDebugInfo(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index dd203b34..f3f46212 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -89,6 +89,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index f1994264..65c86591 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -107,6 +107,8 @@ VKD3D_UTILS_API void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index c48c5204..03d87e8a 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -12,6 +12,7 @@ global: D3DCompile2; D3DCreateBlob; D3DGetBlobPart; + D3DGetDebugInfo; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index e98eec7e..85f679d8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -759,6 +759,13 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART return get_blob_part(data, data_size, part, flags, blob); } +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Giovanni Mascellani : tests: Fix the usage of require directives.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: ca51c359ec7b094697686de28210862336f3dcd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca51c359ec7b094697686de282108… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 16 12:45:32 2023 +0200 tests: Fix the usage of require directives. They are reset each time "[require]" is encountered. --- tests/hlsl/combined-samplers.shader_test | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 19038c34..23553759 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -1,6 +1,7 @@ [require] shader model >= 4.0 shader model < 6.0 +options: backcompat [sampler 0] @@ -35,10 +36,6 @@ size (1, 1) size (1, 1) 4.0 4.0 4.0 1.0 -[require] -shader model < 6.0 -options: backcompat - [pixel shader] sampler sam; @@ -139,6 +136,7 @@ probe all rgba (1, 1, 1, 11) [require] shader model >= 5.0 shader model < 6.0 +options: backcompat [pixel shader todo]

1 0