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

Francois Gouget : d3dx9_36/tests: Make a couple of test functions static.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: bebcce32b0fa5965ee8b95d995836e57fd60edbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebcce32b0fa5965ee8b95d99… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:25:33 2012 +0200 d3dx9_36/tests: Make a couple of test functions static. --- dlls/d3dx9_36/tests/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 7f9ab44..ec7d40d 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -448,7 +448,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } else skip("Failed to create a ID3DXFont object\n"); } -void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) +static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) { int i; HRESULT hr; @@ -885,7 +885,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) test_ID3DXRenderToSurface_device_state(device); } -void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) +static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { int i; HRESULT hr;

1 0

Jacek Caban : urlmon: Avoid useless InternetQueryOptionW call.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 5c654b4839521dbfa54d676363860323978153da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c654b4839521dbfa54d67636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 12 10:35:52 2012 +0200 urlmon: Avoid useless InternetQueryOptionW call. --- dlls/urlmon/http.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index c67d36e..b1ca83a 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,18 +79,13 @@ static LPWSTR query_http_info(HttpProtocol *This, DWORD option) return ret; } -static inline BOOL set_security_flag(HttpProtocol *This, DWORD new_flag) +static inline BOOL set_security_flag(HttpProtocol *This, DWORD flags) { - DWORD flags, size = sizeof(flags); BOOL res; - res = InternetQueryOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); - if(res) { - flags |= new_flag; - res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, size); - } + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); if(!res) - ERR("Failed to set security flag(s): %x\n", new_flag); + ERR("Failed to set security flags: %x\n", flags); return res; }

1 0

Huw Davies : winspool: Install the ppd files into the driver directory.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: da0e1ecdd6d1c00b391333dd45a2e50791b7afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0e1ecdd6d1c00b391333dd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 12 09:42:47 2012 +0100 winspool: Install the ppd files into the driver directory. --- dlls/winspool.drv/info.c | 259 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 246 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da0e1ecdd6d1c00b39133…

1 0

Huw Davies : winspool: Set the printer status of old printers to indicate that they should check for driver updates .
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 0ef0ce2938fcdb45dd5ca4a735ae10a9e22c89cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef0ce2938fcdb45dd5ca4a73… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 12 09:42:48 2012 +0100 winspool: Set the printer status of old printers to indicate that they should check for driver updates. --- dlls/winspool.drv/info.c | 61 +++++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 022041c..a5ccf49 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -420,6 +420,36 @@ static int multi_sz_lenA(const char *str) return ptr - str + 1; } +/***************************************************************************** + * get_dword_from_reg + * + * Return DWORD associated with name from hkey. + */ +static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) +{ + DWORD sz = sizeof(DWORD), type, value = 0; + LONG ret; + + ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); + + if (ret != ERROR_SUCCESS) + { + WARN( "Got ret = %d on name %s\n", ret, debugstr_w(name) ); + return 0; + } + if (type != REG_DWORD) + { + ERR( "Got type %d\n", type ); + return 0; + } + return value; +} + +static inline DWORD set_reg_DWORD( HKEY hkey, const WCHAR *keyname, const DWORD value ) +{ + return RegSetValueExW( hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value) ); +} + static void WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { char qbuf[200]; @@ -738,12 +768,15 @@ static BOOL CUPS_LoadPrinters(void) TRACE("Printer %d: %s\n", i, debugstr_w(nameW)); if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { + DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); /* overwrite old LPR:* port */ RegSetValueExW(hkeyPrinter, PortW, 0, REG_SZ, (LPBYTE)port, (lstrlenW(port) + 1) * sizeof(WCHAR)); RegDeleteValueW(hkeyPrinter, May_Delete_Value); + /* flag that the PPD file should be checked for an update */ + set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); } else { BOOL added_driver = FALSE; @@ -990,11 +1023,6 @@ PRINTCAP_LoadPrinters(void) { return hadprinter; } -static inline DWORD set_reg_DWORD(HKEY hkey, const WCHAR *keyname, const DWORD value) -{ - return RegSetValueExW(hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); -} - static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) { if (value) @@ -3593,29 +3621,6 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) } /***************************************************************************** - * get_dword_from_reg - * - * Return DWORD associated with name from hkey. - */ -static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) -{ - DWORD sz = sizeof(DWORD), type, value = 0; - LONG ret; - - ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); - - if(ret != ERROR_SUCCESS) { - WARN("Got ret = %d on name %s\n", ret, debugstr_w(name)); - return 0; - } - if(type != REG_DWORD) { - ERR("Got type %d\n", type); - return 0; - } - return value; -} - -/***************************************************************************** * get_filename_from_reg [internal] * * Get ValueName from hkey storing result in out

1 0

Dmitry Timoshkov : gdi32: Do not normalize height of the default GUI font.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: e65b19cad34ed0c440e0d4ccb630a3cd497b1c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65b19cad34ed0c440e0d4ccb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jun 9 13:08:42 2012 +0900 gdi32: Do not normalize height of the default GUI font. --- dlls/gdi32/gdiobj.c | 36 +----------------------------------- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 1 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 4164d3a..d87515f 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -492,34 +492,6 @@ static UINT get_default_charset( void ) return csi.ciCharset; } -static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - -/****************************************************************************** - * get_dpi (internal) - * - * get the dpi from the registry - */ -static DWORD get_dpi( void ) -{ - DWORD dpi = 96; - HKEY hkey; - - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) - { - DWORD type, size, new_dpi; - - size = sizeof(new_dpi); - if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) - { - if(type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; - } - RegCloseKey(hkey); - } - return dpi; -} - /*********************************************************************** * GDI_inc_ref_count @@ -574,7 +546,6 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { - LOGFONTW default_gui_font; const struct DefaultFontInfo* deffonts; int i; @@ -609,12 +580,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - - /* For the default gui font, we use the lfHeight member in deffonts as a place-holder - for the point size so we must convert this into a true height */ - default_gui_font = deffonts->DefaultGuiFont; - default_gui_font.lfHeight = -MulDiv(default_gui_font.lfHeight, get_dpi(), 72); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &default_gui_font ); + stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7390303..9e5602b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4422,9 +4422,6 @@ static void test_stock_fonts(void) } ok(td[i].weight == lf.lfWeight, "%d: expected lfWeight %d, got %d\n", i, td[i].weight, lf.lfWeight); - if (td[i].height < 0) /* FIXME: remove once Wine is fixed */ - todo_wine ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); - else ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); ok(!lstrcmp(td[i].face_name, lf.lfFaceName), "%d: expected lfFaceName %s, got %s\n", i, td[i].face_name, lf.lfFaceName); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser Get/Set Flags.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 524a817195dbe147f632f9af533c155c2a731eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524a817195dbe147f632f9af5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 14:30:30 2011 +1000 msxml3: Implement IXMLParser Get/Set Flags. --- .gitignore | 1 + dlls/msxml3/tests/Makefile.in | 2 + dlls/msxml3/tests/xmlparser.c | 23 ++- dlls/msxml3/tests/xmlparser.idl | 381 +++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlview.c | 3 +- dlls/msxml3/xmlparser.c | 13 +- 6 files changed, 410 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524a817195dbe147f632f…

1 0

Bruno Jesus : ws2_32: Fix hostent memory allocation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: b2af5e1d311d409e725c67c731bf83c9fd8fdea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2af5e1d311d409e725c67c73… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jun 9 14:34:59 2012 -0300 ws2_32: Fix hostent memory allocation. --- dlls/ws2_32/socket.c | 75 +++++++++++++++++++++++++-------------------- dlls/ws2_32/tests/sock.c | 8 ++-- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fd19ab2..b2bed09 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -326,7 +326,7 @@ static INT num_startup; /* reference counter */ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ -static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses); +static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length); static struct WS_hostent *WS_dup_he(const struct hostent* p_he); static struct WS_protoent *WS_dup_pe(const struct protoent* p_pe); static struct WS_servent *WS_dup_se(const struct servent* p_se); @@ -4557,7 +4557,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) /* Allocate a hostent and enough memory for all the IPs, * including the NULL at the end of the list. */ - hostlist = WS_create_he(hostname, 1, numroutes+1, TRUE); + hostlist = WS_create_he(hostname, 1, 0, numroutes+1, sizeof(struct in_addr)); if (hostlist == NULL) goto cleanup; /* Failed to allocate a hostent for the list of IPs */ hostlist->h_addr_list[numroutes] = NULL; /* NULL-terminate the address list */ @@ -5581,54 +5581,51 @@ static int list_dup(char** l_src, char** l_to, int item_size) * * Creates the entry with enough memory for the name, aliases * addresses, and the address pointers. Also copies the name - * and sets up all the pointers. If "fill_addresses" is set then - * sufficient memory for the addresses is also allocated and the - * address pointers are set to this memory. + * and sets up all the pointers. * * NOTE: The alias and address lists must be allocated with room * for the NULL item terminating the list. This is true even if * the list has no items ("aliases" and "addresses" must be * at least "1", a truly empty list is invalid). */ -static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses) +static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size, int addresses, int address_length) { struct WS_hostent *p_to; char *p; - int size = (sizeof(struct WS_hostent) + strlen(name) + 1 + - sizeof(char *)*aliases + - sizeof(char *)*addresses); - - /* Allocate enough memory for the addresses */ - if (fill_addresses) - size += sizeof(struct in_addr)*addresses; + sizeof(char *) * aliases + + aliases_size + + sizeof(char *) * addresses + + address_length * (addresses - 1)), i; if (!(p_to = check_buffer_he(size))) return NULL; memset(p_to, 0, size); + /* Use the memory in the same way winsock does. + * First set the pointer for aliases, second set the pointers for addressess. + * Third fill the addresses indexes, fourth jump aliases names size. + * Fifth fill the hostname. + * NOTE: This method is valid for OS version's >= XP. + */ p = (char *)(p_to + 1); - p_to->h_name = p; - strcpy(p, name); - p += strlen(p) + 1; - p_to->h_aliases = (char **)p; p += sizeof(char *)*aliases; + p_to->h_addr_list = (char **)p; p += sizeof(char *)*addresses; - if (fill_addresses) - { - int i; - /* NOTE: h_aliases must be filled in manually, leave these - * pointers NULL (already set to NULL by memset earlier). - */ + for (i = 0, addresses--; i < addresses; i++, p += address_length) + p_to->h_addr_list[i] = p; + + /* NOTE: h_aliases must be filled in manually because we don't know each string + * size, leave these pointers NULL (already set to NULL by memset earlier). + */ + p += aliases_size; + + p_to->h_name = p; + strcpy(p, name); - /* Fill in the list of address pointers */ - for (i = 0; i < addresses; i++) - p_to->h_addr_list[i] = (p += sizeof(struct in_addr)); - p += sizeof(struct in_addr); - } return p_to; } @@ -5638,18 +5635,30 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i */ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) { - int addresses = list_size(p_he->h_addr_list, p_he->h_length); - int aliases = list_size(p_he->h_aliases, 0); + int i, addresses = 0, alias_size = 0; struct WS_hostent *p_to; + char *p; - p_to = WS_create_he(p_he->h_name, aliases, addresses, FALSE); + for( i = 0; p_he->h_aliases[i]; i++) alias_size += strlen(p_he->h_aliases[i]) + 1; + while (p_he->h_addr_list[addresses]) addresses++; + + p_to = WS_create_he(p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length); if (!p_to) return NULL; p_to->h_addrtype = p_he->h_addrtype; p_to->h_length = p_he->h_length; - list_dup(p_he->h_aliases, p_to->h_aliases, 0); - list_dup(p_he->h_addr_list, p_to->h_addr_list, p_he->h_length); + for(i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length) + memcpy(p, p_he->h_addr_list[i], p_to->h_length); + + /* Fill the aliases after the IP data */ + for(i = 0; p_he->h_aliases[i]; i++) + { + p_to->h_aliases[i] = p; + strcpy(p, p_he->h_aliases[i]); + p += strlen(p) + 1; + } + return p_to; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 85d126b..2543873 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2759,22 +2759,22 @@ static void test_dns(void) addr.mem = h + 1; if(h->h_addr_list == addr.mem) /* <= W2K */ { - skip("Skipping hostent tests since this OS is unsupported\n"); + win_skip("Skipping hostent tests since this OS is unsupported\n"); return; } - todo_wine ok(h->h_aliases == addr.mem, + ok(h->h_aliases == addr.mem, "hostent->h_aliases should be in %p, it is in %p\n", addr.mem, h->h_aliases); for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list == addr.mem, + ok(h->h_addr_list == addr.mem, "hostent->h_addr_list should be in %p, it is in %p\n", addr.mem, h->h_addr_list); for(ptr = h->h_addr_list, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list[0] == addr.mem, + ok(h->h_addr_list[0] == addr.mem, "hostent->h_addr_list[0] should be in %p, it is in %p\n", addr.mem, h->h_addr_list[0]); }

1 0

Matteo Bruni : d3dcompiler: Parse vector and matrix declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: de11f800fd9fc7e320ebeb75278e9b61174728fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de11f800fd9fc7e320ebeb752… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:31 2012 +0200 d3dcompiler: Parse vector and matrix declarations. --- dlls/d3dcompiler_43/hlsl.l | 2 -- dlls/d3dcompiler_43/hlsl.y | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index ef12ab9..84cf573 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -148,8 +148,6 @@ while {return KW_WHILE; } \.\.\. {return OP_ELLIPSIS; } \<= {return OP_LE; } \>= {return OP_GE; } -\< {return OP_LT; } -\> {return OP_GT; } != {return OP_NE; } \+= {return OP_ADDASSIGN; } \-= {return OP_SUBASSIGN; } diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ae1599f..cc13e25 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -213,8 +213,6 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) %token OP_ELLIPSIS %token OP_LE %token OP_GE -%token OP_LT -%token OP_GT %token OP_NE %token OP_ADDASSIGN %token OP_SUBASSIGN @@ -302,6 +300,44 @@ type: base_type { $$ = $1; } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: vectors of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4) + { + hlsl_message("Line %u: vector size must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: matrices of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4 || $7 < 1 || $7 > 4) + { + hlsl_message("Line %u: matrix dimensions must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $5, $7); + } base_type: KW_VOID {

1 0

Matteo Bruni : d3dcompiler: Parse sampler declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 5e343752383c23b8696439993c384a3fb1a15265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e343752383c23b8696439993… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:32 2012 +0200 d3dcompiler: Parse sampler declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 ++++++++++ dlls/d3dcompiler_43/hlsl.y | 25 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 ++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5e5f1d3..1c4b776 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -644,6 +644,15 @@ enum hlsl_base_type HLSL_TYPE_VOID, }; +enum hlsl_sampler_dim +{ + HLSL_SAMPLER_DIM_GENERIC, + HLSL_SAMPLER_DIM_1D, + HLSL_SAMPLER_DIM_2D, + HLSL_SAMPLER_DIM_3D, + HLSL_SAMPLER_DIM_CUBE, +}; + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -656,6 +665,7 @@ struct hlsl_type struct list scope_entry; enum hlsl_type_class type; enum hlsl_base_type base_type; + enum hlsl_sampler_dim sampler_dim; const char *name; unsigned int modifiers; unsigned int dimx; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cc13e25..7384e88 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -343,6 +343,31 @@ base_type: KW_VOID { $$ = new_hlsl_type("void", HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); } + | KW_SAMPLER + { + $$ = new_hlsl_type("sampler", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_GENERIC; + } + | KW_SAMPLER1D + { + $$ = new_hlsl_type("sampler1D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_1D; + } + | KW_SAMPLER2D + { + $$ = new_hlsl_type("sampler2D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_2D; + } + | KW_SAMPLER3D + { + $$ = new_hlsl_type("sampler3D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_3D; + } + | KW_SAMPLERCUBE + { + $$ = new_hlsl_type("samplerCUBE", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_CUBE; + } | TYPE_IDENTIFIER { struct hlsl_type *type; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 304f70c..6f8b013 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -897,6 +897,16 @@ static 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_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; + case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; + case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; + case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; + case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; + } + break; default: FIXME("Unhandled case %u\n", type->base_type); }

1 0

Matteo Bruni : d3dcompiler: Parse function declarations.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 552f10d0e803ad1a5f4b3f6e01604723b520a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552f10d0e803ad1a5f4b3f6e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:33 2012 +0200 d3dcompiler: Parse function declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 ++++++ dlls/d3dcompiler_43/hlsl.y | 104 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 63 +++++++++++++++++- 3 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552f10d0e803ad1a5f4b3…

1 0