wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Detlef Riekenberg : mlang/tests: Use a table for testing GetLcidFromRfc1766 .
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 7317a96616123a841e6d8e2be7e24f0b0b1ff345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7317a96616123a841e6d8e2be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 22:54:57 2009 +0200 mlang/tests: Use a table for testing GetLcidFromRfc1766. --- dlls/mlang/tests/mlang.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0f51df0..939f318 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -48,6 +48,19 @@ static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT); static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT); +typedef struct lcid_tag_table { + LPCSTR rfc1766; + LCID lcid; + HRESULT hr; +} lcid_table_entry; + +static const lcid_table_entry lcid_table[] = { + {"en", 9, S_OK}, /* only en is special (using PRIMARYLANGID) */ + {"en-gb", 0x809, S_OK}, + {"en-us", 0x409, S_OK} + +}; + static BOOL init_function_ptrs(void) { @@ -832,19 +845,33 @@ static void test_rfc1766(IMultiLanguage2 *iML2) static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) { + WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; LCID lcid; HRESULT ret; + DWORD i; static WCHAR e[] = { 'e',0 }; static WCHAR en[] = { 'e','n',0 }; static WCHAR empty[] = { 0 }; static WCHAR dash[] = { '-',0 }; static WCHAR e_dash[] = { 'e','-',0 }; - static WCHAR en_gb[] = { 'e','n','-','g','b',0 }; - static WCHAR en_us[] = { 'e','n','-','u','s',0 }; static WCHAR en_them[] = { 'e','n','-','t','h','e','m',0 }; static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; + + for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + lcid = -1; + MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); + + ok(ret == lcid_table[i].hr, + "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); + + ok(lcid == lcid_table[i].lcid, + "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); + } + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, NULL, en); ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); @@ -887,19 +914,6 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); } - lcid = 0; - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 9, "got wrong lcid: %04x\n", lcid); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_gb); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 0x809, "got wrong lcid: %04x\n", lcid); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_us); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 0x409, "got wrong lcid: %04x\n", lcid); } static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2)

1 0

Hib Eris : msi: Add support for merging tables that are not in target database.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: ff5b29e5eb13366593418368afde918bc09ff947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5b29e5eb13366593418368a… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:24 2009 +0200 msi: Add support for merging tables that are not in target database. --- dlls/msi/database.c | 288 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 12 +- 2 files changed, 236 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff5b29e5eb13366593418…

1 0

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

27 May '09

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

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

27 May '09

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 with string primary keys.
by Alexandre Julliard 27 May '09

27 May '09

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: Initialize a variable.
by Alexandre Julliard 27 May '09

27 May '09

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: Add support for importing binary OBJECTS.
by Alexandre Julliard 27 May '09

27 May '09

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

Alexandre Julliard : kernel32/tests: Run file tests in the temp directory if we don' t have access to the drive root.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 9ccc9bd6a957c9f3bafc336387901ba4eff6a8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccc9bd6a957c9f3bafc33638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 12:47:33 2009 +0200 kernel32/tests: Run file tests in the temp directory if we don't have access to the drive root. --- dlls/kernel32/tests/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 86ad4e5..2328d37 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1376,7 +1376,12 @@ static void test_FindFirstFileA(void) /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); - GetTempFileNameA( buffer, "foo", 0, nonexistent ); + if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ) && GetLastError() == ERROR_ACCESS_DENIED) + { + char tmp[MAX_PATH]; + GetTempPathA( sizeof(tmp), tmp ); + GetTempFileNameA( tmp, "foo", 0, nonexistent ); + } DeleteFileA( nonexistent ); strcpy(buffer2, nonexistent); strcat(buffer2, "\\");

1 0

Stefan Dösinger : wined3d: Work around an ARBFP vs GLSL bug in Mac OS.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 0629585c2401fd41cc8610a2f841a4db2fdeade6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0629585c2401fd41cc8610a2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 11:40:44 2009 +0200 wined3d: Work around an ARBFP vs GLSL bug in Mac OS. --- dlls/wined3d/context.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fb075d..ba1e100 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -946,6 +946,24 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } } + if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + /* MacOS(radeon X1600 at least, but most likely others too) refuses to draw if GLSL and ARBFP are + * enabled, but the currently bound arbfp program is 0. Enabling ARBFP with prog 0 is invalid, but + * GLSL should bypass this. This causes problems in programs that never use the fixed function pipeline, + * because the ARBFP extension is enabled by the ARBFP pipeline at context creation, but no program + * is ever assigned. + * + * So make sure a program is assigned to each context. The first real ARBFP use will set a different + * program and the dummy program is destroyed when the context is destroyed. + */ + const char *dummy_program = + "!!ARBfp1.0\n" + "MOV result.color, fragment.color.primary;\n" + "END\n"; + GL_EXTCALL(glGenProgramsARB(1, &ret->dummy_arbfp_prog)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, ret->dummy_arbfp_prog)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); + } for(s = 0; s < GL_LIMITS(point_sprite_units); s++) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); @@ -1065,6 +1083,9 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { TRACE("Destroy dst FBO %d\n", context->dst_fbo); context_destroy_fbo(This, &context->dst_fbo); } + if(context->dummy_arbfp_prog) { + GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + } LEAVE_GL(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f136dd8..1698504 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,6 +1234,7 @@ struct WineD3DContext { GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; + GLuint dummy_arbfp_prog; }; typedef enum ContextUsage {

1 0

Stefan Dösinger : wined3d: sincos for vertex shaders.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 64926223504cf03b5872a8545154bb6b32ae6473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64926223504cf03b5872a8545… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:11:50 2009 +0200 wined3d: sincos for vertex shaders. SCS is unfortunately a fragment program only instruction. If we have the NV extensions we can use SIN and COS. Otherwise we have to approximate sine and cosine with a taylor series. Luckily we're provided with the necessary constants by the application. --- dlls/d3d9/tests/visual.c | 77 ++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 95 +++++++++++++++++++++++++++++++++++-- 2 files changed, 167 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64926223504cf03b5872a…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009