wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aric Stewart : msctf: Implement ITfCompartment::GetValue.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 21c4671e0114d8beafbcea14a47976a3992e9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c4671e0114d8beafbcea14a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:02:24 2009 +0900 msctf: Implement ITfCompartment::GetValue. --- dlls/msctf/compartmentmgr.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 7e23b86..253bec7 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -436,9 +436,17 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, VARIANT *pvarValue) { + HRESULT hr = S_OK; Compartment *This = (Compartment *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This, pvarValue); + + if (!pvarValue) + return E_INVALIDARG; + + pvarValue->n1.n2.vt = VT_EMPTY; + if (!This->variant.n1.n2.vt == VT_EMPTY) + hr = VariantCopy(pvarValue,&This->variant); + return hr; } static const ITfCompartmentVtbl ITfCompartment_Vtbl ={

1 0

Joel Holdsworth : user32/tests: Added tests for DrawIcon and DrawIconEx.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: a7c8dad0bc76a335a9a9de6123a2a46c0b77cb23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c8dad0bc76a335a9a9de612… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Jun 16 14:59:58 2009 +0100 user32/tests: Added tests for DrawIcon and DrawIconEx. --- dlls/user32/tests/cursoricon.c | 278 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 278 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c8dad0bc76a335a9a9d…

1 0

Gerald Pfeifer : wined3d: Fix logical condition in find_clip_texcoord().
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 569b448e134e3b65e2ef4fc765e629e2c938be82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569b448e134e3b65e2ef4fc76… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jun 20 17:17:53 2009 +0200 wined3d: Fix logical condition in find_clip_texcoord(). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index affc2ae..44b4fce 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3856,7 +3856,7 @@ static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps, const WineD3D_GL_Inf { for(i = GL_LIMITS(texture_stages); i > 0; i--) { - if(!ps->baseShader.reg_maps.input_registers & (1 << (i - 1))) + if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) { shader_priv->clipplane_emulation = i; break;

1 0

Detlef Riekenberg : urlmon/tests: Add tests for ZoneManager_GetZoneAttributes.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3657c0af833b7a84bf5dbcce1f51e798fd1823dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3657c0af833b7a84bf5dbcce1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 22 00:41:18 2009 +0200 urlmon/tests: Add tests for ZoneManager_GetZoneAttributes. --- dlls/urlmon/tests/sec_mgr.c | 58 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index f90f5a5..325e1db 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -281,7 +281,7 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } -static void test_ZoneManager(void) +static void test_GetZoneActionPolicy(void) { IInternetZoneManager *zonemgr = NULL; BYTE buf[32]; @@ -321,6 +321,59 @@ static void test_ZoneManager(void) IInternetZoneManager_Release(zonemgr); } +static void test_GetZoneAttributes(void) +{ + IInternetZoneManager *zonemgr = NULL; + CHAR buffer [sizeof(ZONEATTRIBUTES) + 32]; + ZONEATTRIBUTES* pZA = (ZONEATTRIBUTES*) buffer; + HRESULT hr; + DWORD i; + + hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + /* native urlmon has Zone "0" upto Zone "4" since IE4 */ + for (i = 0; i < 5; i++) { + memset(buffer, -1, sizeof(buffer)); + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, i, pZA); + ok(hr == S_OK, "#%d: got 0x%x (expected S_OK)\n", i, hr); + } + + /* IE8 no longer set cbSize */ + memset(buffer, -1, sizeof(buffer)); + pZA->cbSize = 0; + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0, pZA); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok((pZA->cbSize == 0) || (pZA->cbSize == sizeof(ZONEATTRIBUTES)), + "got cbSize = %d (expected 0)\n", pZA->cbSize); + + memset(buffer, -1, sizeof(buffer)); + pZA->cbSize = 64; + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0, pZA); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok((pZA->cbSize == 64) || (pZA->cbSize == sizeof(ZONEATTRIBUTES)), + "got cbSize = %d (expected 64)\n", pZA->cbSize); + + memset(buffer, -1, sizeof(buffer)); + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0, pZA); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok((pZA->cbSize == 0xffffffff) || (pZA->cbSize == sizeof(ZONEATTRIBUTES)), + "got cbSize = 0x%x (expected 0xffffffff)\n", pZA->cbSize); + + /* IE8 no longer fail on invalid zones */ + memset(buffer, -1, sizeof(buffer)); + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0xdeadbeef, pZA); + ok(hr == S_OK || (hr == E_FAIL), + "got 0x%x (expected S_OK or E_FAIL)\n", hr); + + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} START_TEST(sec_mgr) @@ -329,7 +382,8 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); - test_ZoneManager(); + test_GetZoneActionPolicy(); + test_GetZoneAttributes(); OleUninitialize(); }

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

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

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: 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/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

Nikolay Sivov : comctl32/listview: XP SP3 comctl32 V6 test workaround.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 358fa6cd98648e97d234c792fadb4c22c45191fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=358fa6cd98648e97d234c792f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 21 18:01:11 2009 +0400 comctl32/listview: XP SP3 comctl32 V6 test workaround. --- dlls/comctl32/tests/listview.c | 51 ++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 060171c..6c6a3b8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3410,6 +3410,24 @@ static BOOL is_below_comctl_5(void) return !ret; } +static void unload_v6_module(ULONG_PTR cookie) +{ + HANDLE hKernel32; + BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); + if (!pDeactivateActCtx) + { + win_skip("Activation contexts unsupported\n"); + return; + } + + pDeactivateActCtx(0, cookie); + + DeleteFileA(manifest_name); +} + static BOOL load_v6_module(ULONG_PTR *pcookie) { HANDLE hKernel32; @@ -3421,6 +3439,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) BOOL ret; HANDLE file; DWORD written; + HWND hwnd; hKernel32 = GetModuleHandleA("kernel32.dll"); pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); @@ -3468,26 +3487,24 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) win_skip("A problem during context activation occured.\n"); DeleteFileA(manifest_name); } - - return ret; -} - -static void unload_v6_module(ULONG_PTR cookie) -{ - HANDLE hKernel32; - BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - if (!pDeactivateActCtx) + else { - win_skip("Activation contexts unsupported\n"); - return; + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, WC_LISTVIEW, "foo", + WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_REPORT, + 0, 0, 100, 100, + hwndparent, NULL, GetModuleHandleA(NULL), NULL); + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create ListView window.\n"); + unload_v6_module(*pcookie); + return FALSE; + } + else + DestroyWindow(hwnd); } - pDeactivateActCtx(0, cookie); - - DeleteFileA(manifest_name); + return ret; } static void test_get_set_view(void)

1 0

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 June 2009