wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

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

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

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: For codeview/ bprel symbols force the register to be EBP, other CPUs should use regrel symbol instead of bprel.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 2dd45a12c15da2912b77277fe7225378072f7615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd45a12c15da2912b77277fe… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 11 20:47:13 2011 +0200 dbghelp: For codeview/bprel symbols force the register to be EBP, other CPUs should use regrel symbol instead of bprel. --- dlls/dbghelp/msc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7d64239..9abd065 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1692,7 +1692,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root */ case S_BPREL_V1: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v1.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v1.offset > 0 ? DataIsParam : DataIsLocal, @@ -1702,7 +1703,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_BPREL_V2: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v2.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v2.offset > 0 ? DataIsParam : DataIsLocal, @@ -1712,7 +1714,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_BPREL_V3: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v3.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v3.offset > 0 ? DataIsParam : DataIsLocal,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 3e54f6b5d9026b265e1f2d15c5cbfcd9a1dc974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e54f6b5d9026b265e1f2d15c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Apr 11 21:43:41 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index ff87277..4120638 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-01 18:46+0300\n" +"PO-Revision-Date: 2011-04-11 21:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2016,13 +2016,12 @@ msgid "Default MidiOut Device" msgstr "Numatytasis MidiOut įrenginys" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Numatytosios nuostatos" +msgstr "Regiono nuostatos" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%u MB sunaudota, %u MB laisva" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -10971,9 +10970,8 @@ msgid "Large" msgstr "&Didelis" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "Pa&galba apie žinyną" +msgstr "Pa&galba apie žinyną\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Henri Verbeet : d3d9: Get rid of the implicit swapchain refcounting hacks.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 3c07f7a68e00cdd1be0db62ec6a6c5924d751dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c07f7a68e00cdd1be0db62ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:17 2011 +0200 d3d9: Get rid of the implicit swapchain refcounting hacks. --- dlls/d3d9/d3d9_private.h | 3 --- dlls/d3d9/device.c | 16 +++++----------- dlls/d3d9/swapchain.c | 17 ++++++----------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6e5d6d8..f1c0a8c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -222,9 +222,6 @@ typedef struct IDirect3DSwapChain9Impl /* Parent reference */ LPDIRECT3DDEVICE9EX parentDevice; - - /* Flags an implicit swap chain */ - BOOL isImplicit; } IDirect3DSwapChain9Impl; HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1a66104..9565815 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -183,14 +183,9 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U static ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IDirect3DSwapChain9Impl *parent; - TRACE("swapchain %p.\n", swapchain); - parent = IWineD3DSwapChain_GetParent(swapchain); - parent->isImplicit = FALSE; - IDirect3DSwapChain9_AddRef((IDirect3DSwapChain9 *)parent); - return IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)parent); + return IWineD3DSwapChain_Release(swapchain); } /* IDirect3D IUnknown parts follow: */ @@ -3174,8 +3169,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { struct IDirect3DDevice9Impl *This = device_from_device_parent(iface); - IDirect3DSwapChain9Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; + IDirect3DSwapChain9 *d3d_swapchain; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); @@ -3197,7 +3192,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar local_parameters.PresentationInterval = present_parameters->PresentationInterval; hr = IDirect3DDevice9Impl_CreateAdditionalSwapChain((IDirect3DDevice9Ex *)This, - &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain); + &local_parameters, &d3d_swapchain); if (FAILED(hr)) { ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr); @@ -3205,9 +3200,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return hr; } - *swapchain = d3d_swapchain->wineD3DSwapChain; - d3d_swapchain->isImplicit = TRUE; - /* Implicit swap chains are created with an refcount of 0 */ + *swapchain = ((IDirect3DSwapChain9Impl *)d3d_swapchain)->wineD3DSwapChain; + IWineD3DSwapChain_AddRef(*swapchain); IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)d3d_swapchain); /* Copy back the presentation parameters */ diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index df1cc77..7301247 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -55,12 +55,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { if (This->parentDevice) IDirect3DDevice9Ex_AddRef(This->parentDevice); - if (!This->isImplicit) - { - wined3d_mutex_lock(); - IWineD3DSwapChain_AddRef(This->wineD3DSwapChain); - wined3d_mutex_unlock(); - } + wined3d_mutex_lock(); + IWineD3DSwapChain_AddRef(This->wineD3DSwapChain); + wined3d_mutex_unlock(); } return ref; @@ -75,11 +72,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; - if (!This->isImplicit) { - wined3d_mutex_lock(); - IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); - wined3d_mutex_unlock(); - } + wined3d_mutex_lock(); + IWineD3DSwapChain_Release(This->wineD3DSwapChain); + wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice);

1 0

Henri Verbeet : d3d8: Get rid of the implicit swapchain refcounting hacks.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 4e56a4fe793c2dd54793d011768cdf5f8c157f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e56a4fe793c2dd54793d0117… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:16 2011 +0200 d3d8: Get rid of the implicit swapchain refcounting hacks. --- dlls/d3d8/device.c | 15 ++++++--------- dlls/d3d8/swapchain.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 10a567d..54ee3f2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -256,12 +256,9 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IUnknown *parent; - TRACE("swapchain %p.\n", swapchain); - parent = IWineD3DSwapChain_GetParent(swapchain); - return IUnknown_Release(parent); + return IWineD3DSwapChain_Release(swapchain); } static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) @@ -2913,8 +2910,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); - IDirect3DSwapChain8Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; + IDirect3DSwapChain8 *d3d_swapchain; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); @@ -2935,7 +2932,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar local_parameters.FullScreen_PresentationInterval = present_parameters->PresentationInterval; hr = IDirect3DDevice8_CreateAdditionalSwapChain(&This->IDirect3DDevice8_iface, - &local_parameters, (IDirect3DSwapChain8 **)&d3d_swapchain); + &local_parameters, &d3d_swapchain); if (FAILED(hr)) { ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr); @@ -2943,9 +2940,9 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return hr; } - *swapchain = d3d_swapchain->wineD3DSwapChain; - IUnknown_Release(d3d_swapchain->parentDevice); - d3d_swapchain->parentDevice = NULL; + *swapchain = ((IDirect3DSwapChain8Impl *)d3d_swapchain)->wineD3DSwapChain; + IWineD3DSwapChain_AddRef(*swapchain); + IDirect3DSwapChain8_Release(d3d_swapchain); /* Copy back the presentation parameters */ present_parameters->BackBufferWidth = local_parameters.BackBufferWidth; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 654e153..a38cba1 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -78,7 +78,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface) IDirect3DDevice8 *parentDevice = This->parentDevice; wined3d_mutex_lock(); - IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); + IWineD3DSwapChain_Release(This->wineD3DSwapChain); wined3d_mutex_unlock(); if (parentDevice)

1 0

Henri Verbeet : wined3d: Flush after accessing the front buffer in flush_to_framebuffer_drawpixels( ).
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 17c51d49b765dfc260f42bdda934c56c7b82241a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c51d49b765dfc260f42bdda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:15 2011 +0200 wined3d: Flush after accessing the front buffer in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 102ddc9..8d50793 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2053,6 +2053,12 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *surface, checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)"); LEAVE_GL(); + + if (wined3d_settings.strict_draw_ordering + || (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface->container.u.swapchain->front_buffer == surface)) + wglFlush(); + context_release(context); }

1 0

Henri Verbeet : wined3d: Flush after accessing the front buffer in surface_blt_fbo().
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 55e957a31a8fea55a27285483202723db06407bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e957a31a8fea55a27285483… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:14 2011 +0200 wined3d: Flush after accessing the front buffer in surface_blt_fbo(). --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c2d92ed..102ddc9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3456,7 +3456,10 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT LEAVE_GL(); - if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering + || (dst_location == SFLAG_INDRAWABLE + && dst_surface->container.u.swapchain->front_buffer == dst_surface)) + wglFlush(); context_release(context); }

1 0

Henri Verbeet : wined3d: Depth-only clears are done offscreen.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 68c4a1b61ae58db1e315347c04d115dc589bb1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c4a1b61ae58db1e315347c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:13 2011 +0200 wined3d: Depth-only clears are done offscreen. This fixes a regression introduced by commit 99bfd817141ca32f9c50e539aa4d0dcbfded24b7. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e05c732..7b4ad8a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -701,7 +701,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I } else { - render_offscreen = FALSE; + render_offscreen = TRUE; drawable_width = depth_stencil->pow2Width; drawable_height = depth_stencil->pow2Height; }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011