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

Alexandre Julliard : shell32: Remove the applet valid flag and improve the error handling.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 2729cc1b3d34387dcb8ae0ce2a7d6d9e9ac81b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2729cc1b3d34387dcb8ae0ce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 11:46:20 2012 +0200 shell32: Remove the applet valid flag and improve the error handling. --- dlls/shell32/control.c | 44 +++++++++++++++++++------------------------- dlls/shell32/cpanel.h | 1 - 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index cb080d5..d8e4df1 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -49,10 +49,9 @@ void Control_UnloadApplet(CPlApplet* applet) { unsigned i; - for (i = 0; i < applet->count; i++) { - if (!applet->info[i].valid) continue; + for (i = 0; i < applet->count; i++) applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].data); - } + if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); list_remove( &applet->entry ); @@ -70,6 +69,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { + WARN("Cannot allocate memory for applet path\n"); + goto theError; + } + + lstrcpyW(applet->cmd, cmd); + applet->hWnd = hWnd; if (!(applet->hModule = LoadLibraryW(cmd))) { @@ -86,23 +92,16 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) } if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) { WARN("No subprogram in applet\n"); + applet->proc(applet->hWnd, CPL_EXIT, 0, 0); goto theError; } applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, - sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); - - if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path\n"); - goto theError; - } - - lstrcpyW(applet->cmd, cmd); + FIELD_OFFSET( CPlApplet, info[applet->count] )); for (i = 0; i < applet->count; i++) { ZeroMemory(&newinfo, sizeof(newinfo)); newinfo.dwSize = sizeof(NEWCPLINFOA); - applet->info[i].valid = TRUE; applet->info[i].helpfile[0] = 0; /* proc is supposed to return a null value upon success for * CPL_INQUIRE and CPL_NEWINQUIRE @@ -170,7 +169,9 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) return applet; theError: - Control_UnloadApplet(applet); + FreeLibrary(applet->hModule); + HeapFree(GetProcessHeap(), 0, applet->cmd); + HeapFree(GetProcessHeap(), 0, applet); return NULL; } @@ -277,9 +278,6 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) LIST_FOR_EACH_ENTRY( applet, &panel->applets, CPlApplet, entry ) { for (i = 0; i < applet->count; i++) { - if (!applet->info[i].valid) - continue; - /* set up a CPlItem for this particular subprogram */ item = HeapAlloc(GetProcessHeap(), 0, sizeof(CPlItem)); @@ -787,12 +785,10 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { - if (applet->info[sp].valid) { - TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].name)); + TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].name)); - if (StrCmpIW(extraPmts, applet->info[sp].name) == 0) - break; - } + if (StrCmpIW(extraPmts, applet->info[sp].name) == 0) + break; } } @@ -801,10 +797,8 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) sp = 0; } - if (applet->info[sp].valid) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) - applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); - } + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) + applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); Control_UnloadApplet(applet); } diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 7974d06..285fa8e 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -26,7 +26,6 @@ struct applet_info { - BOOL valid; LONG_PTR data; HICON icon; WCHAR name[256];

1 0

Lucas Zawacki : joy.cpl: Added joystick listing.
by Alexandre Julliard 05 Jun '12

05 Jun '12

1 0

Alexandre Julliard : shell32: Use a default icon for control panels without one.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: c1e40a8bf49157020c6bc28c4f2ee0acb87bcaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e40a8bf49157020c6bc28c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 19:54:23 2012 +0200 shell32: Use a default icon for control panels without one. --- dlls/shell32/control.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 988f249..6237894 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -301,8 +301,10 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) if (InsertMenuItemW(hSubMenu, menucount, TRUE, &mii)) { /* add the list view item */ - index = ImageList_AddIcon(panel->hImageListLarge, applet->info[i].icon); - ImageList_AddIcon(panel->hImageListSmall, applet->info[i].icon); + HICON icon = applet->info[i].icon; + if (!icon) icon = LoadImageW( 0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_SHARED ); + index = ImageList_AddIcon(panel->hImageListLarge, icon); + ImageList_AddIcon(panel->hImageListSmall, icon); lvItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lvItem.iItem = menucount;

1 0

Alexandre Julliard : shell32: Convert the control panel list to a standard list.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 6f9f6b1aa6dc64bac9bf4e43b474c5d23a1c8539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9f6b1aa6dc64bac9bf4e43b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 19:55:27 2012 +0200 shell32: Convert the control panel list to a standard list. --- dlls/shell32/control.c | 31 +++++++++++++------------------ dlls/shell32/cpanel.h | 7 ++++--- dlls/shell32/cpanelfolder.c | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 6237894..cb080d5 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -45,10 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); -CPlApplet* Control_UnloadApplet(CPlApplet* applet) +void Control_UnloadApplet(CPlApplet* applet) { unsigned i; - CPlApplet* next; for (i = 0; i < applet->count; i++) { if (!applet->info[i].valid) continue; @@ -56,10 +55,9 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet) } if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); - next = applet->next; + list_remove( &applet->entry ); HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); - return next; } CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) @@ -168,9 +166,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) } } - applet->next = panel->first; - panel->first = applet; - + list_add_head( &panel->applets, &applet->entry ); return applet; theError: @@ -278,7 +274,8 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) hSubMenu = GetSubMenu(hMenu, 0); menucount = 0; - for (applet = panel->first; applet; applet = applet->next) { + LIST_FOR_EACH_ENTRY( applet, &panel->applets, CPlApplet, entry ) + { for (i = 0; i < applet->count; i++) { if (!applet->info[i].valid) continue; @@ -450,9 +447,9 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, return 0; case WM_DESTROY: { - CPlApplet* applet = panel->first; - while (applet) - applet = Control_UnloadApplet(applet); + CPlApplet *applet, *next; + LIST_FOR_EACH_ENTRY_SAFE( applet, next, &panel->applets, CPlApplet, entry ) + Control_UnloadApplet(applet); } Control_FreeCPlItems(hWnd, panel); PostQuitMessage(0); @@ -717,6 +714,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; int quoted = 0; + CPlApplet *applet; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -783,13 +781,9 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); - Control_LoadApplet(hWnd, buffer, panel); - - if (panel->first) { - CPlApplet* applet = panel->first; - - assert(applet && applet->next == NULL); - + applet = Control_LoadApplet(hWnd, buffer, panel); + if (applet) + { /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { @@ -830,6 +824,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS hWnd, hInst, debugstr_w(cmd), nCmdShow); memset(&panel, 0, sizeof(panel)); + list_init( &panel.applets ); if (!cmd || !*cmd) { Control_DoWindow(&panel, hWnd, hInst); diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 60dd719..7974d06 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -21,6 +21,7 @@ #ifndef __WINE_SHELL_CPANEL_H #define __WINE_SHELL_CPANEL_H +#include "wine/list.h" #include "cpl.h" struct applet_info @@ -34,7 +35,7 @@ struct applet_info }; typedef struct CPlApplet { - struct CPlApplet* next; /* linked list */ + struct list entry; HWND hWnd; LPWSTR cmd; /* path to applet */ unsigned count; /* number of subprograms */ @@ -44,7 +45,7 @@ typedef struct CPlApplet { } CPlApplet; typedef struct CPanel { - CPlApplet* first; + struct list applets; HWND hWnd; HINSTANCE hInst; unsigned total_subprogs; @@ -61,6 +62,6 @@ typedef struct CPlItem { } CPlItem; CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) DECLSPEC_HIDDEN; -CPlApplet* Control_UnloadApplet(CPlApplet* applet) DECLSPEC_HIDDEN; +void Control_UnloadApplet(CPlApplet* applet) DECLSPEC_HIDDEN; #endif /* __WINE_SHELL_CPANEL_H */ diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 1229e47..ff862ce 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -302,7 +302,7 @@ static BOOL SHELL_RegisterCPanelApp(IEnumIDListImpl *list, LPCSTR path) MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH); - panel.first = NULL; + list_init( &panel.applets ); applet = Control_LoadApplet(0, wpath, &panel); if (applet)

1 0

Detlef Riekenberg : kernel32/tests: Remove debug code from GetProductInfo.
by Alexandre Julliard 05 Jun '12

05 Jun '12

Module: wine Branch: master Commit: 8c83c66bcb165cb44ec1a80d2940a939413394da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c83c66bcb165cb44ec1a80d2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 5 18:10:33 2012 +0200 kernel32/tests: Remove debug code from GetProductInfo. --- dlls/kernel32/tests/version.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index bb71cf8..265eae4 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -44,27 +44,8 @@ static void init_function_pointers(void) KERNEL32_GET_PROC(VerSetConditionMask); } -#define PRODUCT2NAME(x) case x:\ - return #x; - -static const char * product_to_name(DWORD product) -{ - switch (product) - { - PRODUCT2NAME(PRODUCT_PROFESSIONAL) - PRODUCT2NAME(PRODUCT_STANDARD_SERVER) - PRODUCT2NAME(PRODUCT_BUSINESS) - PRODUCT2NAME(PRODUCT_ULTIMATE) - PRODUCT2NAME(PRODUCT_ULTIMATE_N) - PRODUCT2NAME(PRODUCT_HOME_PREMIUM) - } - return ""; -} -#undef PRODUCT2NAME - static void test_GetProductInfo(void) { - OSVERSIONINFOEXA os; DWORD product; DWORD res; DWORD table[] = {9,8,7,6, @@ -94,22 +75,12 @@ static void test_GetProductInfo(void) return; } - memset(&os, 0, sizeof(OSVERSIONINFOEXA)); - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - res = GetVersionExA((OSVERSIONINFOA *)&os); - ok(res, "got %d (expected TRUE)\n", res); - - trace("%s %u.%u (SP: %u.%u)\n", os.wProductType == VER_NT_WORKSTATION ? "Workstation" : "Server", - os.dwMajorVersion, os.dwMinorVersion, os.wServicePackMajor, os.wServicePackMinor); - while (*entry) { /* SetLastError() / GetLastError(): value is untouched */ product = 0xdeadbeef; SetLastError(0xdeadbeef); res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); - trace("%d.%d / %d.%d: got %d and 0x%x %s\n", - entry[0], entry[1], entry[2], entry[3], res, product, product_to_name(product)); if (entry[0] >= 6) ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_EMBEDDED) && (GetLastError() == 0xdeadbeef),

1 0

Lucas Zawacki : joy.cpl: First version of the joystick configuration applet .
by Alexandre Julliard 05 Jun '12

05 Jun '12

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

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: 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: Parse variable declarations.
by Alexandre Julliard 05 Jun '12

05 Jun '12

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