September 2012 - Wine-commits

Christian Costa : dmusic: Display new ref in AddRef and Release methods.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: d46f8e316a136d9667672b8668a075255cc2d6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46f8e316a136d9667672b866… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Sep 17 22:32:06 2012 +0200 dmusic: Display new ref in AddRef and Release methods. --- dlls/dmusic/port.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2530fb9..0626518 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -67,30 +67,29 @@ static HRESULT WINAPI IDirectMusicPortImpl_QueryInterface(LPDIRECTMUSICPORT ifac static ULONG WINAPI IDirectMusicPortImpl_AddRef(LPDIRECTMUSICPORT iface) { - IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicPortImpl_Release(LPDIRECTMUSICPORT iface) { - IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicPortImpl *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicPortImpl IDirectMusicPort part: */

1 0

Alexandre Julliard : user32/tests: Fix coordinates in the UpdateLayeredWindow broken case.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 8e87b9233aa8de045e0d0b568f749d4da6fa5bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e87b9233aa8de045e0d0b568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 10:27:09 2012 +0200 user32/tests: Fix coordinates in the UpdateLayeredWindow broken case. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3208751..2e4ad7d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13935,7 +13935,7 @@ static void test_layered_window(void) "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); GetClientRect( hwnd, &rect ); ok( (rect.right == 250 && rect.bottom == 300) || - broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + broken(rect.right == client.right - 50 && rect.bottom == client.bottom), "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); DestroyWindow( hwnd );

1 0

Dmitry Timoshkov : windowscodecs: Store GIF frame extensions in a dedicated Extensions structure.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 629e7f44cbc9e7987c82b2321ea48b81e7e53852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629e7f44cbc9e7987c82b2321… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:56:34 2012 +0900 windowscodecs: Store GIF frame extensions in a dedicated Extensions structure. --- dlls/windowscodecs/gifformat.c | 12 ++++++------ dlls/windowscodecs/ungif.c | 30 +++++++++++++++--------------- dlls/windowscodecs/ungif.h | 24 ++++++++++++++---------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 06047e7..05bf2db 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -699,8 +699,8 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, } /* look for the transparent color extension */ - for (i = 0; i < This->frame->ExtensionBlockCount; ++i) { - eb = This->frame->ExtensionBlocks + i; + for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; ++i) { + eb = This->frame->Extensions.ExtensionBlocks + i; if (eb->Function == 0xF9 && eb->ByteCount == 4) { if ((eb->Bytes[0] & 1) == 1) { trans = (unsigned char)eb->Bytes[3]; @@ -854,11 +854,11 @@ static const void *get_GCE_data(GifFrameDecode *This) { int i; - for (i = 0; i < This->frame->ExtensionBlockCount; i++) + for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) { - if (This->frame->ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && - This->frame->ExtensionBlocks[i].ByteCount == 4) - return This->frame->ExtensionBlocks[i].Bytes; + if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && + This->frame->Extensions.ExtensionBlocks[i].ByteCount == 4) + return This->frame->Extensions.ExtensionBlocks[i].Bytes; } return NULL; } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 0efe065..97038d9 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -191,7 +191,7 @@ FreeMapObject(ColorMapObject * Object) { } static int -AddExtensionBlock(SavedImage * New, +AddExtensionBlock(Extensions *New, int Len, const unsigned char ExtData[]) { @@ -223,18 +223,18 @@ AddExtensionBlock(SavedImage * New, } static void -FreeExtension(SavedImage * Image) +FreeExtension(Extensions *Extensions) { ExtensionBlock *ep; - if ((Image == NULL) || (Image->ExtensionBlocks == NULL)) { + if ((Extensions == NULL) || (Extensions->ExtensionBlocks == NULL)) { return; } - for (ep = Image->ExtensionBlocks; - ep < (Image->ExtensionBlocks + Image->ExtensionBlockCount); ep++) + for (ep = Extensions->ExtensionBlocks; + ep < (Extensions->ExtensionBlocks + Extensions->ExtensionBlockCount); ep++) ungif_free(ep->Bytes); - ungif_free(Image->ExtensionBlocks); - Image->ExtensionBlocks = NULL; + ungif_free(Extensions->ExtensionBlocks); + Extensions->ExtensionBlocks = NULL; } /****************************************************************************** @@ -258,8 +258,8 @@ FreeSavedImages(GifFileType * GifFile) { ungif_free(sp->RasterBits); - if (sp->ExtensionBlocks) - FreeExtension(sp); + if (sp->Extensions.ExtensionBlocks) + FreeExtension(&sp->Extensions); } ungif_free(GifFile->SavedImages); GifFile->SavedImages=NULL; @@ -424,8 +424,8 @@ DGifGetImageDesc(GifFileType * GifFile) { sp->ImageDesc.ColorMap->SortFlag = GifFile->Image.ColorMap->SortFlag; } sp->RasterBits = NULL; - sp->ExtensionBlockCount = 0; - sp->ExtensionBlocks = NULL; + sp->Extensions.ExtensionBlockCount = 0; + sp->Extensions.ExtensionBlocks = NULL; GifFile->ImageCount++; @@ -845,7 +845,7 @@ DGifSlurp(GifFileType * GifFile) { GifRecordType RecordType; SavedImage *sp; GifByteType *ExtData; - SavedImage temp_save; + Extensions temp_save; temp_save.ExtensionBlocks = NULL; temp_save.ExtensionBlockCount = 0; @@ -870,8 +870,8 @@ DGifSlurp(GifFileType * GifFile) { GIF_ERROR) return (GIF_ERROR); if (temp_save.ExtensionBlocks) { - sp->ExtensionBlocks = temp_save.ExtensionBlocks; - sp->ExtensionBlockCount = temp_save.ExtensionBlockCount; + sp->Extensions.ExtensionBlocks = temp_save.ExtensionBlocks; + sp->Extensions.ExtensionBlockCount = temp_save.ExtensionBlockCount; temp_save.ExtensionBlocks = NULL; temp_save.ExtensionBlockCount = 0; @@ -879,7 +879,7 @@ DGifSlurp(GifFileType * GifFile) { /* FIXME: The following is wrong. It is left in only for * backwards compatibility. Someday it should go away. Use * the sp->ExtensionBlocks->Function variable instead. */ - sp->Function = sp->ExtensionBlocks[0].Function; + sp->Extensions.Function = sp->Extensions.ExtensionBlocks[0].Function; } break; diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index 5e377d2..6c9f418 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -98,6 +98,19 @@ typedef struct GifImageDesc { ColorMapObject *ColorMap; /* The local color map */ } GifImageDesc; +/* This is the in-core version of an extension record */ +typedef struct { + int Function; /* Holds the type of the Extension block. */ + int ByteCount; + char *Bytes; +} ExtensionBlock; + +typedef struct { + int Function; /* DEPRECATED: Use ExtensionBlocks[x].Function instead */ + int ExtensionBlockCount; + ExtensionBlock *ExtensionBlocks; +} Extensions; + typedef struct GifFileType { GifWord SWidth, SHeight, /* Screen dimensions. */ SColorResolution, /* How many colors can we generate? */ @@ -152,20 +165,11 @@ int DGifCloseFile(GifFileType * GifFile) DECLSPEC_HIDDEN; * Support for the in-core structures allocation (slurp mode). *****************************************************************************/ -/* This is the in-core version of an extension record */ -typedef struct { - int ByteCount; - char *Bytes; - int Function; /* Holds the type of the Extension block. */ -} ExtensionBlock; - /* This holds an image header, its unpacked raster bits, and extensions */ typedef struct SavedImage { GifImageDesc ImageDesc; unsigned char *RasterBits; - int Function; /* DEPRECATED: Use ExtensionBlocks[x].Function instead */ - int ExtensionBlockCount; - ExtensionBlock *ExtensionBlocks; + Extensions Extensions; } SavedImage; #endif /* _UNGIF_H_ */

1 0

Dmitry Timoshkov : windowscodecs: Create global metadata blocks in the GIF decoder.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 88faba8e1a1b1e38a320765c6b32bb08d8094f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88faba8e1a1b1e38a320765c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:57:19 2012 +0900 windowscodecs: Create global metadata blocks in the GIF decoder. --- dlls/windowscodecs/ungif.c | 15 +++++++++++++-- dlls/windowscodecs/ungif.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 97038d9..66310cb 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -884,13 +884,21 @@ DGifSlurp(GifFileType * GifFile) { break; case EXTENSION_RECORD_TYPE: - if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == + { + Extensions *Extensions; + + if (GifFile->ImageCount) + Extensions = &temp_save; + else + Extensions = &GifFile->Extensions; + + if (DGifGetExtension(GifFile, &Extensions->Function, &ExtData) == GIF_ERROR) return (GIF_ERROR); while (ExtData != NULL) { /* Create an extension block with our data */ - if (AddExtensionBlock(&temp_save, ExtData[0], &ExtData[1]) + if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) return (GIF_ERROR); @@ -899,6 +907,7 @@ DGifSlurp(GifFileType * GifFile) { temp_save.Function = 0; } break; + } case TERMINATE_RECORD_TYPE: break; @@ -1003,6 +1012,8 @@ DGifCloseFile(GifFileType * GifFile) { GifFile->SavedImages = NULL; } + FreeExtension(&GifFile->Extensions); + ungif_free(GifFile); return GIF_OK; diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index 6c9f418..6caa600 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -117,6 +117,7 @@ typedef struct GifFileType { SBackGroundColor, /* I hope you understand this one... */ SAspectRatio; /* Pixel aspect ratio, in 1/64 units, starting at 1:4. */ ColorMapObject *SColorMap; /* NULL if not exists. */ + Extensions Extensions; int ImageCount; /* Number of current image */ GifImageDesc Image; /* Block describing current image */ struct SavedImage *SavedImages; /* Use this to accumulate file state */

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: 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

Jacek Caban : jscript: Always use jsval-based to_uint32 implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 2fc71ab6d52178ff173514415af427fc4548dbb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc71ab6d52178ff173514415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:41 2012 +0200 jscript: Always use jsval-based to_uint32 implementation. --- dlls/jscript/array.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 3 +-- dlls/jscript/jsutils.c | 28 +--------------------------- dlls/jscript/string.c | 2 +- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4eeca39..653bd9b 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -79,7 +79,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd if(FAILED(hres)) return hres; - hres = to_uint32_jsval(ctx, val, ei, ret); + hres = to_uint32(ctx, val, ei, ret); jsval_release(val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index da0aba6..61869cc 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -160,7 +160,7 @@ static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) static inline HRESULT stack_pop_uint(exec_ctx_t *ctx, DWORD *r) { - return to_uint32_jsval(ctx->script, stack_pop(ctx), ctx->ei, r); + return to_uint32(ctx->script, stack_pop(ctx), ctx->ei, r); } static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index b3a616d..e45ba7a 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -347,7 +347,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t if(FAILED(hres)) return hres; - hres = to_uint32_jsval(ctx, val, ei, &length); + hres = to_uint32(ctx, val, ei, &length); jsval_release(val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8cfc14e..c8ccb0b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -259,8 +259,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,jsexcept_t*,INT*) DECLSPEC_HIDDEN; -HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; -HRESULT to_uint32_jsval(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; +HRESULT to_uint32(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_string_jsval(script_ctx_t*,jsval_t,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c0007fc..e14c352 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -645,23 +645,12 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, jsexcept_t *ei, INT *ret) } /* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) +HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, DWORD *ret) { - jsval_t val; double n; HRESULT hres; - if(V_VT(v) == VT_I4) { - *ret = V_I4(v); - return S_OK; - } - - hres = variant_to_jsval(v, &val); - if(FAILED(hres)) - return hres; - hres = to_number(ctx, val, ei, &n); - jsval_release(val); if(FAILED(hres)) return hres; @@ -669,21 +658,6 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) return S_OK; } -/* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32_jsval(script_ctx_t *ctx, jsval_t v, jsexcept_t *ei, DWORD *ret) -{ - VARIANT var; - HRESULT hres; - - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, &var, ei, ret); - VariantClear(&var); - return hres; -} - static BSTR int_to_bstr(int i) { WCHAR buf[12], *p; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 1549ca1..76f9c41 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1531,7 +1531,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR return E_OUTOFMEMORY; for(i=0; i<argc; i++) { - hres = to_uint32_jsval(ctx, argv[i], ei, &code); + hres = to_uint32(ctx, argv[i], ei, &code); if(FAILED(hres)) { SysFreeString(ret); return hres;

1 0

Jacek Caban : jscript: Always use jsval-based to_string implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: acfd2b98c38894f04f902cd4cc73a2501e31072f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfd2b98c38894f04f902cd4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:59 2012 +0200 jscript: Always use jsval-based to_string implementation. --- dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 8 +++--- dlls/jscript/date.c | 2 +- dlls/jscript/engine.c | 12 +++++----- dlls/jscript/error.c | 8 +++--- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 16 ++++++------ dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 55 ++++++++++++++-------------------------------- dlls/jscript/number.c | 20 +++------------- dlls/jscript/object.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/jscript/string.c | 40 ++++++++++++---------------------- 13 files changed, 63 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acfd2b98c38894f04f902…

1 0

Jacek Caban : jscript: Always use jsval-based to_object implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 228aab23be7bd3b23cb362dd186eebce87171532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=228aab23be7bd3b23cb362dd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:19 2012 +0200 jscript: Always use jsval-based to_object implementation. --- dlls/jscript/engine.c | 8 +++--- dlls/jscript/function.c | 4 +- dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 64 +++++++++++++++++++---------------------------- dlls/jscript/object.c | 2 +- 5 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9cdc2fb..1a06b19 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -148,7 +148,7 @@ static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) return S_OK; } - hres = to_object_jsval(ctx->script, v, r); + hres = to_object(ctx->script, v, r); jsval_release(v); return hres; } @@ -627,7 +627,7 @@ static HRESULT interp_push_scope(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_object_jsval(ctx->script, v, &disp); + hres = to_object(ctx->script, v, &disp); jsval_release(v); if(FAILED(hres)) return hres; @@ -878,7 +878,7 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) namev = stack_pop(ctx); objv = stack_pop(ctx); - hres = to_object_jsval(ctx->script, objv, &obj); + hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(SUCCEEDED(hres)) { hres = to_string(ctx->script, namev, ctx->ei, &name); @@ -1578,7 +1578,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) namev = stack_pop(ctx); objv = stack_pop(ctx); - hres = to_object_jsval(ctx->script, objv, &obj); + hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(FAILED(hres)) { jsval_release(namev); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 401aae2..041f104 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -389,7 +389,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0])) { - hres = to_object_jsval(ctx, argv[0], &this_obj); + hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; } @@ -442,7 +442,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0])) { - hres = to_object_jsval(ctx, argv[0], &this_obj); + hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4a40bc6..bbac902 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -261,8 +261,7 @@ HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,jsexcept_t*,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; -HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; -HRESULT to_object_jsval(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; +HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index e89b8ae..1801f86 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -760,31 +760,30 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, BSTR *str) } /* ECMA-262 3rd Edition 9.9 */ -HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) +HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) { jsdisp_t *dispex; HRESULT hres; - switch(V_VT(v)) { - case VT_BSTR: - hres = create_string(ctx, V_BSTR(v), SysStringLen(V_BSTR(v)), &dispex); + switch(val.type) { + case JSV_STRING: + hres = create_string(ctx, get_string(val), SysStringLen(get_string(val)), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_I4: - case VT_R8: - hres = create_number(ctx, num_val(v), &dispex); + case JSV_NUMBER: + hres = create_number(ctx, get_number(val), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_DISPATCH: - if(V_DISPATCH(v)) { - IDispatch_AddRef(V_DISPATCH(v)); - *disp = V_DISPATCH(v); + case JSV_OBJECT: + if(get_object(val)) { + *disp = get_object(val); + IDispatch_AddRef(*disp); }else { jsdisp_t *obj; @@ -795,47 +794,36 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = to_disp(obj); } break; - case VT_BOOL: - hres = create_bool(ctx, V_BOOL(v), &dispex); + case JSV_BOOL: + hres = create_bool(ctx, get_bool(val), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_ARRAY|VT_VARIANT: - hres = create_vbarray(ctx, V_ARRAY(v), &dispex); - if(FAILED(hres)) - return hres; + case JSV_VARIANT: + switch(V_VT(get_variant(val))) { + case VT_ARRAY|VT_VARIANT: + hres = create_vbarray(ctx, V_ARRAY(get_variant(val)), &dispex); + if(FAILED(hres)) + return hres; - *disp = to_disp(dispex); + *disp = to_disp(dispex); + break; + + default: + FIXME("Unsupported %s\n", debugstr_variant(get_variant(val))); + return E_NOTIMPL; + } break; default: - FIXME("unsupported vt %d\n", V_VT(v)); + FIXME("unsupported %s\n", debugstr_jsval(val)); return E_NOTIMPL; } return S_OK; } -/* ECMA-262 3rd Edition 9.9 */ -HRESULT to_object_jsval(script_ctx_t *ctx, jsval_t v, IDispatch **disp) -{ - VARIANT var; - HRESULT hres; - - if(is_object_instance(v)) { - *disp = get_object(v); - IDispatch_AddRef(*disp); - return S_OK; - } - - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - return to_object(ctx, &var, disp); -} - HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTYPE vt) { jsexcept_t ei; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index b88cf84..99daf46 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -228,7 +228,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { IDispatch *disp; - hres = to_object_jsval(ctx, argv[0], &disp); + hres = to_object(ctx, argv[0], &disp); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Store regexp last_index value as jsval.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: a3f7f0f7defd8e5dffa5773a509905702980dd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f7f0f7defd8e5dffa5773a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:30 2012 +0200 jscript: Store regexp last_index value as jsval. --- dlls/jscript/regexp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 3e0f986..d09b203 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -84,7 +84,7 @@ typedef struct { JSRegExp *jsregexp; BSTR str; INT last_index; - VARIANT last_index_var; + jsval_t last_index_val; } RegExpInstance; static const WCHAR sourceW[] = {'s','o','u','r','c','e',0}; @@ -3308,8 +3308,8 @@ static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp) static void set_last_index(RegExpInstance *This, DWORD last_index) { This->last_index = last_index; - VariantClear(&This->last_index_var); - num_set_val(&This->last_index_var, last_index); + jsval_release(This->last_index_val); + This->last_index_val = jsval_number(last_index); } static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, @@ -3542,13 +3542,13 @@ static HRESULT RegExp_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, case DISPATCH_PROPERTYGET: { RegExpInstance *regexp = regexp_from_vdisp(jsthis); - return variant_to_jsval(&regexp->last_index_var, r); + return jsval_copy(regexp->last_index_val, r); } case DISPATCH_PROPERTYPUT: { RegExpInstance *regexp = regexp_from_vdisp(jsthis); HRESULT hres; - hres = jsval_to_variant(argv[0], &regexp->last_index_var); + hres = jsval_copy(argv[0], &regexp->last_index_val); if(FAILED(hres)) return hres; @@ -3765,7 +3765,7 @@ static void RegExp_destructor(jsdisp_t *dispex) if(This->jsregexp) js_DestroyRegExp(This->jsregexp); - VariantClear(&This->last_index_var); + jsval_release(This->last_index_val); SysFreeString(This->str); heap_free(This); } @@ -3857,7 +3857,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - num_set_int(&regexp->last_index_var, 0); + regexp->last_index_val = jsval_number(0); *ret = &regexp->dispex; return S_OK;

1 0