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

Stefan Dösinger : wined3d: Don' t drop VBOs for full buffer reloading without conversion.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 46d879eef60d6c2c6c8a7e9daf12b1448bdec7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d879eef60d6c2c6c8a7e9da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 23:28:11 2011 +0100 wined3d: Don't drop VBOs for full buffer reloading without conversion. --- dlls/wined3d/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9e4ae2a..6d44c2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,7 +1002,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) * changes it every minute drop the VBO after VB_MAX_DECL_CHANGES minutes. So count draws without * decl changes and reset the decl change count after a specific number of them */ - if (buffer_is_fully_dirty(buffer)) + if (buffer->conversion_map && buffer_is_fully_dirty(buffer)) { ++buffer->full_conversion_count; if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS)

1 0

Stefan Dösinger : wined3d: Remove FLOAT16 vertex attribute conversion support.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 5627ee49ea54ff3be89ba4ba62462e8577123ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5627ee49ea54ff3be89ba4ba6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 23:47:49 2011 +0100 wined3d: Remove FLOAT16 vertex attribute conversion support. All mayor drivers support GL_ARB_half_float_vertex now and the half float conversion doesn't work well in practise. The only game that was ever playable with it was Eve online. --- dlls/wined3d/buffer.c | 318 ++++++++-------------------------------- dlls/wined3d/state.c | 32 +---- dlls/wined3d/wined3d_private.h | 3 - 3 files changed, 65 insertions(+), 288 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5627ee49ea54ff3be89ba…

1 0

Francois Gouget : programs: Standardize the About menus.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: d1b51d85021a1730e95de9e1e0194d3737f6d315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b51d85021a1730e95de9e1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 12 10:57:30 2011 +0200 programs: Standardize the About menus. --- dlls/user32/user32.rc | 2 +- po/ar.po | 565 ++++++++++++++++++++-------------------- po/bg.po | 568 ++++++++++++++++++++-------------------- po/ca.po | 565 ++++++++++++++++++++-------------------- po/cs.po | 572 +++++++++++++++++++++-------------------- po/da.po | 572 +++++++++++++++++++++-------------------- po/de.po | 572 +++++++++++++++++++++-------------------- po/el.po | 562 ++++++++++++++++++++-------------------- po/en.po | 570 ++++++++++++++++++++-------------------- po/en_US.po | 572 ++++++++++++++++++++-------------------- po/eo.po | 566 ++++++++++++++++++++-------------------- po/es.po | 572 +++++++++++++++++++++-------------------- po/fa.po | 565 ++++++++++++++++++++-------------------- po/fi.po | 569 ++++++++++++++++++++-------------------- po/fr.po | 572 +++++++++++++++++++++-------------------- po/he.po | 572 +++++++++++++++++++++-------------------- po/hi.po | 569 ++++++++++++++++++++-------------------- po/hu.po | 569 ++++++++++++++++++++-------------------- po/it.po | 572 +++++++++++++++++++++-------------------- po/ja.po | 572 +++++++++++++++++++++-------------------- po/ko.po | 572 +++++++++++++++++++++-------------------- po/lt.po | 572 +++++++++++++++++++++-------------------- po/ml.po | 569 ++++++++++++++++++++-------------------- po/nb_NO.po | 572 +++++++++++++++++++++-------------------- po/nl.po | 572 +++++++++++++++++++++-------------------- po/or.po | 569 ++++++++++++++++++++-------------------- po/pa.po | 569 ++++++++++++++++++++-------------------- po/pl.po | 572 +++++++++++++++++++++-------------------- po/pt_BR.po | 572 +++++++++++++++++++++-------------------- po/pt_PT.po | 572 +++++++++++++++++++++-------------------- po/rm.po | 571 ++++++++++++++++++++-------------------- po/ro.po | 572 +++++++++++++++++++++-------------------- po/ru.po | 572 +++++++++++++++++++++-------------------- po/sk.po | 568 ++++++++++++++++++++-------------------- po/sl.po | 572 +++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 566 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 566 ++++++++++++++++++++-------------------- po/sv.po | 572 +++++++++++++++++++++-------------------- po/te.po | 569 ++++++++++++++++++++-------------------- po/th.po | 563 ++++++++++++++++++++-------------------- po/tr.po | 572 +++++++++++++++++++++-------------------- po/uk.po | 572 +++++++++++++++++++++-------------------- po/wa.po | 566 ++++++++++++++++++++-------------------- po/wine.pot | 562 ++++++++++++++++++++-------------------- po/zh_CN.po | 572 +++++++++++++++++++++-------------------- po/zh_TW.po | 572 +++++++++++++++++++++-------------------- programs/clock/clock.rc | 2 +- programs/cmdlgtst/En.rc | 2 +- programs/notepad/notepad.rc | 3 +- programs/progman/progman.rc | 3 +- programs/regedit/regedit.rc | 1 - programs/taskmgr/taskmgr.rc | 1 - programs/winefile/winefile.rc | 3 +- programs/winemine/winemine.rc | 2 +- programs/winhlp32/winhlp32.rc | 1 - 55 files changed, 12883 insertions(+), 12771 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b51d85021a1730e95de…

1 0

Jacek Caban : mshtml: Use xul.dll directly instead of via xpcom.dll.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: d3a57f8079b7e439138aa444e827dae579b462a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a57f8079b7e439138aa444e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 11:39:20 2011 +0200 mshtml: Use xul.dll directly instead of via xpcom.dll. --- dlls/mshtml/nsembed.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 7b7a84f..fb283e0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -64,7 +64,7 @@ static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,PRBool*); -static HINSTANCE hXPCOM = NULL; +static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; @@ -307,26 +307,26 @@ static void set_environment(LPCWSTR gre_path) } } -static BOOL load_xpcom(const PRUnichar *gre_path) +static BOOL load_xul(const PRUnichar *gre_path) { - static const WCHAR strXPCOM[] = {'\\','x','p','c','o','m','.','d','l','l',0}; + static const WCHAR xul_dllW[] = {'\\','x','u','l','.','d','l','l',0}; WCHAR file_name[MAX_PATH]; strcpyW(file_name, gre_path); - strcatW(file_name, strXPCOM); + strcatW(file_name, xul_dllW); TRACE("(%s)\n", debugstr_w(file_name)); set_environment(gre_path); - hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); - if(!hXPCOM) { + xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if(!xul_handle) { WARN("Could not load XPCOM: %d\n", GetLastError()); return FALSE; } #define NS_DLSYM(func) \ - func = (void *)GetProcAddress(hXPCOM, #func); \ + func = (void *)GetProcAddress(xul_handle, #func "_P"); \ if(!func) \ ERR("Could not GetProcAddress(" #func ") failed\n") @@ -407,7 +407,7 @@ static BOOL load_wine_gecko_v(PRUnichar *gre_path, HKEY mshtml_key, if(!check_version(gre_path, version_string)) return FALSE; - return load_xpcom(gre_path); + return load_xul(gre_path); } static BOOL load_wine_gecko(PRUnichar *gre_path) @@ -568,14 +568,14 @@ static BOOL init_xpcom(const PRUnichar *gre_path) nsAString_Finish(&path); if(NS_FAILED(nsres)) { ERR("NS_NewLocalFile failed: %08x\n", nsres); - FreeLibrary(hXPCOM); + FreeLibrary(xul_handle); return FALSE; } nsres = NS_InitXPCOM2(&pServMgr, gre_dir, &nsDirectoryServiceProvider); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08x\n", nsres); - FreeLibrary(hXPCOM); + FreeLibrary(xul_handle); return FALSE; }

1 0

Eric Pouech : dbghelp: Force void type in const declaration, when subtype cannot be found.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 8fecef8757c7b6b794ad2e0ec5a2303fa8ef764b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fecef8757c7b6b794ad2e0ec… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 11 20:47:05 2011 +0200 dbghelp: Force void type in const declaration, when subtype cannot be found. --- dlls/dbghelp/dwarf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1f8d4a7..5b2cb01 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1301,9 +1301,13 @@ static struct symt* dwarf2_parse_const_type(dwarf2_parse_context_t* ctx, if (di->symt) return di->symt; - TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - ref_type = dwarf2_lookup_type(ctx, di); + if (!(ref_type = dwarf2_lookup_type(ctx, di))) + { + ref_type = ctx->symt_cache[sc_void]; + assert(ref_type); + } if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); di->symt = ref_type;

1 0

Eric Pouech : dbghelp: Extended CPU structure by adding a default register number for frame.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 9c09f14270fb7b6fd37f153910fd61979fb93074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c09f14270fb7b6fd37f15391… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 11 20:47:19 2011 +0200 dbghelp: Extended CPU structure by adding a default register number for frame. --- dlls/dbghelp/cpu_arm.c | 1 + dlls/dbghelp/cpu_i386.c | 1 + dlls/dbghelp/cpu_ppc.c | 1 + dlls/dbghelp/cpu_sparc.c | 1 + dlls/dbghelp/cpu_x86_64.c | 1 + dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/stabs.c | 4 ++-- dlls/dbghelp/symbol.c | 5 +++-- 9 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index fd0b781..4365828 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -73,6 +73,7 @@ static const char* arm_fetch_regname(unsigned regno) struct cpu cpu_arm = { IMAGE_FILE_MACHINE_ARM, 4, + CV_ARM_NOREG, /* FIXME */ arm_get_addr, arm_stack_walk, NULL, diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 09d88a6..6abcddc 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -635,6 +635,7 @@ static const char* i386_fetch_regname(unsigned regno) struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, 4, + CV_REG_EBP, i386_get_addr, i386_stack_walk, NULL, diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 938e371..96a5d7d 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -75,6 +75,7 @@ static const char* ppc_fetch_regname(unsigned regno) struct cpu cpu_ppc = { IMAGE_FILE_MACHINE_POWERPC, 4, + CV_REG_NONE, /* FIXME */ ppc_get_addr, ppc_stack_walk, NULL, diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c index c69e419..1de9436 100644 --- a/dlls/dbghelp/cpu_sparc.c +++ b/dlls/dbghelp/cpu_sparc.c @@ -70,6 +70,7 @@ static const char* sparc_fetch_regname(unsigned regno) struct cpu cpu_sparc = { IMAGE_FILE_MACHINE_SPARC, 4, + CV_REG_NONE, /* FIXME */ sparc_get_addr, sparc_stack_walk, NULL, diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 375c0d8..5c0dece 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -799,6 +799,7 @@ static const char* x86_64_fetch_regname(unsigned regno) struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, 8, + CV_AMD64_RSP, x86_64_get_addr, x86_64_stack_walk, x86_64_find_runtime_function, diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 7975379..3c878cc 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -470,6 +470,8 @@ struct cpu { DWORD machine; DWORD word_size; + DWORD frame_regno; + /* address manipulation */ unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr, ADDRESS64* addr); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5b2cb01..103bdbf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1899,7 +1899,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, { /* on stack !! */ subpgm.frame.kind = loc_regrel; - subpgm.frame.reg = 0; + subpgm.frame.reg = dbghelp_current_cpu->frame_regno; subpgm.frame.offset = 0; } subpgm.non_computed_variable = FALSE; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 721d5e7..3f28009 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1417,7 +1417,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, struct symt* param_type = stabs_parse_type(ptr); stab_strcpy(symname, sizeof(symname), ptr); loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = stab_ptr->n_value; symt_add_func_local(module, curr_func, (int)stab_ptr->n_value >= 0 ? DataIsParam : DataIsLocal, @@ -1492,7 +1492,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_LSYM: /* These are local variables */ loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = stab_ptr->n_value; if (curr_func != NULL) pending_add_var(&pending_block, ptr, DataIsLocal, &loc); break; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e92d998..16923e4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -721,8 +721,9 @@ static void symt_fill_sym_info(struct module_pair* pair, break; case loc_regrel: sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGREL; - /* FIXME: it's i386 dependent !!! */ - sym_info->Register = loc.reg ? loc.reg : CV_REG_EBP; + sym_info->Register = loc.reg; + if (loc.reg == CV_REG_NONE || (int)loc.reg < 0 /* error */) + FIXME("suspicious register value %x\n", loc.reg); sym_info->Address = loc.offset; break; case loc_absolute:

1 0

Rico Schüller : d3dx9: Parse effect parameter type definition.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 20dc97296b762fca894f97d63b3328a572c93663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dc97296b762fca894f97d63… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:26 2011 +0200 d3dx9: Parse effect parameter type definition. --- dlls/d3dx9_36/d3dx9_36_private.h | 4 + dlls/d3dx9_36/effect.c | 173 ++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/util.c | 51 +++++++++++ 3 files changed, 223 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 093a723..ccbef62 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -50,4 +50,8 @@ HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, const PixelFormatDesc *get_format_info(D3DFORMAT format); const PixelFormatDesc *get_format_info_idx(int idx); +/* debug helpers */ +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c); +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t); + #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a03e8a3..0e93706 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -34,10 +34,18 @@ struct d3dx_parameter { struct ID3DXBaseEffectImpl *base; + D3DXPARAMETER_CLASS class; + D3DXPARAMETER_TYPE type; + UINT rows; + UINT columns; + UINT element_count; UINT annotation_count; + UINT member_count; DWORD flags; + UINT bytes; D3DXHANDLE *annotation_handles; + D3DXHANDLE *member_handles; }; struct ID3DXBaseEffectImpl @@ -122,6 +130,15 @@ static void free_parameter(D3DXHANDLE handle) HeapFree(GetProcessHeap(), 0, param->annotation_handles); } + if (param->member_handles) + { + for (i = 0; i < param->element_count; ++i) + { + free_parameter(param->member_handles[i]); + } + HeapFree(GetProcessHeap(), 0, param->member_handles); + } + HeapFree(GetProcessHeap(), 0, param); } @@ -2375,20 +2392,157 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent) +{ + DWORD offset; + HRESULT hr; + D3DXHANDLE *member_handles = NULL; + UINT i; + + if (!parent) + { + read_dword(ptr, &param->type); + TRACE("Type: %s\n", debug_d3dxparameter_type(param->type)); + + read_dword(ptr, &param->class); + TRACE("Class: %s\n", debug_d3dxparameter_class(param->class)); + + read_dword(ptr, &offset); + TRACE("Type name offset: %#x\n", offset); + /* todo: Parse name */ + + read_dword(ptr, &offset); + TRACE("Type semantic offset: %#x\n", offset); + /* todo: Parse semantic */ + + read_dword(ptr, &param->element_count); + TRACE("Elements: %u\n", param->element_count); + + switch (param->class) + { + case D3DXPC_VECTOR: + read_dword(ptr, &param->columns); + TRACE("Columns: %u\n", param->columns); + + read_dword(ptr, &param->rows); + TRACE("Rows: %u\n", param->rows); + + /* sizeof(DWORD) * rows * columns */ + param->bytes = 4 * param->rows * param->columns; + break; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + read_dword(ptr, &param->rows); + TRACE("Rows: %u\n", param->rows); + + read_dword(ptr, &param->columns); + TRACE("Columns: %u\n", param->columns); + + /* sizeof(DWORD) * rows * columns */ + param->bytes = 4 * param->rows * param->columns; + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + else + { + /* elements */ + param->type = parent->type; + param->class = parent->class; + param->element_count = 0; + param->annotation_count = 0; + param->member_count = parent->member_count; + param->bytes = parent->bytes; + param->flags = parent->flags; + param->rows = parent->rows; + param->columns = parent->columns; + } + + if (param->element_count) + { + unsigned int param_bytes = 0; + + member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->element_count); + if (!member_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < param->element_count; ++i) + { + struct d3dx_parameter *member; + + member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); + if (!member) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + member_handles[i] = get_parameter_handle(member); + member->base = param->base; + + hr = d3dx9_parse_effect_typedef(member, data, ptr, param); + if (hr != D3D_OK) + { + WARN("Failed to parse member\n"); + goto err_out; + } + + param_bytes += member->bytes; + } + + param->bytes = param_bytes; + } + + param->member_handles = member_handles; + + return D3D_OK; + +err_out: + + if (member_handles) + { + for (i = 0; i < param->element_count; ++i) + { + free_parameter(member_handles[i]); + } + HeapFree(GetProcessHeap(), 0, member_handles); + } + + return hr; +} + static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const char *data, const char **ptr) { DWORD offset; + const char *ptr2; + HRESULT hr; + + anno->flags = D3DX_PARAMETER_ANNOTATION; read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); - /* todo: Parse typedef */ + ptr2 = data + offset; + hr = d3dx9_parse_effect_typedef(anno, data, &ptr2, NULL); + if (hr != D3D_OK) + { + WARN("Failed to parse type definition\n"); + return hr; + } read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); /* todo: Parse value */ - anno->flags &= D3DX_PARAMETER_ANNOTATION; - return D3D_OK; } @@ -2398,14 +2552,14 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const HRESULT hr; unsigned int i; D3DXHANDLE *annotation_handles = NULL; + const char *ptr2; read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); - /* todo: Parse typedef */ + ptr2 = data + offset; read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - /* todo: Parse value */ read_dword(ptr, &param->flags); TRACE("Flags: %#x\n", param->flags); @@ -2413,6 +2567,15 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const read_dword(ptr, &param->annotation_count); TRACE("Annotation count: %u\n", param->annotation_count); + hr = d3dx9_parse_effect_typedef(param, data, &ptr2, NULL); + if (hr != D3D_OK) + { + WARN("Failed to parse type definition\n"); + return hr; + } + + /* todo: Parse value */ + if (param->annotation_count) { annotation_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation_handles) * param->annotation_count); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index dc8e820..f7f3cf1 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -20,6 +20,7 @@ #include "wine/debug.h" #include "d3dx9_36_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /************************************************************ * pixel format table providing info about number of bytes per pixel, @@ -161,3 +162,53 @@ const PixelFormatDesc *get_format_info_idx(int idx) return NULL; return &formats[idx]; } + +#define WINE_D3DX_TO_STR(x) case x: return #x + +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) +{ + switch (c) + { + WINE_D3DX_TO_STR(D3DXPC_SCALAR); + WINE_D3DX_TO_STR(D3DXPC_VECTOR); + WINE_D3DX_TO_STR(D3DXPC_MATRIX_ROWS); + WINE_D3DX_TO_STR(D3DXPC_MATRIX_COLUMNS); + WINE_D3DX_TO_STR(D3DXPC_OBJECT); + WINE_D3DX_TO_STR(D3DXPC_STRUCT); + default: + FIXME("Unrecognized D3DXPARAMETER_CLASS %#x.\n", c); + return "unrecognized"; + } +} + +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) +{ + switch (t) + { + WINE_D3DX_TO_STR(D3DXPT_VOID); + WINE_D3DX_TO_STR(D3DXPT_BOOL); + WINE_D3DX_TO_STR(D3DXPT_INT); + WINE_D3DX_TO_STR(D3DXPT_FLOAT); + WINE_D3DX_TO_STR(D3DXPT_STRING); + WINE_D3DX_TO_STR(D3DXPT_TEXTURE); + WINE_D3DX_TO_STR(D3DXPT_TEXTURE1D); + WINE_D3DX_TO_STR(D3DXPT_TEXTURE2D); + WINE_D3DX_TO_STR(D3DXPT_TEXTURE3D); + WINE_D3DX_TO_STR(D3DXPT_TEXTURECUBE); + WINE_D3DX_TO_STR(D3DXPT_SAMPLER); + WINE_D3DX_TO_STR(D3DXPT_SAMPLER1D); + WINE_D3DX_TO_STR(D3DXPT_SAMPLER2D); + WINE_D3DX_TO_STR(D3DXPT_SAMPLER3D); + WINE_D3DX_TO_STR(D3DXPT_SAMPLERCUBE); + WINE_D3DX_TO_STR(D3DXPT_PIXELSHADER); + WINE_D3DX_TO_STR(D3DXPT_VERTEXSHADER); + WINE_D3DX_TO_STR(D3DXPT_PIXELFRAGMENT); + WINE_D3DX_TO_STR(D3DXPT_VERTEXFRAGMENT); + WINE_D3DX_TO_STR(D3DXPT_UNSUPPORTED); + default: + FIXME("Unrecognized D3DXPARAMETER_TYP %#x.\n", t); + return "unrecognized"; + } +} + +#undef WINE_D3DX_TO_STR

1 0

Rico Schüller : d3dx9: Parse effect type D3DXPC_STRUCT .
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: e4a0ef69f5fec3c82d5df693c1ecc38900a830d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0ef69f5fec3c82d5df693c… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:34 2011 +0200 d3dx9: Parse effect type D3DXPC_STRUCT. --- dlls/d3dx9_36/effect.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e93706..a7c2b6e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -132,7 +132,12 @@ static void free_parameter(D3DXHANDLE handle) if (param->member_handles) { - for (i = 0; i < param->element_count; ++i) + unsigned int count; + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) { free_parameter(param->member_handles[i]); } @@ -2444,6 +2449,11 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = 4 * param->rows * param->columns; break; + case D3DXPC_STRUCT: + read_dword(ptr, &param->member_count); + TRACE("Members: %u\n", param->member_count); + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -2502,6 +2512,41 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = param_bytes; } + else if (param->member_count) + { + member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->member_count); + if (!member_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < param->member_count; ++i) + { + struct d3dx_parameter *member; + + member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); + if (!member) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + member_handles[i] = get_parameter_handle(member); + member->base = param->base; + + hr = d3dx9_parse_effect_typedef(member, data, ptr, NULL); + if (hr != D3D_OK) + { + WARN("Failed to parse member\n"); + goto err_out; + } + + param->bytes += member->bytes; + } + } param->member_handles = member_handles; @@ -2511,7 +2556,12 @@ err_out: if (member_handles) { - for (i = 0; i < param->element_count; ++i) + unsigned int count; + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) { free_parameter(member_handles[i]); }

1 0

Rico Schüller : d3dx9: Parse name and semantics.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 53d0a02c20c80d66b31636e76595f4823835fdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d0a02c20c80d66b31636e76… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:37 2011 +0200 d3dx9: Parse name and semantics. --- dlls/d3dx9_36/effect.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a7c2b6e..67877ec 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -34,6 +34,8 @@ struct d3dx_parameter { struct ID3DXBaseEffectImpl *base; + char *name; + char *semantic; D3DXPARAMETER_CLASS class; D3DXPARAMETER_TYPE type; UINT rows; @@ -109,7 +111,7 @@ static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) return (D3DXHANDLE) parameter; } -static void free_parameter(D3DXHANDLE handle) +static void free_parameter(D3DXHANDLE handle, BOOL element) { unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); @@ -125,7 +127,7 @@ static void free_parameter(D3DXHANDLE handle) { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(param->annotation_handles[i]); + free_parameter(param->annotation_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, param->annotation_handles); } @@ -139,11 +141,18 @@ static void free_parameter(D3DXHANDLE handle) for (i = 0; i < count; ++i) { - free_parameter(param->member_handles[i]); + free_parameter(param->member_handles[i], param->element_count != 0); } HeapFree(GetProcessHeap(), 0, param->member_handles); } + /* only the parent has to release name and semantic */ + if (!element) + { + HeapFree(GetProcessHeap(), 0, param->name); + HeapFree(GetProcessHeap(), 0, param->semantic); + } + HeapFree(GetProcessHeap(), 0, param); } @@ -157,7 +166,7 @@ static void free_base_effect(struct ID3DXBaseEffectImpl *base) { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(base->parameter_handles[i]); + free_parameter(base->parameter_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, base->parameter_handles); } @@ -2397,6 +2406,31 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_name(char **name, const char *ptr) +{ + DWORD size; + + read_dword(&ptr, &size); + TRACE("Name size: %#x\n", size); + + if (!size) + { + return D3D_OK; + } + + *name = HeapAlloc(GetProcessHeap(), 0, size); + if (!*name) + { + ERR("Failed to allocate name memory.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Name: %s.\n", debugstr_an(ptr, size)); + memcpy(*name, ptr, size); + + return D3D_OK; +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent) { DWORD offset; @@ -2414,11 +2448,21 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch read_dword(ptr, &offset); TRACE("Type name offset: %#x\n", offset); - /* todo: Parse name */ + hr = d3dx9_parse_name(&param->name, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse name\n"); + goto err_out; + } read_dword(ptr, &offset); TRACE("Type semantic offset: %#x\n", offset); - /* todo: Parse semantic */ + hr = d3dx9_parse_name(&param->semantic, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse semantic\n"); + goto err_out; + } read_dword(ptr, &param->element_count); TRACE("Elements: %u\n", param->element_count); @@ -2464,6 +2508,8 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch /* elements */ param->type = parent->type; param->class = parent->class; + param->name = parent->name; + param->semantic = parent->semantic; param->element_count = 0; param->annotation_count = 0; param->member_count = parent->member_count; @@ -2563,11 +2609,19 @@ err_out: for (i = 0; i < count; ++i) { - free_parameter(member_handles[i]); + free_parameter(member_handles[i], param->element_count != 0); } HeapFree(GetProcessHeap(), 0, member_handles); } + if (!parent) + { + HeapFree(GetProcessHeap(), 0, param->name); + HeapFree(GetProcessHeap(), 0, param->semantic); + } + param->name = NULL; + param->semantic = NULL; + return hr; } @@ -2670,7 +2724,7 @@ err_out: { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(annotation_handles[i]); + free_parameter(annotation_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, annotation_handles); } @@ -2739,7 +2793,7 @@ err_out: { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(parameter_handles[i]); + free_parameter(parameter_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, parameter_handles); }

1 0

Rico Schüller : d3dx9: Parse value data.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 0f10e1b3442b4d629a36007a1a76c4060c78501e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f10e1b3442b4d629a36007a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:39 2011 +0200 d3dx9: Parse value data. --- dlls/d3dx9_36/effect.c | 130 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 120 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 67877ec..f31ac31 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -36,6 +36,7 @@ struct d3dx_parameter char *name; char *semantic; + void *data; D3DXPARAMETER_CLASS class; D3DXPARAMETER_TYPE type; UINT rows; @@ -111,23 +112,28 @@ static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) return (D3DXHANDLE) parameter; } -static void free_parameter(D3DXHANDLE handle, BOOL element) +static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); - TRACE("Free parameter %p\n", param); + TRACE("Free parameter %p, child %s\n", param, child ? "yes" : "no"); if (!param) { return; } + if (!child) + { + HeapFree(GetProcessHeap(), 0, param->data); + } + if (param->annotation_handles) { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(param->annotation_handles[i], FALSE); + free_parameter(param->annotation_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, param->annotation_handles); } @@ -141,7 +147,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element) for (i = 0; i < count; ++i) { - free_parameter(param->member_handles[i], param->element_count != 0); + free_parameter(param->member_handles[i], param->element_count != 0, TRUE); } HeapFree(GetProcessHeap(), 0, param->member_handles); } @@ -166,7 +172,7 @@ static void free_base_effect(struct ID3DXBaseEffectImpl *base) { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(base->parameter_handles[i], FALSE); + free_parameter(base->parameter_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, base->parameter_handles); } @@ -2406,6 +2412,100 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) +{ + unsigned int i; + HRESULT hr; + UINT old_size = 0; + + if (param->element_count) + { + param->data = value; + + for (i = 0; i < param->element_count; ++i) + { + struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); + + hr = d3dx9_parse_value(member, (char *)value + old_size); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } + + old_size += member->bytes; + } + + return D3D_OK; + } + + switch(param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + param->data = value; + break; + + case D3DXPC_STRUCT: + param->data = value; + + for (i = 0; i < param->member_count; ++i) + { + struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); + + hr = d3dx9_parse_value(member, (char *)value + old_size); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } + + old_size += member->bytes; + } + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + + return D3D_OK; +} + + +static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *ptr) +{ + UINT size = param->bytes; + HRESULT hr; + void *value; + + TRACE("param size: %u\n", size); + + value = HeapAlloc(GetProcessHeap(), 0, size); + if (!value) + { + ERR("Failed to allocate data memory.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Data: %s.\n", debugstr_an(ptr, size)); + memcpy(value, ptr, size); + + hr = d3dx9_parse_value(param, value); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + HeapFree(GetProcessHeap(), 0, value); + return hr; + } + + param->data = value; + + return D3D_OK; +} + static HRESULT d3dx9_parse_name(char **name, const char *ptr) { DWORD size; @@ -2609,7 +2709,7 @@ err_out: for (i = 0; i < count; ++i) { - free_parameter(member_handles[i], param->element_count != 0); + free_parameter(member_handles[i], param->element_count != 0, TRUE); } HeapFree(GetProcessHeap(), 0, member_handles); } @@ -2645,7 +2745,12 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - /* todo: Parse value */ + hr = d3dx9_parse_init_value(anno, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } return D3D_OK; } @@ -2678,7 +2783,12 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const return hr; } - /* todo: Parse value */ + hr = d3dx9_parse_init_value(param, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } if (param->annotation_count) { @@ -2724,7 +2834,7 @@ err_out: { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(annotation_handles[i], FALSE); + free_parameter(annotation_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, annotation_handles); } @@ -2793,7 +2903,7 @@ err_out: { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(parameter_handles[i], FALSE); + free_parameter(parameter_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, parameter_handles); }

1 0