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

Hib Eris : msi/tests: Add tests for order of tables.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 19d783d34d914615f41cb6fc66edcfdf0c3b4f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d783d34d914615f41cb6fc6… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:26:06 2009 +0200 msi/tests: Add tests for order of tables. --- dlls/msi/tests/db.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2d296b5..75a0ebe 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4295,6 +4295,160 @@ static void test_special_tables(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); } +static void test_tables_order(void) +{ + const char *query; + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + UINT r; + char buffer[100]; + DWORD sz; + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `foo` ( " + "`baz` INT NOT NULL PRIMARY KEY `baz`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + query = "CREATE TABLE `bar` ( " + "`foo` INT NOT NULL PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + query = "CREATE TABLE `baz` ( " + "`bar` INT NOT NULL, " + "`baz` INT NOT NULL, " + "`foo` INT NOT NULL PRIMARY KEY `bar`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + /* The names of the tables in the _Tables table must + be in the same order as these names are created in + the strings table. */ + query = "SELECT * FROM `_Tables`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* The names of the tables in the _Columns table must + be in the same order as these names are created in + the strings table. */ + query = "SELECT * FROM `_Columns`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); +} + static void test_select_markers(void) { MSIHANDLE hdb = 0, rec, view, res; @@ -7942,6 +8096,7 @@ START_TEST(db) test_integers(); test_update(); test_special_tables(); + test_tables_order(); test_select_markers(); test_viewmodify_update(); test_stringtable();

1 0

Hib Eris : msi: Insert new tables in correct _Tables location.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 65ac2061946398934951dd201582f879cd70af9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ac2061946398934951dd201… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:28:57 2009 +0200 msi: Insert new tables in correct _Tables location. --- dlls/msi/table.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/db.c | 14 +++++++------- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0b5b991..dc21b3b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -121,6 +121,7 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); +static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx); static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col ) { @@ -620,6 +621,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, column_info *col; MSITABLE *table; UINT i; + INT idx; /* only add tables that don't exist already */ if( TABLE_Exists(db, name ) ) @@ -685,7 +687,11 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = tv->ops->insert_row( tv, rec, -1, persistent == MSICONDITION_FALSE ); + r = table_find_insert_idx (tv, name, &idx); + if (r != ERROR_SUCCESS) + idx = -1; + + r = tv->ops->insert_row( tv, rec, idx, persistent == MSICONDITION_FALSE ); TRACE("insert_row returned %x\n", r); if( r ) goto err; @@ -735,7 +741,11 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = tv->ops->insert_row( tv, rec, -1, FALSE ); + r = table_find_insert_idx (tv, name, &idx); + if (r != ERROR_SUCCESS) + idx = -1; + + r = tv->ops->insert_row( tv, rec, idx, FALSE ); if( r ) goto err; @@ -2923,3 +2933,29 @@ void msi_free_transforms( MSIDATABASE *db ) msi_free( t ); } } + +static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx) +{ + UINT r, name_id, row_id; + INT idx; + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + + TRACE ("%p %s\n", view, debugstr_w(name)); + + r = msi_string2idW(tv->db->strings, name, &name_id); + if (r != ERROR_SUCCESS) + { + *pidx = -1; + return r; + } + + for( idx = 0; idx < tv->table->row_count; idx++ ) + { + r = TABLE_fetch_int( &tv->view, idx, 1, &row_id ); + if (row_id > name_id) + break; + } + + *pidx = idx; + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 75a0ebe..43b5648 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4346,7 +4346,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4355,7 +4355,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4391,11 +4391,11 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4408,7 +4408,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4421,7 +4421,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4430,7 +4430,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Hib Eris : msi: Release msi_custom_action_info when no longer needed.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e86ebd75b0eeaa882137ff0a4d46b84fe7c4c3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86ebd75b0eeaa882137ff0a4… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:48:11 2009 +0200 msi: Release msi_custom_action_info when no longer needed. --- dlls/msi/custom.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fa8f951..66751ca 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -888,7 +888,9 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeDll( package, type, tmp_file, target, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, @@ -1167,9 +1169,7 @@ static DWORD ACTION_CallScript( const GUID *guid ) else ERR("failed to create handle for %p\n", info->package ); - if (info->type & msidbCustomActionTypeAsync && - info->type & msidbCustomActionTypeContinue) - release_custom_action_data( info ); + release_custom_action_data( info ); return S_OK; } @@ -1226,13 +1226,16 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { + UINT r; msi_custom_action_info *info; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, @@ -1277,6 +1280,7 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); + release_custom_action_data( info ); done: msi_free(bufferw);

1 0

Hib Eris : msi: Release more msi_custom_action_info when no longer needed.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 5392014e29d0d93184b58dbd25ddda08a10271ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5392014e29d0d93184b58dbd2… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:48:21 2009 +0200 msi: Release more msi_custom_action_info when no longer needed. --- dlls/msi/custom.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 66751ca..3476f0d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -851,6 +851,7 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, msi_custom_action_info *info; WCHAR package_path[MAX_PATH]; DWORD size; + UINT r; static const WCHAR backslash[] = {'\\',0}; @@ -863,7 +864,9 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - return wait_thread_handle(info); + r = wait_thread_handle(info); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, @@ -953,6 +956,7 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIFILE *file; + UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -965,7 +969,9 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, @@ -1345,6 +1351,7 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); + release_custom_action_data( info ); done: msi_free(bufferw); @@ -1357,6 +1364,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; WCHAR *prop; + UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -1366,7 +1374,9 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); msi_free(prop); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } void ACTION_FinishCustomActions(const MSIPACKAGE* package)

1 0

Detlef Riekenberg : urlmon: Implement ZoneManager_GetZoneAttributes.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 7e1372387411bcaacf1cd11868a78a60c3011c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1372387411bcaacf1cd1186… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 22 00:39:11 2009 +0200 urlmon: Implement ZoneManager_GetZoneAttributes. --- dlls/urlmon/sec_mgr.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 943b6dd..19286b1 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -29,7 +29,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0}; +static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR fileW[] = {'f','i','l','e',0}; +static const WCHAR flagsW[] = {'F','l','a','g','s',0}; +static const WCHAR iconW[] = {'I','c','o','n',0}; +static const WCHAR minlevelW[] = {'M','i','n','L','e','v','e','l',0}; +static const WCHAR recommendedlevelW[] = {'R','e','c','o','m','m','e','n','d','e','d', + 'L','e','v','e','l',0}; + +/******************************************************************** + * get_string_from_reg [internal] + * + * helper to get a string from the reg. + * + */ +static void get_string_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPWSTR out, DWORD maxlen) +{ + DWORD type = REG_SZ; + DWORD len = maxlen * sizeof(WCHAR); + DWORD res; + + res = RegQueryValueExW(hcu, name, NULL, &type, (LPBYTE) out, &len); + + if (res && hklm) { + len = maxlen * sizeof(WCHAR); + type = REG_SZ; + res = RegQueryValueExW(hklm, name, NULL, &type, (LPBYTE) out, &len); + } + + if (res) { + TRACE("%s failed: %d\n", debugstr_w(name), res); + *out = '\0'; + } +} + +/******************************************************************** + * get_dword_from_reg [internal] + * + * helper to get a dword from the reg. + * + */ +static void get_dword_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPDWORD out) +{ + DWORD type = REG_DWORD; + DWORD len = sizeof(DWORD); + DWORD res; + + res = RegQueryValueExW(hcu, name, NULL, &type, (LPBYTE) out, &len); + + if (res && hklm) { + len = sizeof(DWORD); + type = REG_DWORD; + res = RegQueryValueExW(hklm, name, NULL, &type, (LPBYTE) out, &len); + } + + if (res) { + TRACE("%s failed: %d\n", debugstr_w(name), res); + *out = 0; + } +} static HRESULT get_zone_from_reg(LPCWSTR schema, DWORD *zone) { @@ -677,8 +737,35 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManager* iface, DWORD dwZone, ZONEATTRIBUTES* pZoneAttributes) { - FIXME("(%p)->(%d %p) stub\n", iface, dwZone, pZoneAttributes); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + HRESULT hr; + HKEY hcu; + HKEY hklm = NULL; + + TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes); + + if (!pZoneAttributes) + return E_INVALIDARG; + + hr = open_zone_key(HKEY_CURRENT_USER, dwZone, &hcu); + if (FAILED(hr)) + return S_OK; /* IE6 and older returned E_FAIL here */ + + hr = open_zone_key(HKEY_LOCAL_MACHINE, dwZone, &hklm); + if (FAILED(hr)) + TRACE("Zone %d not in HKLM\n", dwZone); + + get_string_from_reg(hcu, hklm, displaynameW, pZoneAttributes->szDisplayName, MAX_ZONE_PATH); + get_string_from_reg(hcu, hklm, descriptionW, pZoneAttributes->szDescription, MAX_ZONE_DESCRIPTION); + get_string_from_reg(hcu, hklm, iconW, pZoneAttributes->szIconPath, MAX_ZONE_PATH); + get_dword_from_reg(hcu, hklm, minlevelW, &pZoneAttributes->dwTemplateMinLevel); + get_dword_from_reg(hcu, hklm, currentlevelW, &pZoneAttributes->dwTemplateCurrentLevel); + get_dword_from_reg(hcu, hklm, recommendedlevelW, &pZoneAttributes->dwTemplateRecommended); + get_dword_from_reg(hcu, hklm, flagsW, &pZoneAttributes->dwFlags); + + RegCloseKey(hklm); + RegCloseKey(hcu); + return S_OK; } /********************************************************************

1 0

Aric Stewart : user32: Update Japanese resources.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 98a2b202dd89a7d26489db8970376062fe0a67df URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a2b202dd89a7d26489db897… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Jun 21 16:55:29 2009 +0900 user32: Update Japanese resources. --- dlls/user32/resources/user32_Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc index 19ba770..07121c4 100644 --- a/dlls/user32/resources/user32_Ja.rc +++ b/dlls/user32/resources/user32_Ja.rc @@ -62,8 +62,8 @@ BEGIN PUSHBUTTON "無視(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "はい(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "いいえ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "再試行(&T)", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "続ける(&C)", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "ヘルプ", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Hwang YunSong : start: Updated Korean resource.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 75b89c931b8ad14557e1068210b37ad050fc7870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b89c931b8ad14557e106821… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 22 09:46:15 2009 +0900 start: Updated Korean resource. --- programs/start/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index bc58ebc..871aadc 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -35,7 +35,7 @@ Options:\n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ /W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ /Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ -/ProgIDOpen Open a document using the following progID.\n\ +/ProgIDOpen �� progID�� ؼ� �� .\n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\

1 0

Henri Verbeet : wined3d: Simplify the transformed position fixup a bit.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 37491bb5d1f9bdb9b68929b6fe38114fe22674eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=37491bb5d1f9bdb9b68929b6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:57 2009 +0200 wined3d: Simplify the transformed position fixup a bit. --- dlls/wined3d/buffer.c | 26 +++++++------------------- dlls/wined3d/directx.c | 9 ++++++--- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e9f3ff6..8896db9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -506,27 +506,15 @@ static inline void fixup_d3dcolor(DWORD *dst_color) static inline void fixup_transformed_pos(float *p) { - float x, y, z, w; - - /* rhw conversion like in drawStridedSlow */ - if (p[3] == 1.0 || ((p[3] < eps) && (p[3] > -eps))) - { - x = p[0]; - y = p[1]; - z = p[2]; - w = 1.0; - } - else + /* rhw conversion like in position_float4(). */ + if (p[3] != 1.0 && p[3] != 0.0) { - w = 1.0 / p[3]; - x = p[0] * w; - y = p[1] * w; - z = p[2] * w; + float w = 1.0 / p[3]; + p[0] *= w; + p[1] *= w; + p[2] *= w; + p[3] = w; } - p[0] = x; - p[1] = y; - p[2] = z; - p[3] = w; } const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 28f07ef..df5d4cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4316,13 +4316,16 @@ static void WINE_GLAPI position_float4(const void *data) { const GLfloat *pos = data; - if (pos[3] < eps && pos[3] > -eps) - glVertex3fv(pos); - else { + if (pos[3] != 0.0 && pos[3] != 1.0) + { float w = 1.0 / pos[3]; glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); } + else + { + glVertex3fv(pos); + } } static void WINE_GLAPI diffuse_d3dcolor(const void *data)

1 0

Henri Verbeet : wined3d: Move the num_untracked_materials lookup out of the main drawing loop.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 9a58f37cd39d5dc8c1526eeb0b5d0c63cb43bcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a58f37cd39d5dc8c1526eeb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:58 2009 +0200 wined3d: Move the num_untracked_materials lookup out of the main drawing loop. --- dlls/wined3d/drawprim.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c644aa2..dcdf21a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -86,6 +86,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i const BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; const BYTE *diffuse = NULL, *specular = NULL, *normal = NULL, *position = NULL; const struct wined3d_stream_info_element *element; + UINT num_untracked_materials; DWORD tex_mask = 0; TRACE("Using slow vertex array code\n"); @@ -121,7 +122,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i element = &si->elements[WINED3D_FFP_DIFFUSE]; if (element->data) diffuse = element->data + streamOffset[element->stream_idx]; else glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - if (This->activeContext->num_untracked_materials && element->format_desc->format != WINED3DFMT_A8R8G8B8) + num_untracked_materials = This->activeContext->num_untracked_materials; + if (num_untracked_materials && element->format_desc->format != WINED3DFMT_A8R8G8B8) FIXME("Implement diffuse color tracking from %s\n", debug_d3dformat(element->format_desc->format)); element = &si->elements[WINED3D_FFP_SPECULAR]; @@ -246,7 +248,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i const void *ptrToCoords = diffuse + SkipnStrides * si->elements[WINED3D_FFP_DIFFUSE].stride; diffuse_funcs[si->elements[WINED3D_FFP_DIFFUSE].format_desc->emit_idx](ptrToCoords); - if(This->activeContext->num_untracked_materials) { + if (num_untracked_materials) + { DWORD diffuseColor = ((const DWORD *)ptrToCoords)[0]; unsigned char i; float color[4]; @@ -256,7 +259,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i color[2] = D3DCOLOR_B_B(diffuseColor) / 255.0; color[3] = D3DCOLOR_B_A(diffuseColor) / 255.0; - for(i = 0; i < This->activeContext->num_untracked_materials; i++) { + for (i = 0; i < num_untracked_materials; ++i) + { glMaterialfv(GL_FRONT_AND_BACK, This->activeContext->untracked_materials[i], color); } }

1 0

Henri Verbeet : wined3d: Get rid of DEBUG_SINGLE_MODE.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 7598ab2c849a50ca482becab3d19fc1b3b6af7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7598ab2c849a50ca482becab3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:59 2009 +0200 wined3d: Get rid of DEBUG_SINGLE_MODE. --- dlls/wined3d/directx.c | 82 ++++++++++++++++++++--------------------------- 1 files changed, 35 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index df5d4cc..25fd4d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -22,13 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Compile time diagnostics: */ - -#ifndef DEBUG_SINGLE_MODE -/* Set to 1 to force only a single display mode to be exposed: */ -#define DEBUG_SINGLE_MODE 0 -#endif - #include "config.h" #include <assert.h> #include "wined3d_private.h" @@ -1572,40 +1565,39 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { /* Display */ - int i = 0; - int j = 0; + unsigned int i = 0; + unsigned int j = 0; + DEVMODEW mode; - if (!DEBUG_SINGLE_MODE) { - DEVMODEW DevModeW; + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); - ZeroMemory(&DevModeW, sizeof(DevModeW)); - DevModeW.dmSize = sizeof(DevModeW); - while (EnumDisplaySettingsExW(NULL, j, &DevModeW, 0)) { - j++; - switch (Format) - { - case WINED3DFMT_UNKNOWN: - /* This is for D3D8, do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || - DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_X8R8G8B8: - if (DevModeW.dmBitsPerPel == 32) i++; - break; - case WINED3DFMT_R5G6B5: - if (DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_P8: - if (DevModeW.dmBitsPerPel == 8) i++; - break; - default: - /* Skip other modes as they do not match the requested format */ - break; - } + while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) + { + ++j; + switch (Format) + { + case WINED3DFMT_UNKNOWN: + /* This is for D3D8, do not enumerate P8 here */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + break; + + case WINED3DFMT_X8R8G8B8: + if (mode.dmBitsPerPel == 32) ++i; + break; + + case WINED3DFMT_R5G6B5: + if (mode.dmBitsPerPel == 16) ++i; + break; + + case WINED3DFMT_P8: + if (mode.dmBitsPerPel == 8) ++i; + break; + + default: + /* Skip other modes as they do not match the requested format */ + break; } - } else { - i = 1; - j = 1; } TRACE_(d3d_caps)("(%p}->(Adapter: %d) => %d (out of %d)\n", This, Adapter, i, j); @@ -1629,7 +1621,8 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte } /* TODO: Store modes per adapter and read it from the adapter structure */ - if (Adapter == 0 && !DEBUG_SINGLE_MODE) { /* Display */ + if (Adapter == 0) + { DEVMODEW DevModeW; int ModeIdx = 0; UINT i = 0; @@ -1693,14 +1686,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte pMode->RefreshRate, pMode->Format, debug_d3dformat(pMode->Format), DevModeW.dmBitsPerPel); - } else if (DEBUG_SINGLE_MODE) { - /* Return one setting of the format requested */ - if (Mode > 0) return WINED3DERR_INVALIDCALL; - pMode->Width = 800; - pMode->Height = 600; - pMode->RefreshRate = 60; - pMode->Format = (Format == WINED3DFMT_UNKNOWN) ? WINED3DFMT_X8R8G8B8 : Format; - } else { + } + else + { FIXME_(d3d_caps)("Adapter not primary display\n"); }

1 0