September 2012 - Wine-Commits

Bruno Jesus : tapi32: Add stub lineInitializeExW.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

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

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetViewports().
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

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 : wined3d: Recognize GeForce 9300 properly.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 10cdc265428309426092945476ac41bcaf0aed92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cdc26542830942609294547… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 17 18:53:33 2012 -0300 wined3d: Recognize GeForce 9300 properly. --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 39083eb..36aafee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1075,6 +1075,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", DRIVER_NVIDIA_GEFORCE6, 320 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTX, "NVIDIA GeForce 8800 GTX", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", DRIVER_NVIDIA_GEFORCE6, 256 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9300, "NVIDIA GeForce 9300", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, @@ -1553,7 +1554,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"9500", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ {"9400M", CARD_NVIDIA_GEFORCE_9400M}, /* Geforce 9 - lowend */ {"9400", CARD_NVIDIA_GEFORCE_9400GT}, /* Geforce 9 - lowend */ - {"9300", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ + {"9300", CARD_NVIDIA_GEFORCE_9300}, /* Geforce 9 - lowend low */ {"9200", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ {"9100", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ {"G 100", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8ce9db9..5ea23b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1373,6 +1373,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_NVIDIA_GEFORCE_8800GTX = 0x0191, CARD_NVIDIA_GEFORCE_9200 = 0x086d, + CARD_NVIDIA_GEFORCE_9300 = 0x086c, CARD_NVIDIA_GEFORCE_9400M = 0x0863, CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640,

1 0

Dmitry Timoshkov : windowscodecs: Store GIF frame extensions in a dedicated Extensions structure.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

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

Matteo Bruni : d3dcompiler: Postincrement/decrement expressions are const.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

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 Sept. 17, 2012

Sept. 17, 2012

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_string implementation.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

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: Store regexp last_index value as jsval.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

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

Jacek Caban : jscript: Get rid of no longer needed VARIANT helpers.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 5fecc71d34e583aa216f3e8eeb1b05fe123bed35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fecc71d34e583aa216f3e8ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:44 2012 +0200 jscript: Get rid of no longer needed VARIANT helpers. --- dlls/jscript/jscript.h | 33 --------------------------------- dlls/jscript/jsutils.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bbac902..bc67426 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -387,16 +387,6 @@ static inline BOOL is_vclass(vdisp_t *vdisp, jsclass_t class) return is_jsdisp(vdisp) && is_class(vdisp->u.jsdisp, class); } -static inline BOOL is_num_vt(enum VARENUM vt) -{ - return vt == VT_I4 || vt == VT_R8; -} - -static inline DOUBLE num_val(const VARIANT *v) -{ - return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); -} - #ifndef INT32_MIN #define INT32_MIN (-2147483647-1) #endif @@ -410,29 +400,6 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } -static inline void num_set_int(VARIANT *v, INT i) -{ - V_VT(v) = VT_I4; - V_I4(v) = i; -} - -static inline void num_set_val(VARIANT *v, DOUBLE d) -{ - if(is_int32(d)) { - V_VT(v) = VT_I4; - V_I4(v) = d; - }else { - V_VT(v) = VT_R8; - V_R8(v) = d; - } -} - -static inline void var_set_jsdisp(VARIANT *v, jsdisp_t *jsdisp) -{ - V_VT(v) = VT_DISPATCH; - V_DISPATCH(v) = to_disp(jsdisp); -} - static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) { return (ctx->version << 28) | flags; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 1801f86..540d814 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -352,9 +352,19 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) V_BSTR(retv) = NULL; } return S_OK; - case JSV_NUMBER: - num_set_val(retv, val.u.n); + case JSV_NUMBER: { + double n = get_number(val); + + if(is_int32(n)) { + V_VT(retv) = VT_I4; + V_I4(retv) = n; + }else { + V_VT(retv) = VT_R8; + V_R8(retv) = n; + } + return S_OK; + } case JSV_BOOL: V_VT(retv) = VT_BOOL; V_BOOL(retv) = val.u.b ? VARIANT_TRUE : VARIANT_FALSE;

1 0

Jacek Caban : jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 29f4194d741b7df724e8efed8f3f7988f6481fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f4194d741b7df724e8efed8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:14 2012 +0200 jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop. --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 2 +- dlls/jscript/object.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2da9661..ae369c2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1415,7 +1415,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } -HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) +HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, BOOL *ret) { dispex_prop_t *prop; HRESULT hres; @@ -1424,6 +1424,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) if(FAILED(hres)) return hres; - *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE; + *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3562db6..8a80192 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -220,7 +220,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HID HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 540d814..0b22a14 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -452,7 +452,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret) switch(val.type) { case JSV_UNDEFINED: case JSV_NULL: - *ret = VARIANT_FALSE; + *ret = FALSE; return S_OK; case JSV_OBJECT: *ret = get_object(val) != NULL; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 99daf46..ae5c03a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -123,7 +123,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { - VARIANT_BOOL result; + BOOL result; hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name, &result); if(FAILED(hres))

1 0