September 2006 - Wine-commits

James Hawkins : msi: Fix the results of a few tests to match Windows.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 6ac0f3ed29802487898623d256a6906786416556 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ac0f3ed29802487898623d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:55:55 2006 -0700 msi: Fix the results of a few tests to match Windows. --- dlls/msi/tests/package.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 566ae94..bc02061 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2603,30 +2603,21 @@ static void test_featureparents(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "zodiac", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "perseus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "orion", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", action); state = 0xdeadbee;

1 0

James Hawkins : msi: Initialize all features' action states to INSTALLSTATE_UNKNOWN.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: ca5c11009da675aae6407bcf5c74f57baab4d128 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca5c11009da675aae6407bc… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:53:56 2006 -0700 msi: Initialize all features' action states to INSTALLSTATE_UNKNOWN. --- dlls/msi/action.c | 2 +- dlls/msi/tests/package.c | 50 +++++++++------------------------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index defc9ce..aeacd6d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1240,7 +1240,7 @@ static UINT load_feature(MSIRECORD * row feature->Directory = msi_dup_record_field( row, 7 ); feature->Attributes = MSI_RecordGetInteger(row,8); - feature->Installed = INSTALLSTATE_ABSENT; + feature->Installed = INSTALLSTATE_UNKNOWN; feature->Action = INSTALLSTATE_UNKNOWN; feature->ActionRequest = INSTALLSTATE_UNKNOWN; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a39ea77..bda9dfe 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1795,50 +1795,35 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "four", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; @@ -1938,50 +1923,35 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "four", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee;

1 0

James Hawkins : msi: Only override a feature whose action state is INSTALLSTATE_SOURCE.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 937b9b2bbc0c2a264f124ddb5bd5e921e9eded02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=937b9b2bbc0c2a264f124dd… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:53:07 2006 -0700 msi: Only override a feature whose action state is INSTALLSTATE_SOURCE. --- dlls/msi/action.c | 2 + dlls/msi/tests/package.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a1b7155..defc9ce 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1774,7 +1774,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa } } - if (component->ForceLocalState) + if (component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) { feature->Action = INSTALLSTATE_LOCAL; feature->ActionRequest = INSTALLSTATE_LOCAL; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e07f86a..a39ea77 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1608,6 +1608,14 @@ static void test_states(void) r = add_feature_entry( hdb, "'three', '', '', '', 2, 1, '', 1" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* msidbFeatureAttributesFavorLocal */ + r = add_feature_entry( hdb, "'four', '', '', '', 2, 1, '', 0" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + + /* disabled */ + r = add_feature_entry( hdb, "'five', '', '', '', 2, 0, '', 1" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* msidbFeatureAttributesFavorSource:msidbComponentAttributesSourceOnly */ r = add_component_entry( hdb, "'eta', '{DD89003F-0DD4-41B8-81C0-3411A7DA2695}', 'TARGETDIR', 1, '', 'eta_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); @@ -1642,6 +1650,12 @@ static void test_states(void) r = add_feature_components_entry( hdb, "'three', 'eta'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'four', 'eta'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'five', 'eta'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = create_file_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create File table: %d\n", r ); @@ -1699,6 +1713,20 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "four", &state, &action); + ok( r == ERROR_UNKNOWN_FEATURE, "Expected ERROR_UNKNOWN_FEATURE, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "five", &state, &action); + ok( r == ERROR_UNKNOWN_FEATURE, "Expected ERROR_UNKNOWN_FEATURE, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "alpha", &state, &action); ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); @@ -1795,6 +1823,26 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "four", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "five", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "alpha", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -1918,6 +1966,26 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "four", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "five", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + todo_wine + { + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "alpha", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); todo_wine @@ -2032,6 +2100,20 @@ static void test_states(void) state = 0xdeadbee; action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "four", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetFeatureState(hpkg, "five", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; r = MsiGetComponentState(hpkg, "alpha", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state);

1 0

Alexandre Julliard : wininet/tests: Don' t fail the tests if the network is unreachable.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c56eec22e2ad93de1b1d10490b293af2e9486997 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c56eec22e2ad93de1b1d104… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 12:44:56 2006 +0200 wininet/tests: Don't fail the tests if the network is unreachable. --- dlls/wininet/tests/http.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 404d705..ff4526d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -591,7 +591,12 @@ static void HttpSendRequestEx_test(void) ok( hConnect != NULL, "Unable to connect to http://crossover.codeweavers.com\n"); hRequest = HttpOpenRequest(hConnect, "POST", "/posttest.php", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); - ok( hRequest != NULL, "Failed to open request handle\n"); + if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) + { + trace( "Network unreachable, skipping test\n" ); + goto done; + } + ok( hRequest != NULL, "Failed to open request handle err %lx\n", GetLastError()); BufferIn.dwStructSize = sizeof( INTERNET_BUFFERS); @@ -622,6 +627,7 @@ static void HttpSendRequestEx_test(void) ok(strncmp(szBuffer,"mode => Test\n",dwBytesRead)==0,"Got string %s\n",szBuffer); ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); +done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } @@ -644,6 +650,11 @@ static void HttpHeaders_test(void) ok( hConnect != NULL, "Unable to connect to http://crossover.codeweavers.com\n"); hRequest = HttpOpenRequest(hConnect, "POST", "/posttest.php", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); + if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) + { + trace( "Network unreachable, skipping test\n" ); + goto done; + } ok( hRequest != NULL, "Failed to open request handle\n"); index = 0; @@ -799,6 +810,7 @@ static void HttpHeaders_test(void) ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); +done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); ok(InternetCloseHandle(hSession), "Close session handle failed\n"); }

1 0

James Hawkins : advpack: backup should be a const string.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 319cac4c1fd497ba68445201b95278417b5cfd22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=319cac4c1fd497ba6844520… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 20 19:51:53 2006 -0700 advpack: backup should be a const string. --- dlls/advpack/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 1d02443..0442d41 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -59,7 +59,8 @@ HRESULT WINAPI AddDelBackupEntryA(LPCSTR LPCSTR lpcszBaseName, DWORD dwFlags) { UNICODE_STRING backupdir, basename; - LPWSTR filelist, backup; + LPWSTR filelist; + LPCWSTR backup; HRESULT res; TRACE("(%s, %s, %s, %ld)\n", debugstr_a(lpcszFileList),

1 0

Alexandre Julliard : urlmon/tests: Don' t fail the tests if the network is unreachable.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 7f5b4a4602ef6899b3ee23bfca8fb7fdec79c807 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f5b4a4602ef6899b3ee23b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 11:45:32 2006 +0200 urlmon/tests: Don't fail the tests if the network is unreachable. --- dlls/urlmon/tests/url.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d9ba6a6..282c311 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -26,6 +26,7 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" #include "urlmon.h" +#include "wininet.h" #include "wine/test.h" @@ -430,8 +431,12 @@ static HRESULT WINAPI statusclb_OnStopBi { CHECK_EXPECT(OnStopBinding); - ok(SUCCEEDED(hresult), "Download failed: %08lx\n", hresult); - ok(szError == NULL, "szError should be NULL\n"); + /* ignore DNS failure */ + if (hresult != HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) + { + ok(SUCCEEDED(hresult), "Download failed: %08lx\n", hresult); + ok(szError == NULL, "szError should be NULL\n"); + } stopped_binding = TRUE; return S_OK; @@ -659,6 +664,11 @@ static void test_BindToStorage(void) } hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); + if (test_protocol == HTTP_TEST && hres == HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) + { + trace( "Network unreachable, skipping tests\n" ); + return; + } ok(SUCCEEDED(hres), "IMoniker_BindToStorage failed: %08lx\n", hres); if (!SUCCEEDED(hres)) return;

1 0

Michael Stefaniuc : include: Make the return type of mmioSendMessage16 in the function declaration match that of the function definition .
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 4a0234e4bf704474de45f01d330d257e40bf547c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a0234e4bf704474de45f01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 20 23:32:13 2006 +0200 include: Make the return type of mmioSendMessage16 in the function declaration match that of the function definition. --- include/wine/mmsystem16.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index 0a39b63..a062191 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -443,7 +443,7 @@ MMRESULT16 WINAPI mmioSetInfo16(HMMIO16 UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16); UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT16 WINAPI mmioAdvance16(HMMIO16,MMIOINFO16*,UINT16); -LONG WINAPI mmioSendMessage16(HMMIO16,UINT16,LPARAM,LPARAM); +LRESULT WINAPI mmioSendMessage16(HMMIO16,UINT16,LPARAM,LPARAM); UINT16 WINAPI mmioDescend16(HMMIO16,MMCKINFO*,const MMCKINFO*,UINT16); UINT16 WINAPI mmioAscend16(HMMIO16,MMCKINFO*,UINT16); UINT16 WINAPI mmioCreateChunk16(HMMIO16,MMCKINFO*,UINT16);

1 0

Roderick Colenbrander : opengl: Move wgl font code to winex11.drv.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: b669fcaf7ba275d23ab445d195fb1898a9361934 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b669fcaf7ba275d23ab445d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Sep 20 23:23:17 2006 +0200 opengl: Move wgl font code to winex11.drv. --- dlls/opengl32/wgl.c | 160 ++------------------------------- dlls/winex11.drv/opengl.c | 180 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 2 3 files changed, 191 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b669fcaf7ba275d23ab…

1 0

Benjamin Arai : msi: Adds test to check if basic "JOIN" operator without " WHERE" clause returns the correct results.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a35ff56580329de3a1dc2aa47029568550c23ba6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a35ff56580329de3a1dc2aa… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 20 16:59:19 2006 -0700 msi: Adds test to check if basic "JOIN" operator without "WHERE" clause returns the correct results. --- dlls/msi/tests/db.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 400e920..d75d44e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1776,6 +1776,14 @@ struct join_res const CHAR two[MAX_PATH]; }; +struct join_res_4col +{ + const CHAR one[MAX_PATH]; + const CHAR two[MAX_PATH]; + const CHAR three[MAX_PATH]; + const CHAR four[MAX_PATH]; +}; + static const struct join_res join_res_first[] = { { "alveolar", "procerus" }, @@ -1824,6 +1832,16 @@ static const struct join_res join_res_se { "malar", "nasalis" }, }; +static const struct join_res_4col join_res_eighth[] = +{ + { "msvcp.dll", "msvcp.dll.01234", "msvcp.dll.01234", "abcdefgh" }, + { "msvcr.dll", "msvcr.dll.56789", "msvcp.dll.01234", "abcdefgh" }, + { "msvcp.dll", "msvcp.dll.01234", "msvcr.dll.56789", "ijklmnop" }, + { "msvcr.dll", "msvcr.dll.56789", "msvcr.dll.56789", "ijklmnop" }, + { "msvcp.dll", "msvcp.dll.01234", "single.dll.31415", "msvcp.dll" }, + { "msvcr.dll", "msvcr.dll.56789", "single.dll.31415", "msvcp.dll" }, +}; + static void test_join(void) { MSIHANDLE hdb, hview, hrec; @@ -2222,6 +2240,52 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "SELECT `StdDlls`.`File`, `Binary`.`Data` " + "FROM `StdDlls`, `Binary` "; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 2, "Expected 2 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].one ), + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_eighth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].four ), + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_eighth[i].four, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( i == 6, "Expected 6 rows, got %ld\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Benjamin Arai : msi: Adds test to check "JOIN" operator with "*" operator for the SELECT clause returns the correct results.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 4195697cc1405ecc9de4bb0d10790bbf4d37dd32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4195697cc1405ecc9de4bb0… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 20 17:00:35 2006 -0700 msi: Adds test to check "JOIN" operator with "*" operator for the SELECT clause returns the correct results. --- dlls/msi/tests/db.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d75d44e..5ccd731 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2286,6 +2286,62 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + query = "SELECT * FROM `StdDlls`, `Binary` "; + r = MsiDatabaseOpenView(hdb, query, &hview); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + } + + r = MsiViewExecute(hview, 0); + todo_wine + { + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + } + + i = 0; + while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS) + { + count = MsiRecordGetFieldCount( hrec ); + ok( count == 4, "Expected 4 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].one ), + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_eighth[i].one, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].two ), + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_eighth[i].two, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 3, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].three ), + "For (row %ld, column 3) expected '%s', go %s\n", i, join_res_eighth[i].three, buf ); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 4, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, join_res_eighth[i].four ), + "For (row %ld, column 4) expected '%s', got %s\n", i, join_res_eighth[i].four, buf ); + + i++; + MsiCloseHandle(hrec); + } + + todo_wine + { + ok( i == 6, "Expected 6 rows, got %ld\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0