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

Detlef Riekenberg : advapi32: Implement CredIsMarshaledCredentialA/W.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: d96de83089cc4af8077e6f185024134b06bab78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96de83089cc4af8077e6f185… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 7 00:36:27 2012 +0200 advapi32: Implement CredIsMarshaledCredentialA/W. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/cred.c | 66 +++++++++++++++++++++++++++++++++++++++++++ include/wincred.h | 3 ++ 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 638cba1..732bf04 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -144,8 +144,8 @@ @ stdcall CredGetSessionTypes(long ptr) # @ stub CredGetTargetInfoA # @ stub CredGetTargetInfoW -# @ stub CredIsMarshaledCredentialA -# @ stub CredIsMarshaledCredentialW +@ stdcall CredIsMarshaledCredentialA(str) +@ stdcall CredIsMarshaledCredentialW(wstr) # @ stub CredIsProtectedA # @ stub CredIsProtectedW @ stdcall CredMarshalCredentialA(long ptr ptr) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 432eb5c..d15feb7 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2161,3 +2161,69 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO } return TRUE; } + +/****************************************************************************** + * CredIsMarshaledCredentialW [ADVAPI32.@] + * + * Check, if the name parameter is a marshaled credential, hash or binary blob + * + * PARAMS + * name the name to check + * + * RETURNS + * TRUE: the name parameter is a marshaled credential, hash or binary blob + * FALSE: the name is a plain username + */ +BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR name) +{ + TRACE("(%s)\n", debugstr_w(name)); + + if (name && name[0] == '@' && name[1] == '@' && name[2] > 'A' && name[3]) + { + char hash[CERT_HASH_LENGTH + 2]; + int len = strlenW(name + 3 ); + DWORD size; + + if ((name[2] - 'A') == CertCredential && (len == 27) && cred_decode(name + 3, len, hash)) + return TRUE; + + if (((name[2] - 'A') == UsernameTargetCredential) && + (len >= 9) && cred_decode(name + 3, 6, (char *)&size) && size) + return TRUE; + + if ((name[2] - 'A') == BinaryBlobCredential) + FIXME("BinaryBlobCredential not checked\n"); + + if ((name[2] - 'A') > BinaryBlobCredential) + TRACE("unknown type: %d\n", (name[2] - 'A')); + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +/****************************************************************************** + * CredIsMarshaledCredentialA [ADVAPI32.@] + * + * See CredIsMarshaledCredentialW + * + */ +BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR name) +{ + LPWSTR nameW = NULL; + BOOL res; + int len; + + TRACE("(%s)\n", debugstr_a(name)); + + if (name) + { + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + } + + res = CredIsMarshaledCredentialW(nameW); + HeapFree(GetProcessHeap(), 0, nameW); + return res; +} diff --git a/include/wincred.h b/include/wincred.h index fb18a01..d0a75a7 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -248,6 +248,9 @@ WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); #define CredEnumerate WINELIB_NAME_AW(CredEnumerate) WINADVAPI VOID WINAPI CredFree(PVOID); WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR); +#define CredIsMarshaledCredential WINELIB_NAME_AW(CredIsMarshaledCredential) WINADVAPI BOOL WINAPI CredMarshalCredentialA(CRED_MARSHAL_TYPE,PVOID,LPSTR *); WINADVAPI BOOL WINAPI CredMarshalCredentialW(CRED_MARSHAL_TYPE,PVOID,LPWSTR *); #define CredMarshalCredential WINELIB_NAME_AW(CredMarshalCredential)

1 0

Detlef Riekenberg : advapi32/tests: Add tests for CredIsMarshaledCredential .
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: d685894a45d98d2f507b02e8a42124aa48d86eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d685894a45d98d2f507b02e8a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 7 00:36:28 2012 +0200 advapi32/tests: Add tests for CredIsMarshaledCredential. --- dlls/advapi32/tests/cred.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3aaae4c..5762f1b 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -37,6 +37,7 @@ static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); static BOOL (WINAPI *pCredReadDomainCredentialsA)(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD*,PCREDENTIALA**); static BOOL (WINAPI *pCredMarshalCredentialA)(CRED_MARSHAL_TYPE,PVOID,LPSTR *); static BOOL (WINAPI *pCredUnmarshalCredentialA)(LPCSTR,PCRED_MARSHAL_TYPE,PVOID); +static BOOL (WINAPI *pCredIsMarshaledCredentialA)(LPCSTR); #define TEST_TARGET_NAME "credtest.winehq.org" #define TEST_TARGET_NAME2 "credtest2.winehq.org" @@ -630,6 +631,67 @@ static void test_CredUnmarshalCredentialA(void) pCredFree( username ); } +static void test_CredIsMarshaledCredentialA(void) +{ + int i; + BOOL res; + BOOL expected = TRUE; + + const char * ptr[] = { + /* CertCredential */ + "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", /* hash for 'W','i','n','e' */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* hash for all 0 */ + + /* UsernameTargetCredential */ + "@@CCAAAAA0BA", /* "t" */ + "@@CIAAAAA0BQZAMHA0BA", /* "test" */ + + /* todo: BinaryBlobCredential */ + + /* not marshaled names return always FALSE */ + "winetest", + "", + "@@", + "@@A", + "@@AA", + "@@AAA", + "@@B", + "@@BB", + "@@BBB", + + /* CertCredential */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to long */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to short */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA+", /* bad char */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA:", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA>", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA<", + + "@@C", + "@@CC", + "@@CCC", + "@@D", + "@@DD", + "@@DDD", + NULL}; + + for (i = 0; ptr[i]; i++) + { + if (*ptr[i] != '@') + expected = FALSE; + + SetLastError(0xdeadbeef); + res = pCredIsMarshaledCredentialA(ptr[i]); + if (expected) + ok(res != FALSE, "%d: got %d and %u for %s (expected TRUE)\n", i, res, GetLastError(), ptr[i]); + else + { + /* Windows returns ERROR_INVALID_PARAMETER here, but that's not documented */ + ok(!res, "%d: got %d and %u for %s (expected FALSE)\n", i, res, GetLastError(), ptr[i]); + } + } +} + START_TEST(cred) { DWORD persists[CRED_TYPE_MAXIMUM]; @@ -644,6 +706,7 @@ START_TEST(cred) pCredReadDomainCredentialsA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadDomainCredentialsA"); pCredMarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredMarshalCredentialA"); pCredUnmarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredUnmarshalCredentialA"); + pCredIsMarshaledCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredIsMarshaledCredentialA"); if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || !pCredReadA) { @@ -690,4 +753,5 @@ START_TEST(cred) test_CredMarshalCredentialA(); test_CredUnmarshalCredentialA(); + test_CredIsMarshaledCredentialA(); }

1 0

Erich Hoover : shell32: Fix FindExecutable search path when a default directory is supplied.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 6a1d2f80b87de75cd4ed2d1280ab8e885b691857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1d2f80b87de75cd4ed2d128… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jul 10 11:59:24 2012 -0600 shell32: Fix FindExecutable search path when a default directory is supplied. --- dlls/shell32/shlexec.c | 8 +++++++- dlls/shell32/tests/shlexec.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 77212f0..e351d86 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -603,7 +603,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; - /* Hey, isn't this value ignored? Why make this call? Shouldn't we return here? --dank*/ + /* The file was found in the application-supplied default directory (or the system search path) */ + } + else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + { + TRACE("SearchPathW returned non-zero\n"); + lpFile = xlpFile; + /* The file was found in one of the directories in the system-wide search path */ } attribs = GetFileAttributesW(lpFile); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 1c5fe7f..8e200aa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1307,6 +1307,7 @@ static void test_filename(void) static void test_find_executable(void) { + char notepad_path[MAX_PATH]; char filename[MAX_PATH]; char command[MAX_PATH]; const filename_tests_t* test; @@ -1329,6 +1330,21 @@ static void test_find_executable(void) ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); } + GetSystemDirectoryA( notepad_path, MAX_PATH ); + strcat( notepad_path, "\\notepad.exe" ); + + /* Search for something that should be in the system-wide search path (no default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + + /* Search for something that should be in the system-wide search path (with default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + strcpy(command, "your word"); rc=(INT_PTR)FindExecutableA(tmpdir, NULL, command); ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc);

1 0

Alexandre Goujon : include/ddk: Add DVD_DESCRIPTOR_HEADER descriptor structure.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 9536e66d61ac3ac9185b6da518fe9cd26ea6539f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9536e66d61ac3ac9185b6da51… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:49 2012 +0200 include/ddk: Add DVD_DESCRIPTOR_HEADER descriptor structure. --- include/ddk/ntddcdvd.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/ddk/ntddcdvd.h b/include/ddk/ntddcdvd.h index 5313496..f6ce77b 100644 --- a/include/ddk/ntddcdvd.h +++ b/include/ddk/ntddcdvd.h @@ -113,7 +113,13 @@ typedef struct DVD_READ_STRUCTURE { /* From 0 to 4 */ UCHAR LayerNumber; -}DVD_READ_STRUCTURE, * PDVD_READ_STRUCTURE; +} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE; + +typedef struct _DVD_DESCRIPTOR_HEADER { + USHORT Length; + UCHAR Reserved[2]; +} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER; +C_ASSERT(sizeof(DVD_DESCRIPTOR_HEADER) == 4); typedef struct _DVD_LAYER_DESCRIPTOR { @@ -154,6 +160,7 @@ typedef struct _DVD_LAYER_DESCRIPTOR /* 0 indicates no BCA data */ UCHAR BCAFlag : 1; }DVD_LAYER_DESCRIPTOR, * PDVD_LAYER_DESCRIPTOR; +C_ASSERT(sizeof(DVD_LAYER_DESCRIPTOR) == 17); typedef struct _DVD_COPYRIGHT_DESCRIPTOR {

1 0

Alexandre Goujon : kernel32/tests: Add a helper to test CDROM ioctl.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 7c27a969973d2b54215be7906bf465239d15a260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c27a969973d2b54215be7906… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:48 2012 +0200 kernel32/tests: Add a helper to test CDROM ioctl. --- dlls/kernel32/tests/volume.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2755af5..b459ba6 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -730,6 +730,48 @@ static void test_GetVolumePathNamesForVolumeNameW(void) ok(error == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND got %u\n", error); } +static void test_cdrom_ioctl(void) +{ + char drive_letter, drive_path[] = "A:\\", drive_full_path[] = "\\\\.\\A:"; + DWORD bitmask; + HANDLE handle; + + bitmask = GetLogicalDrives(); + if(!bitmask) + { + trace("GetLogicalDrives failed : %u\n", GetLastError()); + return; + } + + for(drive_letter='A'; drive_letter<='Z'; drive_letter++) + { + if(!(bitmask & (1 << (drive_letter-'A') ))) + continue; + + drive_path[0] = drive_letter; + if(GetDriveTypeA(drive_path) != DRIVE_CDROM) + { + trace("Skipping %c:, not a CDROM drive.\n", drive_letter); + continue; + } + + trace("Testing with %c:\n", drive_letter); + + drive_full_path[4] = drive_letter; + handle = CreateFileA(drive_full_path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if(handle == INVALID_HANDLE_VALUE) + { + trace("Failed to open the device : %u\n", GetLastError()); + continue; + } + + /* Add your tests here */ + + CloseHandle(handle); + } + +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -756,4 +798,5 @@ START_TEST(volume) test_disk_extents(); test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); + test_cdrom_ioctl(); }

1 0

Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdPhysicalDescriptor) test.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: a3b5dd2dff0d04fe317f00282ccb0488e4803015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b5dd2dff0d04fe317f00282… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:50 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) test. --- dlls/kernel32/tests/volume.c | 91 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/cdrom.c | 98 +++++++++++++++++------------------------- 2 files changed, 131 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b5dd2dff0d04fe317f0…

1 0

Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdCopyrightDescriptor) test.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 9fce6a37ecb2a09e14bd3d384132fe3b09c3dcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fce6a37ecb2a09e14bd3d384… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:51 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdCopyrightDescriptor) test. --- dlls/kernel32/tests/volume.c | 21 +++++++++++++++++++++ dlls/ntdll/cdrom.c | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cf402ad..45bac31 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -749,6 +749,7 @@ static void test_dvd_read_structure(HANDLE handle) DVD_READ_STRUCTURE dvdReadStructure; DVD_LAYER_DESCRIPTOR dvdLayerDescriptor; struct COMPLETE_DVD_LAYER_DESCRIPTOR completeDvdLayerDescriptor; + DVD_COPYRIGHT_DESCRIPTOR dvdCopyrightDescriptor; dvdReadStructure.BlockByteOffset.QuadPart = 0; dvdReadStructure.SessionId = 0; @@ -818,6 +819,26 @@ static void test_dvd_read_structure(HANDLE handle) ok( (!ret && GetLastError() == ERROR_INVALID_PARAMETER), "IOCTL_DVD_READ_STRUCTURE should have failed\n"); } + + + /* DvdCopyrightDescriptor */ + dvdReadStructure.Format = 1; + + SetLastError(0xdeadbeef); + + /* Strangely, with NULL lpOutBuffer, last error is insufficient buffer, not invalid parameter as we could expect */ + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + NULL, sizeof(DVD_COPYRIGHT_DESCRIPTOR), &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); + + for(i=0; i<sizeof(DVD_COPYRIGHT_DESCRIPTOR); i++) + { + SetLastError(0xdeadbeef); + + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + &dvdCopyrightDescriptor, i, &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); + } } static void test_cdrom_ioctl(void) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a58701e..8374761 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3083,7 +3083,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR); if (lpInBuffer == NULL || nInBufferSize != sizeof(DVD_READ_STRUCTURE)) status = STATUS_INVALID_PARAMETER; - else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; + else if (nOutBufferSize < sz || !lpOutBuffer) status = STATUS_BUFFER_TOO_SMALL; else { TRACE("doing DVD_READ_STRUCTURE\n");

1 0

Matteo Bruni : d3dcompiler: Introduce source_location structure.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 5bcf8de8cfd171bf77b088c79c143048b22c6255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcf8de8cfd171bf77b088c79… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:34 2012 +0200 d3dcompiler: Introduce source_location structure. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 11 ++++++++--- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/utils.c | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1286f00..5bb74f0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -690,6 +690,13 @@ struct hlsl_struct_field DWORD modifiers; }; +struct source_location +{ + const char *file; + unsigned int line; + unsigned int col; +}; + enum hlsl_ir_node_type { HLSL_IR_VAR = 0, @@ -705,9 +712,7 @@ struct hlsl_ir_node enum hlsl_ir_node_type type; struct hlsl_type *data_type; - const char *source_file; - unsigned int line; - unsigned int column; + struct source_location loc; }; #define HLSL_STORAGE_EXTERN 0x00000001 diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 48c43a2..f4afd48 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -136,7 +136,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); hlsl_message("Line %u: \"%s\" already declared.\n", hlsl_ctx.line_no, decl->name); - hlsl_message("Line %u: \"%s\" was previously declared here.\n", old->node.line, decl->name); + hlsl_message("Line %u: \"%s\" was previously declared here.\n", old->node.loc.line, decl->name); set_parse_status(&hlsl_ctx.status, PARSE_ERR); return FALSE; } @@ -616,7 +616,7 @@ declaration: var_modifiers type variables_def ';' var->name = v->name; var->modifiers = $1; var->semantic = v->semantic; - var->node.line = hlsl_ctx.line_no; + var->node.loc.line = hlsl_ctx.line_no; if (v->initializer) { FIXME("Variable with an initializer.\n"); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2d4eefb..c4dd2e8 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -816,7 +816,7 @@ BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsign } decl->node.type = HLSL_IR_VAR; decl->node.data_type = param->type; - decl->node.line = line; + decl->node.loc.line = line; decl->name = param->name; decl->semantic = param->semantic; decl->modifiers = param->modifiers;

1 0

Matteo Bruni : d3dcompiler: Store (and begin to use) location information for variables.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: a84784e0577c26e0fd7741cde4cdc5809cd927a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84784e0577c26e0fd7741cde… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:35 2012 +0200 d3dcompiler: Store (and begin to use) location information for variables. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/hlsl.y | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5bb74f0..194ed25 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -820,6 +820,8 @@ struct parse_parameter struct parse_variable_def { struct list entry; + struct source_location loc; + char *name; unsigned int array_size; char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f4afd48..cadcfc9 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -32,6 +32,9 @@ int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; +struct YYLTYPE; +static void set_location(struct source_location *loc, const struct YYLTYPE *l); + void hlsl_message(const char *fmt, ...) { va_list args; @@ -125,9 +128,8 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); if (invalid) { - hlsl_message("Line %u: modifier '%s' invalid for local variables.\n", - hlsl_ctx.line_no, debug_modifiers(invalid)); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "modifier '%s' invalid for local variables", debug_modifiers(invalid)); } } ret = add_declaration(hlsl_ctx.cur_scope, decl, local); @@ -135,9 +137,10 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); - hlsl_message("Line %u: \"%s\" already declared.\n", hlsl_ctx.line_no, decl->name); - hlsl_message("Line %u: \"%s\" was previously declared here.\n", old->node.loc.line, decl->name); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "\"%s\" already declared", decl->name); + hlsl_report_message(old->node.loc.file, old->node.loc.line, old->node.loc.col, HLSL_LEVEL_NOTE, + "\"%s\" was previously declared here", old->name); return FALSE; } return TRUE; @@ -613,10 +616,10 @@ declaration: var_modifiers type variables_def ';' var->node.data_type = new_array_type($2, v->array_size); else var->node.data_type = $2; + var->node.loc = v->loc; var->name = v->name; var->modifiers = $1; var->semantic = v->semantic; - var->node.loc.line = hlsl_ctx.line_no; if (v->initializer) { FIXME("Variable with an initializer.\n"); @@ -655,6 +658,7 @@ variables_def: variable_def variable_def: any_identifier array semantic { $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); $$->name = $1; $$->array_size = $2; $$->semantic = $3; @@ -663,6 +667,7 @@ variable_def: any_identifier array semantic { TRACE("Declaration with initializer.\n"); $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); $$->name = $1; $$->array_size = $2; $$->semantic = $3; @@ -983,6 +988,13 @@ expr: assignment_expr %% +static void set_location(struct source_location *loc, const struct YYLTYPE *l) +{ + loc->file = hlsl_ctx.source_file; + loc->line = l->first_line; + loc->col = l->first_column; +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) {

1 0

Matteo Bruni : d3dcompiler: Use location information in add_modifier().
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 2b2b8501060e6594424700bf543a99aea50a3704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2b8501060e6594424700bf5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:36 2012 +0200 d3dcompiler: Use location information in add_modifier(). --- dlls/d3dcompiler_43/hlsl.y | 60 ++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cadcfc9..cf0c7b5 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -146,25 +146,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) return TRUE; } -static DWORD add_modifier(DWORD modifiers, DWORD mod) -{ - if (modifiers & mod) - { - hlsl_message("Line %u: modifier '%s' already specified.\n", - hlsl_ctx.line_no, debug_modifiers(mod)); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return modifiers; - } - if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) - && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) - { - hlsl_message("Line %u: more than one matrix majority keyword.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return modifiers; - } - return modifiers | mod; -} +static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); static unsigned int components_count_expr_list(struct list *list) { @@ -691,47 +673,47 @@ var_modifiers: /* Empty */ } | KW_EXTERN var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_EXTERN); + $$ = add_modifier($2, HLSL_STORAGE_EXTERN, &@1); } | KW_NOINTERPOLATION var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION); + $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION, &@1); } | KW_PRECISE var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_PRECISE); + $$ = add_modifier($2, HLSL_MODIFIER_PRECISE, &@1); } | KW_SHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_SHARED); + $$ = add_modifier($2, HLSL_STORAGE_SHARED, &@1); } | KW_GROUPSHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED); + $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED, &@1); } | KW_STATIC var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_STATIC); + $$ = add_modifier($2, HLSL_STORAGE_STATIC, &@1); } | KW_UNIFORM var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_UNIFORM); + $$ = add_modifier($2, HLSL_STORAGE_UNIFORM, &@1); } | KW_VOLATILE var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_VOLATILE); + $$ = add_modifier($2, HLSL_STORAGE_VOLATILE, &@1); } | KW_CONST var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_CONST); + $$ = add_modifier($2, HLSL_MODIFIER_CONST, &@1); } | KW_ROW_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR); + $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR, &@1); } | KW_COLUMN_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR); + $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR, &@1); } complex_initializer: initializer_expr @@ -995,6 +977,24 @@ static void set_location(struct source_location *loc, const struct YYLTYPE *l) loc->col = l->first_column; } +static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc) +{ + if (modifiers & mod) + { + hlsl_report_message(hlsl_ctx.source_file, loc->first_line, loc->first_column, HLSL_LEVEL_ERROR, + "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + { + hlsl_report_message(hlsl_ctx.source_file, loc->first_line, loc->first_column, HLSL_LEVEL_ERROR, + "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) {

1 0