September 2012 - Wine-Commits

Alistair Leslie-Hughes : odbccu32: Add new dll.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: cee8a76ecc702340ddf96e527089e4d0dda32f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8a76ecc702340ddf96e527… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 18 10:59:04 2012 +1000 odbccu32: Add new dll. --- configure | 1 + configure.ac | 1 + dlls/odbccu32/Makefile.in | 8 +++++++ dlls/odbccu32/odbccu32.spec | 37 ++++++++++++++++++++++++++++++++++++ dlls/odbccu32/odbccu32_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/odbccu32/version.rc | 27 ++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 87f93f9..21044af 100755 --- a/configure +++ b/configure @@ -15593,6 +15593,7 @@ wine_fn_config_dll objsel enable_objsel wine_fn_config_dll odbc32 enable_odbc32 implib wine_fn_config_dll odbccp32 enable_odbccp32 implib wine_fn_config_test dlls/odbccp32/tests odbccp32_test +wine_fn_config_dll odbccu32 enable_odbccu32 wine_fn_config_dll ole2.dll16 enable_win16 wine_fn_config_dll ole2conv.dll16 enable_win16 wine_fn_config_dll ole2disp.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 8a69570..84b5de8 100644 --- a/configure.ac +++ b/configure.ac @@ -2866,6 +2866,7 @@ WINE_CONFIG_DLL(objsel) WINE_CONFIG_DLL(odbc32,,[implib]) WINE_CONFIG_DLL(odbccp32,,[implib]) WINE_CONFIG_TEST(dlls/odbccp32/tests) +WINE_CONFIG_DLL(odbccu32) WINE_CONFIG_DLL(ole2.dll16,enable_win16) WINE_CONFIG_DLL(ole2conv.dll16,enable_win16) WINE_CONFIG_DLL(ole2disp.dll16,enable_win16) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in new file mode 100644 index 0000000..cc8bf71 --- /dev/null +++ b/dlls/odbccu32/Makefile.in @@ -0,0 +1,8 @@ +MODULE = odbccu32.dll + +C_SRCS = \ + odbccu32_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32.spec b/dlls/odbccu32/odbccu32.spec new file mode 100644 index 0000000..e0dec29 --- /dev/null +++ b/dlls/odbccu32/odbccu32.spec @@ -0,0 +1,37 @@ + 4 stdcall SQLBindCol(long long long ptr long ptr) odbc32.SQLBindCol + 5 stdcall SQLCancel(long) odbc32.SQLCancel + 6 stub ReleaseCLStmtResources + 11 stdcall SQLExecDirect(long str long) odbc32.SQLExecDirect + 12 stdcall SQLExecute(long) odbc32.SQLExecute + 13 stdcall SQLFetch(long) odbc32.SQLFetch + 16 stdcall SQLFreeStmt(long long ) odbc32.SQLFreeStmt + 19 stdcall SQLPrepare(long str long) odbc32.SQLPrepare + 20 stdcall SQLRowCount(long ptr) odbc32.SQLRowCount + 23 stdcall SQLTransact(long long long) odbc32.SQLTransact + 26 stdcall SQLCloseCursor(long) odbc32.SQLCloseCursor + 29 stdcall SQLEndTran(long long long) odbc32.SQLEndTran + 30 stdcall SQLFetchScroll(long long long) odbc32.SQLFetchScroll + 31 stdcall SQLFreeHandle(long long) odbc32.SQLFreeHandle + 33 stdcall SQLGetDescField(long long long ptr long ptr) odbc32.SQLGetDescField + 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) odbc32.SQLGetDescRec + 38 stdcall SQLGetStmtAttr(long long ptr long ptr) odbc32.SQLGetStmtAttr + 39 stdcall SQLSetConnectAttr(long long ptr long) odbc32.SQLSetConnectAttr + 43 stdcall SQLGetData(long long long ptr long ptr) odbc32.SQLGetData + 45 stdcall SQLGetInfo(long long ptr long ptr) odbc32.SQLGetInfo + 46 stdcall SQLGetStmtOption(long long ptr) odbc32.SQLGetStmtOption + 48 stdcall SQLParamData(long ptr) odbc32.SQLParamData + 49 stdcall SQLPutData(long ptr long) odbc32.SQLPutData + 50 stdcall SQLSetConnectOption(long long long) odbc32.SQLSetConnectOption + 51 stdcall SQLSetStmtOption(long long long) odbc32.SQLSetStmtOption + 59 stdcall SQLExtendedFetch(long long long ptr ptr) odbc32.SQLExtendedFetch + 61 stdcall SQLMoreResults(long) odbc32.SQLMoreResults + 62 stdcall SQLNativeSql(long str long str long ptr) odbc32.SQLNativeSql + 63 stdcall SQLNumParams(long ptr) odbc32.SQLNumParams + 64 stdcall SQLParamOptions(long long ptr) odbc32.SQLParamOptions + 68 stdcall SQLSetPos(long long long long) odbc32.SQLSetPos + 69 stdcall SQLSetScrollOptions(long long long long) odbc32.SQLSetScrollOptions + 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) odbc32.SQLBindParameter + 73 stdcall SQLSetDescField(long long long ptr long) odbc32.SQLSetDescField + 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) odbc32.SQLSetDescRec + 76 stdcall SQLSetStmtAttr(long long ptr long) odbc32.SQLSetStmtAttr + 78 stdcall SQLBulkOperations(long long) odbc32.SQLBulkOperations diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c new file mode 100644 index 0000000..09abf2b --- /dev/null +++ b/dlls/odbccu32/odbccu32_main.c @@ -0,0 +1,42 @@ +/* + * ODBC Cursor Library + * + * Copyright 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/odbccu32/version.rc b/dlls/odbccu32/version.rc new file mode 100644 index 0000000..bc1e6f2 --- /dev/null +++ b/dlls/odbccu32/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ODBC Cursor Library" +#define WINE_FILENAME_STR "odbcu32.dll" +#define WINE_FILEVERSION 6,1,7601,17632 +#define WINE_FILEVERSION_STR "6.1.7601.17632" +#define WINE_PRODUCTVERSION 6,1,7601,17632 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17632" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat().
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 19f951e86a253a10bb908bc9c99fc6ab60ca9e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f951e86a253a10bb908bc9c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:09 2012 +0200 d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat(). --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 837a72e..a528e80 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -93,7 +93,7 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, return NULL; } - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A32B32G32R32F, + hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); if (FAILED(hr)) {

1 0

Matteo Bruni : d3dcompiler: Parse "return" statement.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: ae11ba0b2349bd5261b6c4e186233c1a349d2063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae11ba0b2349bd5261b6c4e18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:08 2012 +0200 d3dcompiler: Parse "return" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 +++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++++++++----- dlls/d3dcompiler_43/utils.c | 37 +++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 28e77d3..eb75448 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_JUMP, HLSL_IR_SWIZZLE, }; @@ -837,6 +838,21 @@ struct hlsl_ir_expr struct list *subexpressions; }; +enum hlsl_ir_jump_type +{ + HLSL_IR_JUMP_BREAK, + HLSL_IR_JUMP_CONTINUE, + HLSL_IR_JUMP_DISCARD, + HLSL_IR_JUMP_RETURN, +}; + +struct hlsl_ir_jump +{ + struct hlsl_ir_node node; + enum hlsl_ir_jump_type type; + struct hlsl_ir_node *return_value; +}; + struct hlsl_ir_swizzle { struct hlsl_ir_node node; @@ -1003,6 +1019,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_jump *jump_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_JUMP); + return CONTAINING_RECORD(node, struct hlsl_ir_jump, node); +} + static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_ASSIGNMENT); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 35c9a4c..75b5741 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -497,6 +497,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <list> statement %type <list> statement_list %type <list> compound_statement +%type <list> jump_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter @@ -990,16 +991,32 @@ statement_list: statement } statement: declaration_statement - { - $$ = $1; - } | expr_statement - { - $$ = $1; - } | compound_statement + | jump_statement + + /* FIXME: add rule for return with no value */ +jump_statement: KW_RETURN expr ';' { - $$ = $1; + struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory\n"); + return -1; + } + jump->node.type = HLSL_IR_JUMP; + set_location(&jump->node.loc, &@1); + jump->type = HLSL_IR_JUMP_RETURN; + jump->node.data_type = $2->data_type; + jump->return_value = $2; + + FIXME("Check for valued return on void function.\n"); + FIXME("Implicit conversion to the return type if needed, " + "error out if conversion not possible.\n"); + + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_tail($$, &jump->node.entry); } expr_statement: ';' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c403a98..e0d351c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1742,6 +1742,8 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_FUNCTION_DECL", + "HLSL_IR_JUMP", + "HLSL_IR_SWIZZLE", }; if (type >= sizeof(names) / sizeof(names[0])) @@ -1973,6 +1975,28 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } } +static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) +{ + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + TRACE("break"); + break; + case HLSL_IR_JUMP_CONTINUE: + TRACE("continue"); + break; + case HLSL_IR_JUMP_DISCARD: + TRACE("discard"); + break; + case HLSL_IR_JUMP_RETURN: + TRACE("return "); + if (jump->return_value) + debug_dump_instr(jump->return_value); + TRACE(";"); + break; + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -1995,6 +2019,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTRUCTOR: debug_dump_ir_constructor(constructor_from_node(instr)); break; + case HLSL_IR_JUMP: + debug_dump_ir_jump(jump_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -2132,6 +2159,13 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) d3dcompiler_free(assignment); } +static void free_ir_jump(struct hlsl_ir_jump *jump) +{ + if (jump->type == HLSL_IR_JUMP_RETURN) + free_instr(jump->return_value); + d3dcompiler_free(jump); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -2157,6 +2191,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_ASSIGNMENT: free_ir_assignment(assignment_from_node(node)); break; + case HLSL_IR_JUMP: + free_ir_jump(jump_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Dmitry Timoshkov : gdiplus: Add preliminary support for pixel offset modes.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 4d42626dbe265e700bb72420a1d6a683bfbcf16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d42626dbe265e700bb72420a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 12:04:59 2012 +0900 gdiplus: Add preliminary support for pixel offset modes. --- dlls/gdiplus/graphics.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e986c94..7e16460 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -836,7 +836,7 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, - InterpolationMode interpolation) + InterpolationMode interpolation, PixelOffsetMode offset_mode) { static int fixme; @@ -881,8 +881,25 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT return blend_colors(top, bottom, point->Y - topyf); } case InterpolationModeNearestNeighbor: + { + FLOAT pixel_offset; + switch (offset_mode) + { + default: + case PixelOffsetModeNone: + case PixelOffsetModeHighSpeed: + pixel_offset = 0.5; + break; + + case PixelOffsetModeHalf: + case PixelOffsetModeHighQuality: + pixel_offset = 0.0; + break; + } return sample_bitmap_pixel(src_rect, bits, width, height, - gdip_round(point->X), gdip_round(point->Y), attributes); + floorf(point->X + pixel_offset), floorf(point->Y + pixel_offset), attributes); + } + } } @@ -1176,7 +1193,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( &src_area, fill->bitmap_bits, bitmap->width, bitmap->height, - &point, fill->imageattributes, graphics->interpolation); + &point, fill->imageattributes, graphics->interpolation, + graphics->pixeloffset); } } } @@ -3122,6 +3140,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image LPBYTE src_data, dst_data; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; + PixelOffsetMode offset_mode = graphics->pixeloffset; GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; @@ -3228,7 +3247,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation); + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); else *dst_color = 0; }

1 0

Matteo Bruni : d3dcompiler: Don' t write the shader version tag from the header backend function.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 4ccffd8fa97fab92c795d0de2b3a5ed3fbc0ebec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccffd8fa97fab92c795d0de2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:06 2012 +0200 d3dcompiler: Don't write the shader version tag from the header backend function. --- dlls/d3dcompiler_43/bytecodewriter.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index f24ac9d..d10f6bc 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -744,12 +744,8 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, FALSE); - return; } static HRESULT find_ps_builtin_semantics(struct bc_writer *This, @@ -826,8 +822,6 @@ static void ps_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -847,8 +841,6 @@ static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -1595,14 +1587,10 @@ static void vs_2_header(struct bc_writer *This, return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); - return; } static void vs_2_srcreg(struct bc_writer *This, @@ -1875,8 +1863,6 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_samplers(shader, buffer); write_constF(shader, buffer, TRUE); @@ -2112,16 +2098,12 @@ static const struct bytecode_backend ps_2_x_backend = { }; static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); write_samplers(shader, buffer); - return; } static void sm_3_srcreg(struct bc_writer *This, @@ -2571,6 +2553,9 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR goto error; } + /* Write shader type and version */ + put_dword(buffer, shader->version); + writer->funcs->header(writer, shader, buffer); if(FAILED(writer->state)) { hr = writer->state;

1 0

Matteo Bruni : d3dcompiler: Only a few modifiers are relevant in type comparison.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 47e931823cd227abc2122610734700665b414b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e931823cd227abc21226107… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:07 2012 +0200 d3dcompiler: Only a few modifiers are relevant in type comparison. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/utils.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a191529..28e77d3 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -732,6 +732,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + struct hlsl_ir_var { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f288efc..c403a98 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -921,7 +921,8 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ return FALSE; if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) return FALSE; - if (t1->modifiers != t2->modifiers) + if ((t1->modifiers & HLSL_MODIFIERS_COMPARISON_MASK) + != (t2->modifiers & HLSL_MODIFIERS_COMPARISON_MASK)) return FALSE; if (t1->dimx != t2->dimx) return FALSE;

1 0

Piotr Caban : wininet: Delete file when cache entry is deleted.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 359ed3382442db00c2bf55dc958629d812e3e6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=359ed3382442db00c2bf55dc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:43:23 2012 +0200 wininet: Delete file when cache entry is deleted. --- dlls/wininet/tests/urlcache.c | 5 ----- dlls/wininet/urlcache.c | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 12827e9..4238c60 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -481,7 +481,6 @@ static void test_urlcacheA(void) SetLastError(0xdeadbeef); ret = DeleteFile(filenameA); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); /* Creating two entries with the same URL */ @@ -537,7 +536,6 @@ static void test_urlcacheA(void) { ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); - todo_wine check_file_not_exists(filenameA); todo_wine check_file_not_exists(filenameA1); @@ -595,7 +593,6 @@ static void test_urlcacheA(void) /* By unlocking the already-deleted cache entry, the file associated * with it is deleted.. */ - todo_wine check_file_not_exists(filenameA); /* (just in case, delete file) */ DeleteFileA(filenameA); @@ -692,7 +689,6 @@ static void test_urlcacheA(void) ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); /* When explicitly deleting the cache entry, the file is also deleted */ - todo_wine check_file_not_exists(filenameA); } /* Test once again, setting the exempt delta via SetUrlCacheEntryInfo */ @@ -760,7 +756,6 @@ static void test_urlcacheA(void) { ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); - todo_wine check_file_not_exists(filenameA); } } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0536093..1b62fda 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2175,11 +2175,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return TRUE; } -static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, - struct _HASH_ENTRY *pHashEntry) +static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, + LPURLCACHE_HEADER pHeader, struct _HASH_ENTRY *pHashEntry) { CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; + WCHAR path[MAX_PATH]; + LONG path_size = sizeof(path); pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); if (pEntry->dwSignature != URL_SIGNATURE) @@ -2220,8 +2222,13 @@ static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, pHeader->CacheUsage.QuadPart = 0; } - URLCache_DeleteEntry(pHeader, pEntry); + if (pUrlEntry->dwOffsetLocalName && URLCache_LocalFileNameToPathW(pContainer, pHeader, + (LPCSTR)pUrlEntry+pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, path, &path_size)) + { + DeleteFileW(path); + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); return TRUE; } @@ -2297,7 +2304,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( { URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); if (pUrlEntry->CacheEntryType & PENDING_DELETE_CACHE_ENTRY) - DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3241,7 +3248,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) return FALSE; } - ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + ret = DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -3301,7 +3308,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - ret = DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + ret = DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); heap_free(urlA);

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.LastBootUptime.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 22454d6341b1937a09dacb4ae8e6ded84f5cc9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=22454d6341b1937a09dacb4ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 18 13:12:20 2012 +0200 wbemprox: Implement Win32_OperatingSystem.LastBootUptime. --- dlls/wbemprox/builtin.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4b6ff38..54de2bb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_lastbootuptimeW[] = + {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -231,6 +233,7 @@ static const struct column col_os[] = { { prop_captionW, CIM_STRING }, { prop_csdversionW, CIM_STRING }, + { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -373,6 +376,7 @@ struct record_operatingsystem { const WCHAR *caption; const WCHAR *csdversion; + const WCHAR *lastbootuptime; const WCHAR *osarchitecture; UINT32 oslanguage; const WCHAR *systemdirectory; @@ -831,6 +835,28 @@ static void fill_processor( struct table *table ) table->num_rows = count; } +static WCHAR *get_lastbootuptime(void) +{ + static const WCHAR fmtW[] = + {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', + '.','%','0','6','u','+','0','0','0',0}; + SYSTEMTIME st; + FILETIME ft; + ULARGE_INTEGER ticks; + WCHAR *ret; + + if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + GetSystemTime( &st ); + SystemTimeToFileTime( &st, &ft ); + ticks.u.LowPart = ft.dwLowDateTime; + ticks.u.HighPart = ft.dwHighDateTime; + ticks.QuadPart -= GetTickCount64() * 10000; + ft.dwLowDateTime = ticks.u.LowPart; + ft.dwHighDateTime = ticks.u.HighPart; + FileTimeToSystemTime( &ft, &st ); + sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000 ); + return ret; +} static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info; @@ -859,6 +885,7 @@ static void fill_os( struct table *table ) rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; rec->csdversion = os_csdversionW; + rec->lastbootuptime = get_lastbootuptime(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); rec->systemdirectory = get_systemdirectory();

1 0

Erich Hoover : ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 83b02573cc498176c222dd877aabb53597846335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b02573cc498176c222dd877… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Sep 17 14:17:40 2012 -0600 ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx. --- dlls/ddraw/main.c | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 61e8ec9..e98b533 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -46,6 +46,22 @@ static HINSTANCE instance; /* value of ForceRefreshRate */ DWORD force_refresh_rate = 0; +/* Structure for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +struct callback_info +{ + LPDDENUMCALLBACKA callback; + void *context; +}; + +/* Enumeration callback for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *driver_name, + void *context, HMONITOR monitor) +{ + const struct callback_info *info = context; + + return info->callback(guid, description, driver_name, info->context); +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -336,27 +352,15 @@ DirectDrawCreateEx(GUID *guid, * * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) +HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) { - TRACE("callback %p, context %p.\n", Callback, Context); - - TRACE(" Enumerating default DirectDraw HAL interface\n"); - /* We only have one driver */ - __TRY - { - static CHAR driver_desc[] = "DirectDraw HAL", - driver_name[] = "display"; + struct callback_info info; - Callback(NULL, driver_desc, driver_name, Context); - } - __EXCEPT_PAGE_FAULT - { - return DDERR_INVALIDPARAMS; - } - __ENDTRY + TRACE("callback %p, context %p.\n", callback, context); - TRACE(" End of enumeration\n"); - return DD_OK; + info.callback = callback; + info.context = context; + return DirectDrawEnumerateExA(enum_callback, &info, 0x0); } /*********************************************************************** @@ -368,17 +372,17 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) * The Flag member is not supported right now. * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Context, DWORD Flags) +HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { - TRACE("callback %p, context %p, flags %#x.\n", Callback, Context, Flags); + TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); - if (Flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | + if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | DDENUM_DETACHEDSECONDARYDEVICES | DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (Flags) - FIXME("flags 0x%08x not handled\n", Flags); + if (flags) + FIXME("flags 0x%08x not handled\n", flags); TRACE("Enumerating default DirectDraw HAL interface\n"); @@ -389,7 +393,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Contex driver_name[] = "display"; /* QuickTime expects the description "DirectDraw HAL" */ - Callback(NULL, driver_desc, driver_name, Context, 0); + callback(NULL, driver_desc, driver_name, context, 0); } __EXCEPT_PAGE_FAULT {

1 0

Jacek Caban : vbscript: Return error for unsupported flags in ScriptDisp:: InvokeEx.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: b6515030c88ca67c4b73ad0d94a79fe9eb0637eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6515030c88ca67c4b73ad0d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:26:30 2012 +0200 vbscript: Return error for unsupported flags in ScriptDisp::InvokeEx. --- dlls/vbscript/vbdisp.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a003bf1..4721753 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -783,10 +783,17 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes); } - - IActiveScriptSite_OnEnterScript(This->ctx->site); - hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); - IActiveScriptSite_OnLeaveScript(This->ctx->site); + switch(wFlags) { + case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + IActiveScriptSite_OnEnterScript(This->ctx->site); + hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); + IActiveScriptSite_OnLeaveScript(This->ctx->site); + break; + default: + FIXME("Unsupported flags %x\n", wFlags); + hres = E_NOTIMPL; + } return hres; }

1 0