June 2012 - Wine-Commits - list.winehq.org

Michael Stefaniuc : msctf: Remove a stray backslash at the end of a line.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 07d8619979573d420e4302b96cca4c026547c619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d8619979573d420e4302b96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 7 01:00:28 2012 +0200 msctf: Remove a stray backslash at the end of a line. --- dlls/msctf/documentmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index a1c9c93..4e21624 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -72,7 +72,7 @@ static inline DocumentMgr *impl_from_ITfSource(ITfSource *iface) return CONTAINING_RECORD(iface, DocumentMgr, ITfSource_iface); } -static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface)\ +static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface) { return CONTAINING_RECORD(iface, EnumTfContext, IEnumTfContexts_iface); }

1 0

Michael Stefaniuc : comctl32/tests: Remove stray backslashes at end of lines.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: fe947be7e7a0da281fcac89303a22442b140f1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe947be7e7a0da281fcac8930… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 7 00:58:11 2012 +0200 comctl32/tests: Remove stray backslashes at end of lines. --- dlls/comctl32/tests/tab.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 0166778..a2937ef 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -47,15 +47,11 @@ static void CheckSize(HWND hwnd, INT width, INT height, const char *msg, int lin SendMessage(hwnd, TCM_GETITEMRECT, 0, (LPARAM)&r); if (width >= 0 && height < 0) - { - ok_(__FILE__,line) (width == r.right - r.left, "%s: Expected width [%d] got [%d]\n",\ - msg, width, r.right - r.left); - } + ok_(__FILE__,line) (width == r.right - r.left, "%s: Expected width [%d] got [%d]\n", + msg, width, r.right - r.left); else if (height >= 0 && width < 0) - { - ok_(__FILE__,line) (height == r.bottom - r.top, "%s: Expected height [%d] got [%d]\n",\ - msg, height, r.bottom - r.top); - } + ok_(__FILE__,line) (height == r.bottom - r.top, "%s: Expected height [%d] got [%d]\n", + msg, height, r.bottom - r.top); else ok_(__FILE__,line) ((width == r.right - r.left) && (height == r.bottom - r.top ), "%s: Expected [%d,%d] got [%d,%d]\n", msg, width, height,

1 0

Michael Stefaniuc : d3drm/tests: Remove stray backslashes at end of lines.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 8e4d76bf2c26aec2389d5d45d7545388262887aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4d76bf2c26aec2389d5d45d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 7 00:57:09 2012 +0200 d3drm/tests: Remove stray backslashes at end of lines. --- dlls/d3drm/tests/d3drm.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f351b02..5f635e2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -603,7 +603,8 @@ static void test_Frame(void) hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); /* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */ - ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); \ + ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), + "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); if (pArray) { count = IDirect3DRMFrameArray_GetSize(pArray); @@ -611,9 +612,11 @@ static void test_Frame(void) hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); - ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3), "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC)); \ + ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3), + "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC)); IDirect3DRMFrame_Release(pFrameTmp); - ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); \ + ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), + "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); IDirect3DRMFrameArray_Release(pArray); CHECK_REFCOUNT(pFrameC, 2); }

1 0

Matteo Bruni : d3dcompiler: Parse modifiers.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 3275cca97025126c7102e632d8f829b1036b8e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3275cca97025126c7102e632d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:03 2012 +0200 d3dcompiler: Parse modifiers. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 +++++ dlls/d3dcompiler_43/hlsl.y | 91 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 37 ++++++++++++ 3 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 74d2662..77d81fe 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -694,6 +694,20 @@ struct hlsl_ir_node unsigned int column; }; +#define HLSL_STORAGE_EXTERN 0x00000001 +#define HLSL_STORAGE_NOINTERPOLATION 0x00000002 +#define HLSL_MODIFIER_PRECISE 0x00000004 +#define HLSL_STORAGE_SHARED 0x00000008 +#define HLSL_STORAGE_GROUPSHARED 0x00000010 +#define HLSL_STORAGE_STATIC 0x00000020 +#define HLSL_STORAGE_UNIFORM 0x00000040 +#define HLSL_STORAGE_VOLATILE 0x00000080 +#define HLSL_MODIFIER_CONST 0x00000100 +#define HLSL_MODIFIER_ROW_MAJOR 0x00000200 +#define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 +#define HLSL_MODIFIER_IN 0x00000800 +#define HLSL_MODIFIER_OUT 0x00001000 + struct hlsl_ir_var { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e5a2a48..704d5d6 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -50,6 +50,8 @@ static void hlsl_error(const char *s) static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no) { TRACE("Line %u: ", line_no); + if (modifiers) + TRACE("%s ", debug_modifiers(modifiers)); TRACE("%s %s;\n", debug_hlsl_type(type), declname); } @@ -58,6 +60,25 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) BOOL ret; TRACE("Declaring variable %s.\n", decl->name); + if (decl->node.data_type->type == HLSL_CLASS_MATRIX) + { + if (!(decl->modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR))) + { + decl->modifiers |= hlsl_ctx.matrix_majority == HLSL_ROW_MAJOR + ? HLSL_MODIFIER_ROW_MAJOR : HLSL_MODIFIER_COLUMN_MAJOR; + } + } + if (local) + { + DWORD invalid = decl->modifiers & (HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED + | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); + if (invalid) + { + hlsl_message("Line %u: modifier '%s' invalid for local variables.\n", + hlsl_ctx.line_no, debug_modifiers(invalid)); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + } ret = add_declaration(hlsl_ctx.cur_scope, decl, local); if (ret == FALSE) { @@ -71,6 +92,26 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) return TRUE; } +static DWORD add_modifier(DWORD modifiers, DWORD mod) +{ + if (modifiers & mod) + { + hlsl_message("Line %u: modifier '%s' already specified.\n", + hlsl_ctx.line_no, debug_modifiers(mod)); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return modifiers; + } + if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + { + hlsl_message("Line %u: more than one matrix majority keyword.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return modifiers; + } + return modifiers | mod; +} + %} %error-verbose @@ -298,6 +339,12 @@ declaration: var_modifiers type variables_def ';' FIXME("Variable with an initializer.\n"); } + if (hlsl_ctx.cur_scope == hlsl_ctx.globals) + { + var->modifiers |= HLSL_STORAGE_UNIFORM; + local = FALSE; + } + ret = declare_variable(var, local); if (ret == FALSE) free_declaration(var); @@ -338,6 +385,50 @@ var_modifiers: /* Empty */ { $$ = 0; } + | KW_EXTERN var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_EXTERN); + } + | KW_NOINTERPOLATION var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION); + } + | KW_PRECISE var_modifiers + { + $$ = add_modifier($2, HLSL_MODIFIER_PRECISE); + } + | KW_SHARED var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_SHARED); + } + | KW_GROUPSHARED var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED); + } + | KW_STATIC var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_STATIC); + } + | KW_UNIFORM var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_UNIFORM); + } + | KW_VOLATILE var_modifiers + { + $$ = add_modifier($2, HLSL_STORAGE_VOLATILE); + } + | KW_CONST var_modifiers + { + $$ = add_modifier($2, HLSL_MODIFIER_CONST); + } + | KW_ROW_MAJOR var_modifiers + { + $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR); + } + | KW_COLUMN_MAJOR var_modifiers + { + $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR); + } %% diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ef22823..33cce05 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -908,6 +908,43 @@ const char *debug_hlsl_type(const struct hlsl_type *type) return "unexpected_type"; } +const char *debug_modifiers(DWORD modifiers) +{ + char string[110]; + + string[0] = 0; + if (modifiers & HLSL_STORAGE_EXTERN) + strcat(string, " extern"); /* 7 */ + if (modifiers & HLSL_STORAGE_NOINTERPOLATION) + strcat(string, " nointerpolation"); /* 16 */ + if (modifiers & HLSL_MODIFIER_PRECISE) + strcat(string, " precise"); /* 8 */ + if (modifiers & HLSL_STORAGE_SHARED) + strcat(string, " shared"); /* 7 */ + if (modifiers & HLSL_STORAGE_GROUPSHARED) + strcat(string, " groupshared"); /* 12 */ + if (modifiers & HLSL_STORAGE_STATIC) + strcat(string, " static"); /* 7 */ + if (modifiers & HLSL_STORAGE_UNIFORM) + strcat(string, " uniform"); /* 8 */ + if (modifiers & HLSL_STORAGE_VOLATILE) + strcat(string, " volatile"); /* 9 */ + if (modifiers & HLSL_MODIFIER_CONST) + strcat(string, " const"); /* 6 */ + if (modifiers & HLSL_MODIFIER_ROW_MAJOR) + strcat(string, " row_major"); /* 10 */ + if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + strcat(string, " column_major"); /* 13 */ + if ((modifiers & (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) == (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) + strcat(string, " inout"); /* 6 */ + else if (modifiers & HLSL_MODIFIER_IN) + strcat(string, " in"); /* 3 */ + else if (modifiers & HLSL_MODIFIER_OUT) + strcat(string, " out"); /* 4 */ + + return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); +} + const char *debug_node_type(enum hlsl_ir_node_type type) { const char *names[] =

1 0

Matteo Bruni : d3dcompiler: Distinguish between scalars, vectors and matrices.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 9d9dae0cdb79fb30c13c0a20690730fc2cd17ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9dae0cdb79fb30c13c0a206… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:02 2012 +0200 d3dcompiler: Distinguish between scalars, vectors and matrices. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 17 ++++++++++++++--- dlls/d3dcompiler_43/hlsl.y | 6 +++--- dlls/d3dcompiler_43/utils.c | 19 +++++++++++-------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3ee0ed5..74d2662 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -614,6 +614,17 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; * DEALINGS IN THE SOFTWARE. */ +enum hlsl_type_class +{ + HLSL_CLASS_SCALAR, + HLSL_CLASS_VECTOR, + HLSL_CLASS_MATRIX, + HLSL_CLASS_LAST_NUMERIC = HLSL_CLASS_MATRIX, + HLSL_CLASS_STRUCT, + HLSL_CLASS_ARRAY, + HLSL_CLASS_OBJECT, +}; + enum hlsl_base_type { HLSL_TYPE_FLOAT, @@ -628,8 +639,6 @@ enum hlsl_base_type HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_STRING, - HLSL_TYPE_STRUCT, - HLSL_TYPE_ARRAY, HLSL_TYPE_VOID, }; @@ -643,6 +652,7 @@ struct hlsl_type { struct list entry; struct list scope_entry; + enum hlsl_type_class type; enum hlsl_base_type base_type; const char *name; unsigned int modifiers; @@ -737,7 +747,8 @@ void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; +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 *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d967bce..e5a2a48 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -240,7 +240,7 @@ type: base_type base_type: KW_VOID { - $$ = new_hlsl_type("void", HLSL_TYPE_VOID, 1, 1); + $$ = new_hlsl_type("void", HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); } | TYPE_IDENTIFIER { @@ -257,9 +257,9 @@ base_type: KW_VOID TRACE("Struct type %s.\n", $2); type = get_type(hlsl_ctx.cur_scope, $2, TRUE); - if (type->base_type != HLSL_TYPE_STRUCT) + if (type->type != HLSL_CLASS_STRUCT) { - hlsl_message("Line %u: Redefining %s as a structure.\n", + hlsl_message("Line %u: redefining %s as a structure.\n", hlsl_ctx.line_no, $2); set_parse_status(&hlsl_ctx.status, PARSE_ERR); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index eaf2566..ef22823 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -804,7 +804,8 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) +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) { struct hlsl_type *type; @@ -815,6 +816,7 @@ struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, return NULL; } type->name = name; + type->type = type_class; type->base_type = base_type; type->dimx = dimx; type->dimy = dimy; @@ -879,8 +881,6 @@ const char *debug_base_type(const struct hlsl_type *type) case HLSL_TYPE_INT: name = "int"; break; case HLSL_TYPE_UINT: name = "uint"; break; case HLSL_TYPE_BOOL: name = "bool"; break; - case HLSL_TYPE_STRUCT: name = "struct"; break; - case HLSL_TYPE_ARRAY: name = "array"; break; default: FIXME("Unhandled case %u\n", type->base_type); } @@ -894,15 +894,18 @@ const char *debug_hlsl_type(const struct hlsl_type *type) if (type->name) return debugstr_a(type->name); - if (type->base_type == HLSL_TYPE_STRUCT) + if (type->type == HLSL_CLASS_STRUCT) name = "<anonymous struct>"; else name = debug_base_type(type); - if (type->dimx == 1 && type->dimy == 1) + + if (type->type == HLSL_CLASS_SCALAR) return wine_dbg_sprintf("%s", name); - if (type->dimy == 1) + if (type->type == HLSL_CLASS_VECTOR) return wine_dbg_sprintf("vector<%s, %u>", name, type->dimx); - return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy); + if (type->type == HLSL_CLASS_MATRIX) + return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy); + return "unexpected_type"; } const char *debug_node_type(enum hlsl_ir_node_type type) @@ -924,7 +927,7 @@ void free_hlsl_type(struct hlsl_type *type) struct hlsl_struct_field *field, *next_field; d3dcompiler_free((void *)type->name); - if (type->base_type == HLSL_TYPE_STRUCT) + if (type->type == HLSL_CLASS_STRUCT) { LIST_FOR_EACH_ENTRY_SAFE(field, next_field, type->e.elements, struct hlsl_struct_field, entry) {

1 0

Matteo Bruni : d3dcompiler: Dump preprocessed shader sources.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: a8839cd1def1ed9fa08b6a84dd183b093d95deeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8839cd1def1ed9fa08b6a84d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:01 2012 +0200 d3dcompiler: Dump preprocessed shader sources. --- dlls/d3dcompiler_43/compiler.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 043d231..1eb07ce 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -500,6 +500,8 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co ID3DBlob *buffer; char *pos; + TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); + FIXME("Parse compilation target.\n"); shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, entrypoint, &messages);

1 0

Roderick Colenbrander : winex11.drv: Limit formats to nMaxFormats in wglChoosePixelFormatARB.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 9e73f7a6df5cdfe4cbe714224ad36df776c02af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e73f7a6df5cdfe4cbe714224… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 6 21:55:34 2012 -0700 winex11.drv: Limit formats to nMaxFormats in wglChoosePixelFormatARB. --- dlls/winex11.drv/opengl.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c84226b..3bdf771 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2903,10 +2903,11 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt } /* Loop through all matching formats and check if they are suitable. - * Note that this function should at max return nMaxFormats different formats */ + * Note that this function should at max return nMaxFormats different formats */ for(run=0; run < 2; run++) { - for (it = 0; it < nCfgs; ++it) { + for (it = 0; it < nCfgs && pfmt_it < nMaxFormats; ++it) + { gl_test = pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); @@ -2922,10 +2923,8 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt if( ((run == 0) && fmt->offscreenOnly) || ((run == 1) && !fmt->offscreenOnly) ) continue; - if(pfmt_it < nMaxFormats) { - piFormats[pfmt_it] = fmt->iPixelFormat; - TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); - } + piFormats[pfmt_it] = fmt->iPixelFormat; + TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); pfmt_it++; } }

1 0

Matteo Bruni : d3dcompiler: Parse variable references in expressions.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 96470dfcb49ad223530c00de28890d0b196ce97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=96470dfcb49ad223530c00de2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:05 2012 +0200 d3dcompiler: Parse variable references in expressions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 34 +++++++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 21 +++++++++++++++ dlls/d3dcompiler_43/utils.c | 39 +++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index cb322bc..9f7fce1 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -684,6 +684,7 @@ enum hlsl_ir_node_type { HLSL_IR_VAR = 0, HLSL_IR_CONSTANT, + HLSL_IR_DEREF, }; struct hlsl_ir_node @@ -722,6 +723,33 @@ struct hlsl_ir_var struct hlsl_var_allocation *allocation; }; +enum hlsl_ir_deref_type +{ + HLSL_IR_DEREF_VAR, + HLSL_IR_DEREF_ARRAY, + HLSL_IR_DEREF_RECORD, +}; + +struct hlsl_ir_deref +{ + struct hlsl_ir_node node; + enum hlsl_ir_deref_type type; + union + { + struct hlsl_ir_var *var; + struct + { + struct hlsl_ir_node *array; + struct hlsl_ir_node *index; + } array; + struct + { + struct hlsl_ir_node *record; + const char *field; + } record; + } v; +}; + struct hlsl_ir_constant { struct hlsl_ir_node node; @@ -779,6 +807,12 @@ extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +static inline struct hlsl_ir_deref *deref_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_DEREF); + return CONTAINING_RECORD(node, struct hlsl_ir_deref, node); +} + static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_CONSTANT); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 0057d5d..ae1599f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -124,6 +124,7 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) BOOL boolval; char *name; DWORD modifiers; + struct hlsl_ir_var *var; struct hlsl_ir_node *instr; struct list *list; struct parse_variable_def *variable_def; @@ -243,6 +244,7 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) %type <instr> initializer_expr %type <modifiers> var_modifiers %type <instr> expr +%type <var> variable %type <intval> array %type <name> semantic %type <variable_def> variable_def @@ -544,11 +546,30 @@ primary_expr: C_FLOAT c->v.value.b[0] = $1; $$ = &c->node; } + | variable + { + struct hlsl_ir_deref *deref = new_var_deref($1); + $$ = deref ? &deref->node : NULL; + } | '(' expr ')' { $$ = $2; } +variable: VAR_IDENTIFIER + { + struct hlsl_ir_var *var; + var = get_variable(hlsl_ctx.cur_scope, $1); + if (!var) + { + hlsl_message("Line %d: variable '%s' not declared\n", + hlsl_ctx.line_no, $1); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + $$ = var; + } + postfix_expr: primary_expr { $$ = $1; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b15a89a..c890fd8 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -844,6 +844,22 @@ BOOL find_function(const char *name) return FALSE; } +struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) +{ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + + if (!deref) + { + ERR("Out of memory.\n"); + return NULL; + } + deref->node.type = HLSL_IR_DEREF; + deref->node.data_type = var->node.data_type; + deref->type = HLSL_IR_DEREF_VAR; + deref->v.var = var; + return deref; +} + void push_scope(struct hlsl_parse_ctx *ctx) { struct hlsl_scope *new_scope = d3dcompiler_alloc(sizeof(*new_scope)); @@ -951,6 +967,7 @@ const char *debug_node_type(enum hlsl_ir_node_type type) { "HLSL_IR_VAR", "HLSL_IR_CONSTANT", + "HLSL_IR_DEREF", }; if (type > sizeof(names) / sizeof(names[0])) @@ -1010,6 +1027,25 @@ static void free_ir_constant(struct hlsl_ir_constant *constant) d3dcompiler_free(constant); } +static void free_ir_deref(struct hlsl_ir_deref *deref) +{ + switch (deref->type) + { + case HLSL_IR_DEREF_VAR: + /* Variables are shared among nodes in the tree. */ + break; + case HLSL_IR_DEREF_ARRAY: + free_instr(deref->v.array.array); + free_instr(deref->v.array.index); + break; + case HLSL_IR_DEREF_RECORD: + free_instr(deref->v.record.record); + d3dcompiler_free((void *)deref->v.record.field); + break; + } + d3dcompiler_free(deref); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -1020,6 +1056,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_CONSTANT: free_ir_constant(constant_from_node(node)); break; + case HLSL_IR_DEREF: + free_ir_deref(deref_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Matteo Bruni : d3dcompiler: Parse variable initializers, basic expressions.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 887ef49419d3dc13cf1db2c3badc2eba9e53205c URL: http://source.winehq.org/git/wine.git/?a=commit;h=887ef49419d3dc13cf1db2c3b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:04 2012 +0200 d3dcompiler: Parse variable initializers, basic expressions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 29 ++++ dlls/d3dcompiler_43/hlsl.y | 198 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 49 +++++++ 3 files changed, 276 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887ef49419d3dc13cf1db…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard June 6, 2012

June 6, 2012

Module: wine Branch: master Commit: 468eec2a2c20566b738c1ef531bc1822307c6c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=468eec2a2c20566b738c1ef53… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 7 00:37:59 2012 +0900 po: Update Japanese translation. --- po/ja.po | 49 +++++++++++++++---------------------------------- 1 files changed, 15 insertions(+), 34 deletions(-) diff --git a/po/ja.po b/po/ja.po index 719203c..05d3b19 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-09 23:00+0900\n" +"PO-Revision-Date: 2012-06-07 00:10+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -157,21 +157,10 @@ msgid "Cancel" msgstr "キャンセル" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko インストーラ" +msgstr "Wine Mono インストーラ" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -180,13 +169,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Gecko パッケージを見つけられません。このパッケージは HTML を組み込んだアプリ" -"ケーションが正しく動作するために必要です。 Wine で Gecko パッケージを自動的に" -"ダウンロードし、インストールできます。\n" +"Mono パッケージを見つけられません。このパッケージは .NET アプリケーションが正" +"しく動作するために必要です。 Wine で Mono パッケージを自動的にダウンロード" +"し、インストールできます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" -"す。詳しくは、<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq." -"org/Gecko</a> を参照ください。" +"す。詳しくは、<a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a> を参照ください。" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -3427,43 +3416,35 @@ msgstr "高" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "ジョイスティック" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "無効(&D)" +msgstr "無効化(&D)" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "有効(&E)" +msgstr "有効化(&E)" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "切断" +msgstr "接続済み" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "無効(&D)" +msgstr "無効" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "ジョイスティックのテスト" #: joy.rc:53 msgid "Test Force Feedback" -msgstr "" +msgstr "フォースフィードバックのテスト" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "コントロールを作成" +msgstr "ゲームコントローラ" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0