wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetViewports().
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 69a63024efbadfb92cf49a2c672218dfe5dc1bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a63024efbadfb92cf49a2c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 21:48:49 2012 +0200 d3d10core: Implement d3d10_device_RSSetViewports(). --- dlls/d3d10core/device.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ebfd4cf..8aeffcc 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -348,7 +348,25 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device *iface, ID3D1 static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, UINT viewport_count, const D3D10_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %u, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %u, viewports %p.\n", iface, viewport_count, viewports); + + if (viewport_count > 1) + FIXME("Multiple viewports not implemented.\n"); + + if (!viewport_count) + return; + + wined3d_vp.x = viewports[0].TopLeftX; + wined3d_vp.y = viewports[0].TopLeftY; + wined3d_vp.width = viewports[0].Width; + wined3d_vp.height = viewports[0].Height; + wined3d_vp.min_z = viewports[0].MinDepth; + wined3d_vp.max_z = viewports[0].MaxDepth; + + wined3d_device_set_viewport(device->wined3d_device, &wined3d_vp); } static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device *iface,

1 0

Bruno Jesus : tapi32: Add stub lineInitializeExW.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 51572d8a354b44e43e8331c4aa86fa545ddbefda URL: http://source.winehq.org/git/wine.git/?a=commit;h=51572d8a354b44e43e8331c4a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 17 16:38:11 2012 -0300 tapi32: Add stub lineInitializeExW. --- dlls/tapi32/line.c | 10 ++++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index cbb5f98..756adf6 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1034,6 +1034,16 @@ LONG WINAPI lineInitializeExA(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECA } /*********************************************************************** + * lineInitializeExW (TAPI32.@) + */ +LONG WINAPI lineInitializeExW(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECALLBACK lpfnCallback, LPCWSTR lpszFriendlyAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPLINEINITIALIZEEXPARAMS lpLineInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphLineApp, hInstance, + lpfnCallback, debugstr_w(lpszFriendlyAppName), lpdwNumDevs, lpdwAPIVersion, lpLineInitializeExParams); + return 0; +} + +/*********************************************************************** * lineMakeCallW (TAPI32.@) */ DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress, diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 78cd63b..6d20bf3 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -69,6 +69,7 @@ @ stdcall lineHold(long) @ stdcall lineInitialize(ptr long ptr str ptr) @ stdcall lineInitializeExA(ptr long ptr str ptr ptr ptr) +@ stdcall lineInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) @ stdcall lineMakeCallW(long ptr wstr long ptr)

1 0

Michael Stefaniuc : dsound/tests: Avoid a crash on a Win2k box.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 15456454843301752ad520f2c9b2a5ad5bbbe051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15456454843301752ad520f2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 17 21:08:05 2012 +0200 dsound/tests: Avoid a crash on a Win2k box. --- dlls/dsound/tests/duplex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 170b552..b688803 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -285,7 +285,7 @@ static void test_COM(void) "IDirectSoundFullDuplex_Initialize failed: %08x, expected E_INVALIDARG\n", hr); hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, &dscb8, &dsb8); - if (hr == DSERR_NODRIVER) { + if (hr == DSERR_NODRIVER || hr == DSERR_INVALIDCALL) { skip("No driver\n"); return; }

1 0

Michael Stefaniuc : dsound: Improve the IDirectSoundCaptureBuffer:: GetObjectInPath stub.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 34b7e83357f539647aa56274d337de07cfac99dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b7e83357f539647aa56274d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 17 21:06:51 2012 +0200 dsound: Improve the IDirectSoundCaptureBuffer::GetObjectInPath stub. --- dlls/dsound/capture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 309702a..5336b59 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -583,7 +583,11 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetObjectInPath(IDirectSound FIXME( "(%p,%s,%u,%s,%p): stub\n", This, debugstr_guid(rguidObject), dwIndex, debugstr_guid(rguidInterface), ppObject ); - return DS_OK; + if (!ppObject) + return DSERR_INVALIDPARAM; + + *ppObject = NULL; + return DSERR_CONTROLUNAVAIL; } static HRESULT WINAPI IDirectSoundCaptureBufferImpl_GetFXStatus(IDirectSoundCaptureBuffer8 *iface,

1 0

Matteo Bruni : d3dcompiler: Stub D3DDisassemble.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: caf6fe058826b7957e5fb50529a86f1c7fdc7fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf6fe058826b7957e5fb5052… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 17 15:32:06 2012 +0200 d3dcompiler: Stub D3DDisassemble. --- dlls/d3dcompiler_43/compiler.c | 7 +++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 9f1ed86..04fc66d 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -662,3 +662,10 @@ cleanup: LeaveCriticalSection(&wpp_mutex); return hr; } + +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) +{ + FIXME("data %p, size %lu, flags %#x, comments %p, disassembly %p stub!\n", + data, size, flags, comments, disassembly); + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index 6cbee43..ab6cfa0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -5,7 +5,7 @@ @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders @ stub D3DDisassemble10Effect(ptr long ptr) -@ stub D3DDisassemble(ptr long long ptr ptr) +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DGetBlobPart(ptr long long long ptr) @ stdcall D3DGetDebugInfo(ptr long ptr) @ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr)

1 0

Matteo Bruni : d3dcompiler: Postincrement/decrement expressions are const.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 237558f6499ba30524fade1c42ffcf6b36db352f URL: http://source.winehq.org/git/wine.git/?a=commit;h=237558f6499ba30524fade1c4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 17 15:32:05 2012 +0200 d3dcompiler: Postincrement/decrement expressions are const. Also check for const expressions used as l-values. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 49 +++++++++++++++++-- dlls/d3dcompiler_43/utils.c | 73 +++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 01c31ef..a191529 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1027,6 +1027,7 @@ BOOL add_func_parameter(struct list *list, struct parse_parameter *param, struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c003754..7ed50b4 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1026,20 +1026,38 @@ postfix_expr: primary_expr struct hlsl_ir_node *operands[3]; struct source_location loc; + set_location(&loc, &@2); + if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "modifying a const expression"); + return 1; + } operands[0] = $1; operands[1] = operands[2] = NULL; - set_location(&loc, &@2); $$ = &new_expr(HLSL_IR_BINOP_POSTINC, operands, &loc)->node; + /* Post increment/decrement expressions are considered const */ + $$->data_type = clone_hlsl_type($$->data_type); + $$->data_type->modifiers |= HLSL_MODIFIER_CONST; } | postfix_expr OP_DEC { struct hlsl_ir_node *operands[3]; struct source_location loc; + set_location(&loc, &@2); + if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "modifying a const expression"); + return 1; + } operands[0] = $1; operands[1] = operands[2] = NULL; - set_location(&loc, &@2); $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; + /* Post increment/decrement expressions are considered const */ + $$->data_type = clone_hlsl_type($$->data_type); + $$->data_type->modifiers |= HLSL_MODIFIER_CONST; } | postfix_expr '.' any_identifier { @@ -1113,9 +1131,15 @@ unary_expr: postfix_expr struct hlsl_ir_node *operands[3]; struct source_location loc; + set_location(&loc, &@1); + if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "modifying a const expression"); + return 1; + } operands[0] = $2; operands[1] = operands[2] = NULL; - set_location(&loc, &@1); $$ = &new_expr(HLSL_IR_BINOP_PREINC, operands, &loc)->node; } | OP_DEC unary_expr @@ -1123,9 +1147,15 @@ unary_expr: postfix_expr struct hlsl_ir_node *operands[3]; struct source_location loc; + set_location(&loc, &@1); + if ($2->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "modifying a const expression"); + return 1; + } operands[0] = $2; operands[1] = operands[2] = NULL; - set_location(&loc, &@1); $$ = &new_expr(HLSL_IR_BINOP_PREDEC, operands, &loc)->node; } | unary_op unary_expr @@ -1335,10 +1365,19 @@ assignment_expr: conditional_expr } | unary_expr assign_op assignment_expr { + struct source_location loc; + + set_location(&loc, &@2); + if ($1->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "l-value is const"); + return 1; + } $$ = make_assignment($1, $2, BWRITERSP_WRITEMASK_ALL, $3); if (!$$) return 1; - set_location(&$$->loc, &@2); + $$->loc = loc; } assign_op: '=' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c416060..ad7887a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -947,6 +947,79 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ return TRUE; } +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) +{ + struct hlsl_type *type; + struct hlsl_struct_field *old_field, *field; + + type = d3dcompiler_alloc(sizeof(*type)); + if (!type) + { + ERR("Out of memory\n"); + return NULL; + } + if (old->name) + { + type->name = d3dcompiler_strdup(old->name); + if (!type->name) + { + d3dcompiler_free(type); + return NULL; + } + } + type->type = old->type; + type->base_type = old->base_type; + type->dimx = old->dimx; + type->dimy = old->dimy; + type->modifiers = old->modifiers; + type->sampler_dim = old->sampler_dim; + switch (old->type) + { + case HLSL_CLASS_ARRAY: + type->e.array.type = old->e.array.type; + type->e.array.elements_count = old->e.array.elements_count; + break; + case HLSL_CLASS_STRUCT: + type->e.elements = d3dcompiler_alloc(sizeof(*type->e.elements)); + if (!type->e.elements) + { + d3dcompiler_free((void *)type->name); + d3dcompiler_free(type); + return NULL; + } + list_init(type->e.elements); + LIST_FOR_EACH_ENTRY(old_field, old->e.elements, struct hlsl_struct_field, entry) + { + field = d3dcompiler_alloc(sizeof(*field)); + if (!field) + { + LIST_FOR_EACH_ENTRY_SAFE(field, old_field, type->e.elements, struct hlsl_struct_field, entry) + { + d3dcompiler_free((void *)field->semantic); + d3dcompiler_free((void *)field->name); + d3dcompiler_free(field); + } + d3dcompiler_free(type->e.elements); + d3dcompiler_free((void *)type->name); + d3dcompiler_free(type); + return NULL; + } + field->type = clone_hlsl_type(old_field->type); + field->name = d3dcompiler_strdup(old_field->name); + if (old_field->semantic) + field->semantic = d3dcompiler_strdup(old_field->semantic); + field->modifiers = old_field->modifiers; + list_add_tail(type->e.elements, &field->entry); + } + break; + default: + break; + } + + list_add_tail(&hlsl_ctx.types, &type->entry); + return type; +} + static BOOL convertible_data_type(struct hlsl_type *type) { return type->type != HLSL_CLASS_OBJECT;

1 0

Matteo Bruni : d3dcompiler: Parse swizzles.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 7cce71a0c3e35ee50cf0f05d6d30e8acb42cd34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cce71a0c3e35ee50cf0f05d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 17 15:32:04 2012 +0200 d3dcompiler: Parse swizzles. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ++++ dlls/d3dcompiler_43/hlsl.y | 122 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 33 ++++++++ 3 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 05454f1..01c31ef 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_SWIZZLE, }; struct hlsl_ir_node @@ -834,6 +835,13 @@ struct hlsl_ir_expr struct list *subexpressions; }; +struct hlsl_ir_swizzle +{ + struct hlsl_ir_node node; + struct hlsl_ir_node *val; + DWORD swizzle; +}; + enum hlsl_ir_deref_type { HLSL_IR_DEREF_VAR, @@ -999,6 +1007,12 @@ static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ return CONTAINING_RECORD(node, struct hlsl_ir_assignment, node); } +static inline struct hlsl_ir_swizzle *swizzle_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_SWIZZLE); + return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); +} + static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_CONSTRUCTOR); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c67ab54..c003754 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -187,6 +187,103 @@ static unsigned int components_count_expr_list(struct list *list) return count; } +static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle = d3dcompiler_alloc(sizeof(*swizzle)); + + if (!swizzle) + return NULL; + swizzle->node.type = HLSL_IR_SWIZZLE; + swizzle->node.loc = *loc; + swizzle->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1); + swizzle->val = val; + swizzle->swizzle = s; + return swizzle; +} + +static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, + struct source_location *loc) +{ + unsigned int len = strlen(swizzle), component = 0; + unsigned int i, set, swiz = 0; + BOOL valid; + + if (value->data_type->type == HLSL_CLASS_MATRIX) + { + /* Matrix swizzle */ + BOOL m_swizzle; + unsigned int inc, x, y; + + if (len < 3 || swizzle[0] != '_') + return NULL; + m_swizzle = swizzle[1] == 'm'; + inc = m_swizzle ? 4 : 3; + + if (len % inc || len > inc * 4) + return NULL; + + for (i = 0; i < len; i += inc) + { + if (swizzle[i] != '_') + return NULL; + if (m_swizzle) + { + if (swizzle[i + 1] != 'm') + return NULL; + x = swizzle[i + 2] - '0'; + y = swizzle[i + 3] - '0'; + } + else + { + x = swizzle[i + 1] - '1'; + y = swizzle[i + 2] - '1'; + } + + if (x >= value->data_type->dimx || y >= value->data_type->dimy) + return NULL; + swiz |= (y << 4 | x) << component * 8; + component++; + } + return new_swizzle(swiz, component, value, loc); + } + + /* Vector swizzle */ + if (len > 4) + return NULL; + + for (set = 0; set < 2; ++set) + { + valid = TRUE; + component = 0; + for (i = 0; i < len; ++i) + { + char c[2][4] = {{'x', 'y', 'z', 'w'}, {'r', 'g', 'b', 'a'}}; + unsigned int s = 0; + + for (s = 0; s < 4; ++s) + { + if (swizzle[i] == c[set][s]) + break; + } + if (s == 4) + { + valid = FALSE; + break; + } + + if (s >= value->data_type->dimx) + return NULL; + swiz |= s << component * 2; + component++; + } + if (valid) + return new_swizzle(swiz, component, value, loc); + } + + return NULL; +} + %} %locations @@ -944,6 +1041,31 @@ postfix_expr: primary_expr set_location(&loc, &@2); $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; } + | postfix_expr '.' any_identifier + { + struct source_location loc; + + set_location(&loc, &@2); + if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct hlsl_ir_swizzle *swizzle; + + swizzle = get_swizzle($1, $3, &loc); + if (!swizzle) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid swizzle %s", debugstr_a($3)); + return 1; + } + $$ = &swizzle->node; + } + else + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid subscript %s", debugstr_a($3)); + return 1; + } + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ | var_modifiers type '(' initializer_expr_list ')' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 242f5fb..c416060 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1457,6 +1457,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig struct hlsl_ir_deref *lhs_deref = new_var_deref(var_from_node(lhs)); lhs = &lhs_deref->node; } + /* FIXME: check for invalid writemasks on the lhs. */ if (!compare_hlsl_types(type, rhs->data_type)) { @@ -1870,6 +1871,26 @@ static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) TRACE(")"); } +static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) +{ + unsigned int i; + + debug_dump_instr(swizzle->val); + TRACE("."); + if (swizzle->val->data_type->dimy > 1) + { + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + TRACE("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); + } + else + { + char c[] = {'x', 'y', 'z', 'w'}; + + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -1886,6 +1907,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_ASSIGNMENT: debug_dump_ir_assignment(assignment_from_node(instr)); break; + case HLSL_IR_SWIZZLE: + debug_dump_ir_swizzle(swizzle_from_node(instr)); + break; case HLSL_IR_CONSTRUCTOR: debug_dump_ir_constructor(constructor_from_node(instr)); break; @@ -1993,6 +2017,12 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) d3dcompiler_free(deref); } +static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) +{ + free_instr(swizzle->val); + d3dcompiler_free(swizzle); +} + static void free_ir_constructor(struct hlsl_ir_constructor *constructor) { free_instr_list(constructor->arguments); @@ -2033,6 +2063,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_DEREF: free_ir_deref(deref_from_node(node)); break; + case HLSL_IR_SWIZZLE: + free_ir_swizzle(swizzle_from_node(node)); + break; case HLSL_IR_CONSTRUCTOR: free_ir_constructor(constructor_from_node(node)); break;

1 0

Aric Stewart : user32: Free the uniscribe data before freeing the linedefs.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: e603ffd19eb33619c0f0ba7d41c21f3de0c0eefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e603ffd19eb33619c0f0ba7d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 17 08:54:09 2012 -0500 user32: Free the uniscribe data before freeing the linedefs. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 278aa38..f5d4e65 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4593,6 +4593,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) if (es->hloc32A) { LocalFree(es->hloc32A); } + EDIT_InvalidateUniscribeData(es); pc = es->first_line_def; while (pc) { @@ -4601,7 +4602,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) pc = pp; } - EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

1 0

Jacek Caban : jscript: Avoid direct access to jsval_t struct.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c0cd0d17aab329125b83951480ea1801857016eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cd0d17aab329125b8395148… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:21:26 2012 +0200 jscript: Avoid direct access to jsval_t struct. --- dlls/jscript/jsutils.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a33cb7e..7df45ea 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -219,15 +219,15 @@ void jsval_release(jsval_t val) { switch(jsval_type(val)) { case JSV_OBJECT: - if(val.u.obj) - IDispatch_Release(val.u.obj); + if(get_object(val)) + IDispatch_Release(get_object(val)); break; case JSV_STRING: - SysFreeString(val.u.str); + SysFreeString(get_string(val)); break; case JSV_VARIANT: - VariantClear(val.u.v); - heap_free(val.u.v); + VariantClear(get_variant(val)); + heap_free(get_variant(val)); break; default: break; @@ -236,17 +236,18 @@ void jsval_release(jsval_t val) HRESULT jsval_variant(jsval_t *val, VARIANT *var) { + VARIANT *v; HRESULT hres; val->type = JSV_VARIANT; - val->u.v = heap_alloc(sizeof(VARIANT)); - if(!val->u.v) + val->u.v = v = heap_alloc(sizeof(VARIANT)); + if(!v) return E_OUTOFMEMORY; - V_VT(val->u.v) = VT_EMPTY; - hres = VariantCopy(val->u.v, var); + V_VT(v) = VT_EMPTY; + hres = VariantCopy(v, var); if(FAILED(hres)) - heap_free(val->u.v); + heap_free(v); return hres; } @@ -338,14 +339,14 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) return S_OK; case JSV_OBJECT: V_VT(retv) = VT_DISPATCH; - if(val.u.obj) - IDispatch_AddRef(val.u.obj); - V_DISPATCH(retv) = val.u.obj; + if(get_object(val)) + IDispatch_AddRef(get_object(val)); + V_DISPATCH(retv) = get_object(val); return S_OK; case JSV_STRING: V_VT(retv) = VT_BSTR; - if(val.u.str) { - V_BSTR(retv) = clone_bstr(val.u.str); + if(get_string(val)) { + V_BSTR(retv) = clone_bstr(get_string(val)); if(!V_BSTR(retv)) return E_OUTOFMEMORY; }else { @@ -367,11 +368,11 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) } case JSV_BOOL: V_VT(retv) = VT_BOOL; - V_BOOL(retv) = val.u.b ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(retv) = get_bool(val) ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; case JSV_VARIANT: V_VT(retv) = VT_EMPTY; - return VariantCopy(retv, val.u.v); + return VariantCopy(retv, get_variant(val)); } assert(0);

1 0

Jacek Caban : jscript: Don't assume that undefined variable is zeroed.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 9e7829828ee32421974507f83091fd26668534f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7829828ee32421974507f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:21:16 2012 +0200 jscript: Don't assume that undefined variable is zeroed. --- dlls/jscript/dispex.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ae369c2..d10c675 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -272,12 +272,13 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p hres = find_prop_name_prot(This, string_hash(name), name, &prop); else hres = find_prop_name(This, string_hash(name), name, &prop); - if(SUCCEEDED(hres) && (!prop || prop->type==PROP_DELETED)) { + if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { TRACE("creating prop %s\n", debugstr_w(name)); if(prop) { prop->type = PROP_JSVAL; prop->flags = create_flags; + prop->u.val = jsval_undefined(); }else { prop = alloc_prop(This, name, PROP_JSVAL, create_flags); if(!prop)

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
83
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 September 2012