May 2009 - Wine-Commits - list.winehq.org

Detlef Riekenberg : mlang: Use a case independent compare for the RFC1766 name.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 4e9f7899a475216c306e5edf17874c7ee1205a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9f7899a475216c306e5edf1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 23:50:01 2009 +0200 mlang: Use a case independent compare for the RFC1766 name. --- dlls/mlang/mlang.c | 2 +- dlls/mlang/tests/mlang.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 14122c8..9cd9a87 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1197,7 +1197,7 @@ static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc176 while (IEnumRfc1766_Next(iface, 1, &info, &num) == S_OK) { - if (!strcmpW(info.wszRfc1766, rfc1766)) + if (!strcmpiW(info.wszRfc1766, rfc1766)) { *lcid = info.lcid; return S_OK; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index b0b4743..fdff28c 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -62,6 +62,9 @@ static const lcid_table_entry lcid_table[] = { {"en", 9, S_OK}, /* only en is special (using PRIMARYLANGID) */ {"en-gb", 0x809, S_OK}, + {"en-GB", 0x809, S_OK}, + {"EN-GB", 0x809, S_OK}, + {"en-US", 0x409, S_OK}, {"en-us", 0x409, S_OK} };

1 0

Detlef Riekenberg : mlang/tests: Return correct result in Rfc1766ToLcidA on failure.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: f4def21f57df4c3d33ff975e82f3020d01000714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4def21f57df4c3d33ff975e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 23:17:46 2009 +0200 mlang/tests: Return correct result in Rfc1766ToLcidA on failure. --- dlls/mlang/mlang.c | 3 +++ dlls/mlang/tests/mlang.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 5deb87b..bd6a7f5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1238,6 +1238,9 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) { WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; + if (!rfc1766A) + return E_INVALIDARG; + MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME); rfc1766W[MAX_RFC1766_NAME] = 0; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index df2ecb7..d39e0e3 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -935,6 +935,12 @@ static void test_Rfc1766ToLcid(void) } + ret = Rfc1766ToLcidA(&lcid, NULL); + ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + + ret = Rfc1766ToLcidA(NULL, "en"); + ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + }

1 0

Hib Eris : msi/tests: Add test for merging tables with string primary keys.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: a807e86dd76770ff201d01121ca14bdbd5e30d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a807e86dd76770ff201d01121… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:06 2009 +0200 msi/tests: Add test for merging tables with string primary keys. --- dlls/msi/tests/db.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ec0bf30..7b650e0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6944,6 +6944,52 @@ static void test_dbmerge(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( " + "`A` CHAR(72), `B` INT PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( " + "`A` CHAR(72), `B` INT PRIMARY KEY `A` )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 'hi', 1 )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* primary key is string */ + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = do_query(hdb, query, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); + + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + + MsiCloseHandle(hrec); + + /* nothing in MergeErrors */ + query = "SELECT * FROM `MergeErrors`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + create_file_data("codepage.idt", "\r\n\r\n850\t_ForceCodepage\r\n", 0); GetCurrentDirectoryA(MAX_PATH, buf);

1 0

Hib Eris : msi: Add support for importing binary OBJECTS.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: cad837c99992e27146ab3831ad601726709f609b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad837c99992e27146ab3831a… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:31:45 2009 +0200 msi: Add support for importing binary OBJECTS. --- dlls/msi/database.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/tests/db.c | 12 +++++----- 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 70bcd90..ec944be 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -377,6 +377,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D static const WCHAR type_char[] = {'C','H','A','R',0}; static const WCHAR type_int[] = {'I','N','T',0}; static const WCHAR type_long[] = {'L','O','N','G',0}; + static const WCHAR type_object[] = {'O','B','J','E','C','T',0}; static const WCHAR type_notnull[] = {' ','N','O','T',' ','N','U','L','L',0}; static const WCHAR localizable[] = {' ','L','O','C','A','L','I','Z','A','B','L','E',0}; @@ -421,6 +422,11 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D else type = type_long; break; + case 'v': + lstrcpyW(extra, type_notnull); + case 'V': + type = type_object; + break; default: ERR("Unknown type: %c\n", types[i][0]); msi_free(columns); @@ -522,8 +528,32 @@ static UINT msi_add_table_to_db(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, return r; } +static LPWSTR msi_import_stream_filename(LPCWSTR path, LPCWSTR name) +{ + DWORD len; + LPWSTR fullname, ptr; + + len = lstrlenW(path) + lstrlenW(name) + 1; + fullname = msi_alloc(len*sizeof(WCHAR)); + if (!fullname) + return NULL; + + lstrcpyW( fullname, path ); + + /* chop off extension from path */ + ptr = strrchrW(fullname, '.'); + if (!ptr) + { + msi_free (fullname); + return NULL; + } + *ptr++ = '\\'; + lstrcpyW( ptr, name ); + return fullname; +} + static UINT construct_record(DWORD num_columns, LPWSTR *types, - LPWSTR *data, MSIRECORD **rec) + LPWSTR *data, LPWSTR path, MSIRECORD **rec) { UINT i; @@ -542,6 +572,20 @@ static UINT construct_record(DWORD num_columns, LPWSTR *types, if (*data[i]) MSI_RecordSetInteger(*rec, i + 1, atoiW(data[i])); break; + case 'V': case 'v': + if (*data[i]) + { + UINT r; + LPWSTR file = msi_import_stream_filename(path, data[i]); + if (!file) + return ERROR_FUNCTION_FAILED; + + r = MSI_RecordSetStreamFromFileW(*rec, i + 1, file); + msi_free (file); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + } + break; default: ERR("Unhandled column type: %c\n", types[i][0]); msiobj_release(&(*rec)->hdr); @@ -554,7 +598,8 @@ static UINT construct_record(DWORD num_columns, LPWSTR *types, static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, LPWSTR **records, - int num_columns, int num_records) + int num_columns, int num_records, + LPWSTR path) { UINT r; int i; @@ -579,7 +624,7 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t for (i = 0; i < num_records; i++) { - r = construct_record(num_columns, types, records[i], &rec); + r = construct_record(num_columns, types, records[i], path, &rec); if (r != ERROR_SUCCESS) goto done; @@ -683,7 +728,7 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) } } - r = msi_add_records_to_table( db, columns, types, labels, records, num_columns, num_records ); + r = msi_add_records_to_table( db, columns, types, labels, records, num_columns, num_records, path ); } done: diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 408c968..8c4bd3a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -704,6 +704,7 @@ extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ); extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 9211e1c..68eab69 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -673,7 +673,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) return ERROR_SUCCESS; } -static UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) +UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; HRESULT r; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d408c49..ec0bf30 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1966,23 +1966,23 @@ static void test_binary_import(void) GetCurrentDirectory(MAX_PATH, path); r = MsiDatabaseImport(hdb, path, "bin_import.idt"); - todo_wine ok(r == ERROR_SUCCESS , "Failed to import Binary table\n"); + ok(r == ERROR_SUCCESS , "Failed to import Binary table\n"); /* read file from the Binary table */ query = "SELECT * FROM `Binary`"; r = do_query(hdb, query, &rec); - todo_wine ok(r == ERROR_SUCCESS, "SELECT query failed: %d\n", r); + ok(r == ERROR_SUCCESS, "SELECT query failed: %d\n", r); size = MAX_PATH; r = MsiRecordGetString(rec, 1, file, &size); - todo_wine ok(r == ERROR_SUCCESS, "Failed to get string: %d\n", r); - todo_wine ok(!lstrcmp(file, "filename1"), "Expected 'filename1', got %s\n", file); + ok(r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok(!lstrcmp(file, "filename1"), "Expected 'filename1', got %s\n", file); size = MAX_PATH; memset(buf, 0, MAX_PATH); r = MsiRecordReadStream(rec, 2, buf, &size); - todo_wine ok(r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); - todo_wine ok(!lstrcmp(buf, "just some words"), + ok(r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + ok(!lstrcmp(buf, "just some words"), "Expected 'just some words', got %s\n", buf); r = MsiCloseHandle(rec);

1 0

Hib Eris : msi: Initialize a variable.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 086fcfc1f481d70d1c59bb00bc4fcad23e5f999b URL: http://source.winehq.org/git/wine.git/?a=commit;h=086fcfc1f481d70d1c59bb00b… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:00 2009 +0200 msi: Initialize a variable. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ec944be..c0df1e5 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1264,7 +1264,7 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) MERGEDATA *data = param; MERGETABLE *table = data->curtable; MERGEROW *mergerow; - MSIQUERY *dbview; + MSIQUERY *dbview = NULL; MSIRECORD *row = NULL; LPWSTR query; UINT r;

1 0

Hib Eris : msi: Fix merging tables with string primary keys.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 987d17dc6f4c04982de04ffa50b7dd2fa4fe7a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987d17dc6f4c04982de04ffa5… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:12 2009 +0200 msi: Fix merging tables with string primary keys. --- dlls/msi/database.c | 42 +++++++++++++++++++++++++++++++++++++++--- dlls/msi/tests/db.c | 10 +++++----- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c0df1e5..446a318 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1174,8 +1174,8 @@ done: static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) { MSIRECORD *colnames; - LPWSTR str; - UINT r, i = 0; + LPWSTR str, val; + UINT r, i = 0, sz = 0; int cmp; r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames); @@ -1190,7 +1190,43 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) } while (cmp); msiobj_release(&colnames->hdr); - return msi_dup_record_field(rec, i); + + r = MSI_RecordGetStringW(rec, i, NULL, &sz); + if (r != ERROR_SUCCESS) + return NULL; + sz++; + + if (MSI_RecordGetString(rec, i)) /* check record field is a string */ + { + /* quote string record fields */ + const WCHAR szQuote[] = {'\'', 0}; + sz += 2; + val = msi_alloc(sz*sizeof(WCHAR)); + if (!val) + return NULL; + + lstrcpyW(val, szQuote); + r = MSI_RecordGetStringW(rec, i, val+1, &sz); + lstrcpyW(val+1+sz, szQuote); + } + else + { + /* do not quote integer record fields */ + val = msi_alloc(sz*sizeof(WCHAR)); + if (!val) + return NULL; + + r = MSI_RecordGetStringW(rec, i, val, &sz); + } + + if (r != ERROR_SUCCESS) + { + ERR("failed to get string!\n"); + msi_free(val); + return NULL; + } + + return val; } static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7b650e0..c3bdd11 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6968,19 +6968,19 @@ static void test_dbmerge(void) /* primary key is string */ r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); query = "SELECT * FROM `One`"; r = do_query(hdb, query, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buf, &size); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); MsiCloseHandle(hrec);

1 0

Hib Eris : msi/tests: Add test for merging tables that are not in target database.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 97200b0b31cf130b997d614b88797d5644924806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97200b0b31cf130b997d614b8… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:18 2009 +0200 msi/tests: Add test for merging tables that are not in target database. --- dlls/msi/tests/db.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c3bdd11..931ccc9 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6952,6 +6952,46 @@ static void test_dbmerge(void) r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( `A` INT, `B` CHAR(72) PRIMARY KEY `A` )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 1, 'hi' )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* table from merged database is not in target database */ + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = do_query(hdb, query, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 2, buf, &size); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + /* nothing in MergeErrors */ + query = "SELECT * FROM `MergeErrors`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "CREATE TABLE `One` ( " "`A` CHAR(72), `B` INT PRIMARY KEY `A` )"; r = run_query(hdb, 0, query);

1 0

Stefan Dösinger : wined3d: Put some ARB declarations in the right place.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 2f3faf452646b8d249aeb827acdbc3d33fb54a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3faf452646b8d249aeb827a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 12:58:02 2009 +0200 wined3d: Put some ARB declarations in the right place. TMP_POS is only used in vertex shaders, declare it in the vshader specific code. The sRGB constants are only used by pixel shaders, so move them to the ps specific code, and avoid reading the stateblock. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d0382bb..1a10355 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -328,7 +328,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; DWORD i, cur, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF; @@ -352,8 +351,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } - /* Temporary Output register */ - shader_addline(buffer, "TEMP TMP_OUT;\n"); } for(i = 0; i < This->baseShader.limits.temporary; i++) { @@ -373,13 +370,6 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } } - if(device->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE] && pshader) { - shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", - srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", - srgb_sub_high, 0.0, 0.0, 0.0); - } - /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ @@ -2097,6 +2087,13 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } } + if(args->srgb_correction) { + shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); + } + /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); @@ -2168,6 +2165,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, priv_ctx.target_version = ARB; } + shader_addline(buffer, "TEMP TMP_OUT;\n"); if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); }

1 0

Stefan Dösinger : wined3d: Replace a few hardcoded Tx registers with proper name getters.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: da1b8d0c8e3be000a46f50d5489feb5f0203e7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1b8d0c8e3be000a46f50d54… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:09:49 2009 +0200 wined3d: Replace a few hardcoded Tx registers with proper name getters. --- dlls/wined3d/arb_program_shader.c | 82 ++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a0cb635..e2d6793 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1241,18 +1241,20 @@ static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); + char dst_str[50]; - char tmp[20]; - shader_arb_get_write_mask(ins, dst, tmp); - if (shader_version != WINED3D_SHADER_VERSION(1,4)) + if (shader_version < WINED3D_SHADER_VERSION(1,4)) { DWORD reg = dst->reg.idx; - shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg); + + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); + shader_addline(buffer, "MOV_SAT %s, fragment.texcoord[%u];\n", dst_str, reg); } else { char reg_src[40]; shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src); - shader_addline(buffer, "MOV R%u%s, %s;\n", dst->reg.idx, tmp, reg_src); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); + shader_addline(buffer, "MOV %s, %s;\n", dst_str, reg_src); } } @@ -1355,13 +1357,17 @@ static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins) { DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char src0_name[50]; + char src0_name[50], dst_name[50]; + BOOL is_color; + struct wined3d_shader_register tmp_reg = ins->dst[0].reg; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); /* The next instruction will be a texm3x2tex or texm3x2depth that writes to the uninitialized * T<reg+1> register. Use this register to store the calculated vector */ - shader_addline(buffer, "DP3 T%u.x, fragment.texcoord[%u], %s;\n", reg + 1, reg, src0_name); + tmp_reg.idx = reg + 1; + shader_arb_get_register_name(ins, &tmp_reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.x, fragment.texcoord[%u], %s;\n", dst_name, reg, src0_name); } static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) @@ -1374,9 +1380,10 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) char dst_str[50]; char src0_name[50]; char dst_reg[50]; + BOOL is_color; /* We know that we're writing to the uninitialized T<reg> register, so use it for temporary storage */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); @@ -1391,17 +1398,20 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char src0_name[50]; - unsigned int dst; + char src0_name[50], dst_name[50]; + struct wined3d_shader_register tmp_reg = ins->dst[0].reg; + BOOL is_color; /* There are always 2 texm3x3pad instructions followed by one texm3x3[tex,vspec, ...] instruction, with * incrementing ins->dst[0].register_idx numbers. So the pad instruction already knows the final destination * register, and this register is uninitialized(otherwise the assembler complains that it is 'redeclared') */ - dst = reg + 2 - current_state->current_row; + tmp_reg.idx = reg + 2 - current_state->current_row; + shader_arb_get_register_name(ins, &tmp_reg, dst_name, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 T%u.%c, fragment.texcoord[%u], %s;\n", dst, 'x' + current_state->current_row, reg, src0_name); + shader_addline(buffer, "DP3 %s%u.%c, fragment.texcoord[%u], %s;\n", + dst_name, tmp_reg.idx, 'x' + current_state->current_row, reg, src0_name); current_state->texcoord_w[current_state->current_row++] = reg; } @@ -1414,17 +1424,17 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; - char dst_reg[8]; - char src0_name[50]; + char src0_name[50], dst_name[50]; + BOOL is_color; - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_name, reg, src0_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1439,11 +1449,12 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins char dst_str[50]; char src0_name[50]; char dst_reg[8]; + BOOL is_color; /* Get the dst reg without writemask strings. We know this register is uninitialized, so we can use all * components for temporary data storage */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); @@ -1481,18 +1492,19 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) char src0_name[50]; char src1_name[50]; char dst_reg[8]; + BOOL is_color; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_arb_get_src_param(ins, &ins->src[0], 1, src1_name); - /* Note: TMP.xy is input here, generated by two texm3x3pad instructions */ - sprintf(dst_reg, "T%u", reg); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_reg, &is_color); + /* Note: dst_reg.xy is input here, generated by two texm3x3pad instructions */ shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Calculate reflection vector. * - * dot(N, E) - * TMP.xyz = 2 * --------- * N - E - * dot(N, N) + * dot(N, E) + * dst_reg.xyz = 2 * --------- * N - E + * dot(N, N) * * Which normalizes the normal vector */ @@ -1577,13 +1589,15 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[50]; + char dst_str[50], dst_name[50]; char src0[50]; + BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 T%u.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, dst->reg.idx, src0); - shader_addline(buffer, "MOV %s, T%u;\n", dst_str, dst->reg.idx); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_name, dst->reg.idx, src0); + shader_addline(buffer, "MOV %s, %s;\n", dst_str, dst_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB: @@ -1594,20 +1608,22 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x2depth(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - DWORD dst_reg = ins->dst[0].reg.idx; - char src0[50]; + const struct wined3d_shader_dst_param *dst = &ins->dst[0]; + char src0[50], dst_name[50]; + BOOL is_color; shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 T%u.y, fragment.texcoord[%u], %s;\n", dst_reg, dst_reg, src0); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_name, dst->reg.idx, src0); /* How to deal with the special case dst_name.g == 0? if r != 0, then * the r * (1 / 0) will give infinity, which is clamped to 1.0, the correct * result. But if r = 0.0, then 0 * inf = 0, which is incorrect. */ - shader_addline(buffer, "RCP T%u.y, T%u.y;\n", dst_reg, dst_reg); - shader_addline(buffer, "MUL T%u.x, T%u.x, T%u.y;\n", dst_reg, dst_reg, dst_reg); - shader_addline(buffer, "MIN T%u.x, T%u.x, one.x;\n", dst_reg, dst_reg); - shader_addline(buffer, "MAX result.depth, T%u.x, 0.0;\n", dst_reg); + shader_addline(buffer, "RCP %s.y, %s.y;\n", dst_name, dst_name); + shader_addline(buffer, "MUL %s.x, %s.x, %s.y;\n", dst_name, dst_name, dst_name); + shader_addline(buffer, "MIN %s.x, %s.x, one.x;\n", dst_name, dst_name); + shader_addline(buffer, "MAX result.depth, %s.x, 0.0;\n", dst_name); } /** Handles transforming all WINED3DSIO_M?x? opcodes for

1 0

Stefan Dösinger : wined3d: Get rid of Tx hardcoding in texbem.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: f484cbbf916ed80a4f79fbe61d8a7902c900343b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f484cbbf916ed80a4f79fbe61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 9 01:05:46 2009 +0200 wined3d: Get rid of Tx hardcoding in texbem. --- dlls/wined3d/arb_program_shader.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e2d6793..d0382bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1311,9 +1311,8 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; const struct wined3d_shader_dst_param *dst = &ins->dst[0]; - DWORD src = ins->src[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char reg_coord[40], dst_reg[50]; + char reg_coord[40], dst_reg[50], src_reg[50]; DWORD reg_dest_code; /* All versions have a destination register. The Tx where the texture coordinates come @@ -1321,15 +1320,16 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) */ reg_dest_code = dst->reg.idx; shader_arb_get_dst_param(ins, &ins->dst[0], dst_reg); + shader_arb_get_src_param(ins, &ins->src[0], 0, src_reg); sprintf(reg_coord, "fragment.texcoord[%u]", reg_dest_code); /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed * The Tx in which the perturbation map is stored is the tempreg incarnation of the texture register */ shader_addline(buffer, "SWZ TB, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); - shader_addline(buffer, "DP3 TA.x, TB, T%u;\n", src); + shader_addline(buffer, "DP3 TA.x, TB, %s;\n", src_reg); shader_addline(buffer, "SWZ TB, bumpenvmat%d, y, w, 0, 0;\n", reg_dest_code); - shader_addline(buffer, "DP3 TA.y, TB, T%u;\n", src); + shader_addline(buffer, "DP3 TA.y, TB, %s;\n", src_reg); /* with projective textures, texbem only divides the static texture coord, not the displacement, * so we can't let the GL handle this. @@ -1347,8 +1347,9 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) if (ins->handler_idx == WINED3DSIH_TEXBEML) { - shader_addline(buffer, "MAD TA, T%u.z, luminance%d.x, luminance%d.y;\n", - src, reg_dest_code, reg_dest_code); + /* No src swizzles are allowed, so this is ok */ + shader_addline(buffer, "MAD TA, %s.z, luminance%d.x, luminance%d.y;\n", + src_reg, reg_dest_code, reg_dest_code); shader_addline(buffer, "MUL %s, %s, TA;\n", dst_reg, dst_reg); } }

1 0