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

Matteo Bruni : d3dcompiler: Parse variable declarations.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 2aa6c460f736d830aa642523517c937edcfb40ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa6c460f736d830aa6425235… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 17:58:24 2012 +0200 d3dcompiler: Parse variable declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 134 ++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 188 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 157 ++++++++++++++++++++++++ 3 files changed, 478 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2aa6c460f736d830aa642…

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupColor.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: b7a74b0204989da3615f981c2e326f91b0da900c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a74b0204989da3615f981c2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:59 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupColor. --- dlls/d3drm/meshbuilder.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index fdab66f..dabea1f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2624,13 +2624,18 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetVertices(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColor(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, D3DCOLOR value) + D3DRMGROUPINDEX id, D3DCOLOR color) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%x): stub\n", This, id, value); + TRACE("(%p)->(%u,%x)\n", This, id, color); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + This->groups[id].color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColorRGB(IDirect3DRMMesh* iface,

1 0

Jacek Caban : wininet: Added support for undocumented InternetQueryOption( 98).
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 0133683c46bea6f1d22dbb4c66b8d95442abd6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0133683c46bea6f1d22dbb4c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 4 18:01:19 2012 +0200 wininet: Added support for undocumented InternetQueryOption(98). --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54ac0d5..b123283 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1987,6 +1987,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_SUCCESS; } + case 98: + TRACE("Queried undocumented option 98, forwarding to INTERNET_OPTION_SECURITY_FLAGS\n"); + /* fall through */ case INTERNET_OPTION_SECURITY_FLAGS: { DWORD flags; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 204c5b7..fbb7ab6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2928,6 +2928,13 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); + + /* Option 98 is undocumented and seems to be the same as INTERNET_OPTION_SECURITY_FLAGS */ + flags = 0xdeadbeef; + size = sizeof(flags); + res = InternetQueryOptionW(req, 98, &flags, &size); + ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); } #define set_secflags(a,b) _set_secflags(__LINE__,a,b)

1 0

Christian Costa : d3drm: Pass mesh builder color to newly created mesh.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 23db9d8bedd258c3649a5684db20b0ce3b0fa197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23db9d8bedd258c3649a5684d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:31:08 2012 +0200 d3drm: Pass mesh builder color to newly created mesh. --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index dabea1f..f3f00c1 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2022,6 +2022,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } } if (SUCCEEDED(hr)) + hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); + if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 54a356a..f351b02 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -369,7 +369,7 @@ static void test_MeshBuilder(void) todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, 0); - todo_wine ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); + ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n");

1 0

Christian Costa : d3drm: Load mesh color to mesh builder.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: ab08e5938a4161aad35e7b5498041990f44ec900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab08e5938a4161aad35e7b549… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:49 2012 +0200 d3drm: Load mesh color to mesh builder. --- dlls/d3drm/meshbuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c46b1a0..fdab66f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1273,6 +1273,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) values = (float*)ptr; + IDirect3DRMMeshBuilder3_SetColorRGB(iface, values[0], values [1], values[2]); /* Alpha ignored */ + IDirect3DRMMaterial2_SetAmbient(material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(material, values[4]); IDirect3DRMMaterial2_SetSpecular(material, values[5], values[6], values[7]);

1 0

Austin English : kernel32: Add a stub for SetConsoleIcon.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: e8c283c0096b30c6624865e0233821f0793a22d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c283c0096b30c6624865e02… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 5 02:59:49 2012 -0500 kernel32: Add a stub for SetConsoleIcon. --- dlls/kernel32/console.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4410a31..4218c29 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3216,3 +3216,11 @@ BOOL WINAPI AddConsoleAliasW(LPWSTR source, LPWSTR target, LPWSTR exename) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + + +BOOL WINAPI SetConsoleIcon(HICON icon) +{ + FIXME(": (%p) stub!\n", icon); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec865cc..bad71a9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1080,7 +1080,7 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stub SetConsoleFont @ stub SetConsoleHardwareState -@ stub SetConsoleIcon +@ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) @ stub SetConsoleKeyShortcuts

1 0

Vincent Povirk : wine.inf: Add .NET keys to the 64-bit registry.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: c1279a6b03ed78a65ddf87755aff15700e086a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1279a6b03ed78a65ddf87755… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 4 15:22:08 2012 -0500 wine.inf: Add .NET keys to the 64-bit registry. --- tools/wine.inf.in | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 03a748a..f39b929 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,6 +89,7 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ + Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -510,6 +511,42 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" +[DotNet] +HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" +HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" +HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 +HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" + +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" + [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00

1 0

André Hentschel : libwine: Improve bin directory detection on kFreeBSD and DragonFly BSD.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 57de68e8763fbc4cccd8eba22196f93179f8689b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57de68e8763fbc4cccd8eba22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 4 22:14:14 2012 +0200 libwine: Improve bin directory detection on kFreeBSD and DragonFly BSD. --- libs/wine/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 031850b..349fb7d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -53,9 +53,9 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #endif -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD_kernel__ ) #define EXE_LINK "/proc/self/exe" -#elif defined (__FreeBSD__) +#elif defined (__FreeBSD__) || defined(__DragonFly__) #define EXE_LINK "/proc/curproc/file" #endif

1 0

Matteo Bruni : d3dcompiler: Add identifiers parsing.
by Alexandre Julliard June 5, 2012

June 5, 2012

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 June 5, 2012

June 5, 2012

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