wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Matteo Bruni : d3dcompiler: Add identifiers parsing.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 2ad2c5fa018f7189c41ae6be461daee10ac3e6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad2c5fa018f7189c41ae6be4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 17:58:23 2012 +0200 d3dcompiler: Add identifiers parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +++ dlls/d3dcompiler_43/hlsl.l | 12 ++++++++++++ dlls/d3dcompiler_43/hlsl.y | 1 + dlls/d3dcompiler_43/utils.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 72c2511..ec6e6e4 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -614,6 +614,9 @@ struct hlsl_parse_ctx extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) 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; struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 0a18326..ef12ab9 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -45,6 +45,7 @@ WS [ \t] NEWLINE (\n)|(\r\n) DOUBLESLASHCOMMENT "//"[^\n]* STRING \"[^\"]*\" +IDENTIFIER [A-Za-z_][A-Za-z0-9_]* ANY (.) @@ -166,6 +167,17 @@ while {return KW_WHILE; } column_major {return KW_COLUMN_MAJOR; } row_major {return KW_ROW_MAJOR; } +{IDENTIFIER} { + hlsl_lval.name = d3dcompiler_strdup(yytext); + if (get_variable(hlsl_ctx.cur_scope, yytext) + || find_function(yytext)) + return VAR_IDENTIFIER; + else if (get_type(hlsl_ctx.cur_scope, yytext, TRUE)) + return TYPE_IDENTIFIER; + else + return NEW_IDENTIFIER; + } + [+-]?[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { hlsl_lval.floatval = atof(yytext); return C_FLOAT; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d20360d..a9a8f0c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -159,6 +159,7 @@ static void hlsl_error(const char *s) %token <intval> PRE_LINE +%token <name> VAR_IDENTIFIER TYPE_IDENTIFIER NEW_IDENTIFIER %token <name> STRING %token <floatval> C_FLOAT %token <intval> C_INTEGER diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4cbad5b..d512a14 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -3,6 +3,7 @@ * Copyright 2009 Matteo Bruni * Copyright 2008-2009 Henri Verbeet for CodeWeavers * Copyright 2010 Rico Schüller + * Copyright 2012 Matteo Bruni for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -759,3 +760,21 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, va_l } } } + +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) +{ + FIXME("stub.\n"); + return NULL; +} + +struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) +{ + FIXME("stub.\n"); + return NULL; +} + +BOOL find_function(const char *name) +{ + FIXME("stub.\n"); + return FALSE; +}

1 0

Matteo Bruni : d3dcompiler: Flesh out the lexer more.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 5e82c397f4626be7b24e7b218b7a05eacac27e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e82c397f4626be7b24e7b218… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 17:58:22 2012 +0200 d3dcompiler: Flesh out the lexer more. --- dlls/d3dcompiler_43/hlsl.l | 128 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 102 +++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 439f384..0a18326 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -43,6 +43,7 @@ RESERVED4 typename|union|unsigned|using|virtual WS [ \t] NEWLINE (\n)|(\r\n) +DOUBLESLASHCOMMENT "//"[^\n]* STRING \"[^\"]*\" ANY (.) @@ -65,6 +66,133 @@ ANY (.) set_parse_status(&hlsl_ctx.status, PARSE_ERR); } +BlendState {return KW_BLENDSTATE; } +break {return KW_BREAK; } +Buffer {return KW_BUFFER; } +cbuffer {return KW_CBUFFER; } +compile {return KW_COMPILE; } +const {return KW_CONST; } +continue {return KW_CONTINUE; } +DepthStencilState {return KW_DEPTHSTENCILSTATE; } +DepthStencilView {return KW_DEPTHSTENCILVIEW; } +discard {return KW_DISCARD; } +do {return KW_DO; } +double {return KW_DOUBLE; } +else {return KW_ELSE; } +extern {return KW_EXTERN; } +false {return KW_FALSE; } +for {return KW_FOR; } +GeometryShader {return KW_GEOMETRYSHADER; } +groupshared {return KW_GROUPSHARED; } +if {return KW_IF; } +in {return KW_IN; } +inline {return KW_INLINE; } +inout {return KW_INOUT; } +matrix {return KW_MATRIX; } +namespace {return KW_NAMESPACE; } +nointerpolation {return KW_NOINTERPOLATION; } +out {return KW_OUT; } +pass {return KW_PASS; } +PixelShader {return KW_PIXELSHADER; } +precise {return KW_PRECISE; } +RasterizerState {return KW_RASTERIZERSTATE; } +RenderTargetView {return KW_RENDERTARGETVIEW; } +return {return KW_RETURN; } +register {return KW_REGISTER; } +sampler {return KW_SAMPLER; } +sampler1D {return KW_SAMPLER1D; } +sampler2D {return KW_SAMPLER2D; } +sampler3D {return KW_SAMPLER3D; } +samplerCUBE {return KW_SAMPLERCUBE; } +sampler_state {return KW_SAMPLER_STATE; } +SamplerComparisonState {return KW_SAMPLERCOMPARISONSTATE;} +shared {return KW_SHARED; } +stateblock {return KW_STATEBLOCK; } +stateblock_state {return KW_STATEBLOCK_STATE; } +static {return KW_STATIC; } +string {return KW_STRING; } +struct {return KW_STRUCT; } +switch {return KW_SWITCH; } +tbuffer {return KW_TBUFFER; } +technique {return KW_TECHNIQUE; } +technique10 {return KW_TECHNIQUE10; } +texture {return KW_TEXTURE; } +texture1D {return KW_TEXTURE1D; } +Texture1DArray {return KW_TEXTURE1DARRAY; } +texture2D {return KW_TEXTURE2D; } +Texture2DArray {return KW_TEXTURE2DARRAY; } +Texture2DMS {return KW_TEXTURE2DMS; } +Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } +texture3D {return KW_TEXTURE3D; } +Texture3DArray {return KW_TEXTURE3DARRAY; } +textureCUBE {return KW_TEXTURECUBE; } +true {return KW_TRUE; } +typedef {return KW_TYPEDEF; } +uniform {return KW_UNIFORM; } +vector {return KW_VECTOR; } +VertexShader {return KW_VERTEXSHADER; } +void {return KW_VOID; } +volatile {return KW_VOLATILE; } +while {return KW_WHILE; } + +\+\+ {return OP_INC; } +\-\- {return OP_DEC; } +&& {return OP_AND; } +\|\| {return OP_OR; } +== {return OP_EQ; } +\<\< {return OP_LEFTSHIFT; } +\<\<= {return OP_LEFTSHIFTASSIGN; } +\>\> {return OP_RIGHTSHIFT; } +\>\>= {return OP_RIGHTSHIFTASSIGN; } +\.\.\. {return OP_ELLIPSIS; } +\<= {return OP_LE; } +\>= {return OP_GE; } +\< {return OP_LT; } +\> {return OP_GT; } +!= {return OP_NE; } +\+= {return OP_ADDASSIGN; } +\-= {return OP_SUBASSIGN; } +\*= {return OP_MULASSIGN; } +\/= {return OP_DIVASSIGN; } +%= {return OP_MODASSIGN; } +&= {return OP_ANDASSIGN; } +\|= {return OP_ORASSIGN; } +^= {return OP_XORASSIGN; } +## {return OP_UNKNOWN1; } +#@ {return OP_UNKNOWN2; } +:: {return OP_UNKNOWN3; } +\-\> {return OP_UNKNOWN4; } + +column_major {return KW_COLUMN_MAJOR; } +row_major {return KW_ROW_MAJOR; } + +[+-]?[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[+-]?[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[+-]?[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +0x[0-9a-fA-F]+ { + sscanf(yytext, "0x%x", &hlsl_lval.intval); + return C_INTEGER; + } +0[0-7]+ { + sscanf(yytext, "0%o", &hlsl_lval.intval); + return C_INTEGER; + } +\-?[0-9]+ { + hlsl_lval.intval = (atoi(yytext)); + return C_INTEGER; + } + +{DOUBLESLASHCOMMENT} {} + {WS}+ {} {NEWLINE} { hlsl_ctx.line_no++; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c9aa94c..d20360d 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -55,11 +55,113 @@ static void hlsl_error(const char *s) { char *name; INT intval; + FLOAT floatval; } +%token KW_BLENDSTATE +%token KW_BREAK +%token KW_BUFFER +%token KW_CBUFFER +%token KW_COLUMN_MAJOR +%token KW_COMPILE +%token KW_CONST +%token KW_CONTINUE +%token KW_DEPTHSTENCILSTATE +%token KW_DEPTHSTENCILVIEW +%token KW_DISCARD +%token KW_DO +%token KW_DOUBLE +%token KW_ELSE +%token KW_EXTERN +%token KW_FALSE +%token KW_FOR +%token KW_GEOMETRYSHADER +%token KW_GROUPSHARED +%token KW_IF +%token KW_IN +%token KW_INLINE +%token KW_INOUT +%token KW_MATRIX +%token KW_NAMESPACE +%token KW_NOINTERPOLATION +%token KW_OUT +%token KW_PASS +%token KW_PIXELSHADER +%token KW_PRECISE +%token KW_RASTERIZERSTATE +%token KW_RENDERTARGETVIEW +%token KW_RETURN +%token KW_REGISTER +%token KW_ROW_MAJOR +%token KW_SAMPLER +%token KW_SAMPLER1D +%token KW_SAMPLER2D +%token KW_SAMPLER3D +%token KW_SAMPLERCUBE +%token KW_SAMPLER_STATE +%token KW_SAMPLERCOMPARISONSTATE +%token KW_SHARED +%token KW_STATEBLOCK +%token KW_STATEBLOCK_STATE +%token KW_STATIC +%token KW_STRING +%token KW_STRUCT +%token KW_SWITCH +%token KW_TBUFFER +%token KW_TECHNIQUE +%token KW_TECHNIQUE10 +%token KW_TEXTURE +%token KW_TEXTURE1D +%token KW_TEXTURE1DARRAY +%token KW_TEXTURE2D +%token KW_TEXTURE2DARRAY +%token KW_TEXTURE2DMS +%token KW_TEXTURE2DMSARRAY +%token KW_TEXTURE3D +%token KW_TEXTURE3DARRAY +%token KW_TEXTURECUBE +%token KW_TRUE +%token KW_TYPEDEF +%token KW_UNIFORM +%token KW_VECTOR +%token KW_VERTEXSHADER +%token KW_VOID +%token KW_VOLATILE +%token KW_WHILE + +%token OP_INC +%token OP_DEC +%token OP_AND +%token OP_OR +%token OP_EQ +%token OP_LEFTSHIFT +%token OP_LEFTSHIFTASSIGN +%token OP_RIGHTSHIFT +%token OP_RIGHTSHIFTASSIGN +%token OP_ELLIPSIS +%token OP_LE +%token OP_GE +%token OP_LT +%token OP_GT +%token OP_NE +%token OP_ADDASSIGN +%token OP_SUBASSIGN +%token OP_MULASSIGN +%token OP_DIVASSIGN +%token OP_MODASSIGN +%token OP_ANDASSIGN +%token OP_ORASSIGN +%token OP_XORASSIGN +%token OP_UNKNOWN1 +%token OP_UNKNOWN2 +%token OP_UNKNOWN3 +%token OP_UNKNOWN4 + %token <intval> PRE_LINE %token <name> STRING +%token <floatval> C_FLOAT +%token <intval> C_INTEGER %% hlsl_prog: /* empty */

1 0

Matteo Bruni : d3dcompiler: Use a separate bytecodewriter debug channel.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 233101b0ca0a413abe3c62e3d867ae37daa951a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233101b0ca0a413abe3c62e3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 17:58:21 2012 +0200 d3dcompiler: Use a separate bytecodewriter debug channel. --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 5a3e7f2..f24ac9d 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -27,7 +27,7 @@ #include "d3d9types.h" #include "d3dcompiler_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(asmshader); +WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter); /**************************************************************** * General assembler shader construction helper routines follow *

1 0

Alexandre Julliard : gdi32: Clip output to both the DIB visible rectangle and the total DIB extents.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: c07763b4194c3dc81391c8d74d0552f5140b18ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07763b4194c3dc81391c8d74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 22:22:29 2012 +0200 gdi32: Clip output to both the DIB visible rectangle and the total DIB extents. --- dlls/gdi32/dibdrv/dc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 798a9cd..df51332 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -263,10 +263,11 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl init_clipped_rects( clip_rects ); - rect.left = 0; - rect.top = 0; - rect.right = dib->rect.right - dib->rect.left; - rect.bottom = dib->rect.bottom - dib->rect.top; + rect.left = max( 0, -dib->rect.left ); + rect.top = max( 0, -dib->rect.top ); + rect.right = min( dib->rect.right, dib->width ) - dib->rect.left; + rect.bottom = min( dib->rect.bottom, dib->height ) - dib->rect.top; + if (is_rect_empty( &rect )) return 0; if (rc && !intersect_rect( &rect, &rect, rc )) return 0; if (!clip)

1 0

Alexandre Julliard : gdi32: Take into account the DIB rectangles when determining overlap for blits.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 319a87c86e8f6faf0ee1bbe2dba5933843d59c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319a87c86e8f6faf0ee1bbe2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 20:44:24 2012 +0200 gdi32: Take into account the DIB rectangles when determining overlap for blits. --- dlls/gdi32/dibdrv/bitblt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 724b704..bac5a60 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -438,11 +438,11 @@ static int get_overlap( const dib_info *dst, const RECT *dst_rect, int height, ret = 0; if (dst->stride != src->stride) return 0; /* can't be the same dib */ - if (dst_rect->right <= src_rect->left) return 0; - if (dst_rect->left >= src_rect->right) return 0; + if (dst->rect.left + dst_rect->right <= src->rect.left + src_rect->left) return 0; + if (dst->rect.left + dst_rect->left >= src->rect.left + src_rect->right) return 0; - src_top = (const char *)src->bits.ptr + src_rect->top * src->stride; - dst_top = (const char *)dst->bits.ptr + dst_rect->top * dst->stride; + src_top = (const char *)src->bits.ptr + (src->rect.top + src_rect->top) * src->stride; + dst_top = (const char *)dst->bits.ptr + (dst->rect.top + dst_rect->top) * dst->stride; height = (dst_rect->bottom - dst_rect->top) * dst->stride; if (dst->stride > 0) @@ -460,8 +460,8 @@ static int get_overlap( const dib_info *dst, const RECT *dst_rect, else if (dst_top < src_top) ret |= OVERLAP_BELOW; } - if (dst_rect->left < src_rect->left) ret |= OVERLAP_LEFT; - else if (dst_rect->left > src_rect->left) ret |= OVERLAP_RIGHT; + if (dst->rect.left + dst_rect->left < src->rect.left + src_rect->left) ret |= OVERLAP_LEFT; + else if (dst->rect.left + dst_rect->left > src->rect.left + src_rect->left) ret |= OVERLAP_RIGHT; return ret; }

1 0

Michael Stefaniuc : msxml3/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 90f93e3819dcaa0cea16bd297fa69a359fb6b517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f93e3819dcaa0cea16bd297… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:31:18 2012 +0200 msxml3/tests: Fix the expected values in some ok() messages. --- dlls/msxml3/tests/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 003446f..33ac2dc 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4580,9 +4580,9 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK); if (table->hr == S_OK) - ok(len == 1, "%d: got %d length, expected 0\n", i, len); + ok(len == 1, "%d: got %d length, expected 1\n", i, len); else - ok(len == 0, "%d: got %d length, expected 1\n", i, len); + ok(len == 0, "%d: got %d length, expected 0\n", i, len); ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr);

1 0

Michael Stefaniuc : shlwapi/tests: Fix the expected value in an ok() message.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: a5b0d137414fea60ced9165eb6e03e764e40343a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b0d137414fea60ced9165eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:29:58 2012 +0200 shlwapi/tests: Fix the expected value in an ok() message. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 949aaa0..fbc3601 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -901,7 +901,7 @@ static void test_UrlEscape(void) wc = 127; ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); - ok(size == 10, "got %d, expected 9\n", size); + ok(size == 10, "got %d, expected 10\n", size); ok(wc == 127, "String has changed, wc = %d\n", wc); }

1 0

Michael Stefaniuc : user32/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 824974cee41bcf1a1f6d41e28dad381243d0ea19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824974cee41bcf1a1f6d41e28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 4 17:26:24 2012 +0200 user32/tests: Fix the expected values in some ok() messages. --- dlls/user32/tests/monitor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e31019f..b509860 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -177,7 +177,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDriverExtra = 1; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); memset(&dmW, 0, sizeof(dmW)); @@ -201,7 +201,7 @@ static void test_ChangeDisplaySettingsEx(void) if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); }

1 0

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Lao.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 4f7ea5737a6b83bd9013ae25db748902cb6a09c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7ea5737a6b83bd9013ae25d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 07:44:14 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Lao. --- dlls/usp10/shape.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 67c8153..f2b41b1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -47,6 +47,7 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Lao(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -411,8 +412,8 @@ static const ScriptShapeData ShapingData[] = {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, @@ -1411,6 +1412,50 @@ static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Thai); } +static int combining_lexical_Lao(WCHAR c) +{ + enum {Lao_Norm=0, Lao_ABOVE1, Lao_ABOVE2, Lao_BELOW1, Lao_BELOW2, Lao_AM}; + + switch(c) + { + case 0xEB1: + case 0xEB4: + case 0xEB5: + case 0xEB6: + case 0xEB7: + case 0xEBB: + case 0xECD: return Lao_ABOVE1; break; + case 0xEC8: + case 0xEC9: + case 0xECA: + case 0xECB: + case 0xECC: return Lao_ABOVE2; break; + case 0xEBC: return Lao_BELOW1; break; + case 0xEB8: + case 0xEB9: return Lao_BELOW2; break; + case 0xEB3: return Lao_AM; break; + default: return Lao_Norm; + } +} + +static void ContextualShape_Lao(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT dirL; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Lao); +} + static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutChars, const WCHAR *replacements) { int i;

1 0

Aric Stewart : usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thai.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 28854b452e5789d0ec5d695cd097cb20fbc47e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28854b452e5789d0ec5d695cd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 07:44:12 2012 -0500 usp10: Insert dotted circle (U+25CC) for invalid combining sequences in Thai. --- dlls/usp10/shape.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 6592cda..67c8153 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -46,6 +46,7 @@ static void ContextualShape_Hebrew(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Thaana(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -408,8 +409,8 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, NULL, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, @@ -469,7 +470,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 1}, NULL, 0, ContextualShape_Hebrew, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL}, - {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, }; extern scriptData scriptInformation[]; @@ -1365,6 +1366,51 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS HeapFree(GetProcessHeap(),0,context_shape); } +static int combining_lexical_Thai(WCHAR c) +{ + enum {Thai_Norm=0, Thai_ABOVE1, Thai_ABOVE2, Thai_ABOVE3, Thai_ABOVE4, Thai_BELOW1, Thai_BELOW2, Thai_AM}; + + switch(c) + { + case 0xE31: + case 0xE34: + case 0xE35: + case 0xE36: + case 0xE37: return Thai_ABOVE1; break; + case 0xE47: + case 0xE4D: return Thai_ABOVE2; break; + case 0xE48: + case 0xE49: + case 0xE4A: + case 0xE4B: return Thai_ABOVE3; break; + case 0xE4C: + case 0xE4E: return Thai_ABOVE4; break; + case 0xE38: + case 0xE39: return Thai_BELOW1; break; + case 0xE3A: return Thai_BELOW2; break; + case 0xE33: return Thai_AM; break; + default: return Thai_Norm; + } +} + +static void ContextualShape_Thai(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT dirL; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + mark_invalid_combinations(hdc, pwcChars, cChars, pwOutGlyphs, pcGlyphs, dirL, pwLogClust, combining_lexical_Thai); +} + static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutChars, const WCHAR *replacements) { int i;

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012