July 2010 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Synchronize the spec file with version 5.0.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: c2c98ae0c2a9c265c0662952b8a68727662ff5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c98ae0c2a9c265c0662952b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:43:44 2010 +0200 msi: Synchronize the spec file with version 5.0. --- dlls/msi/msi.spec | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 94e3ed3..6fdebd8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -275,6 +275,20 @@ 279 stdcall MsiMessageBoxExA(long str str long long long long) 280 stdcall MsiMessageBoxExW(long wstr wstr long long long long) 281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) +282 stub MsiGetPatchFileListA +283 stub MsiGetPatchFileListW +284 stub MsiBeginTransactionA +285 stub MsiBeginTransactionW +286 stub MsiEndTransaction +287 stub MsiJoinTransaction +288 stub MsiSetOfflineContextW +289 stub MsiEnumComponentsExA +290 stub MsiEnumComponentsExW +291 stub MsiEnumClientsExA +292 stub MsiEnumClientsExW +293 stub MsiGetComponentPathExA +294 stub MsiGetComponentPathExW +295 stub QueryInstanceCount @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Hans Leidekker : msi: Register dlls directly in the SelfRegModules and SelfUnregModules actions.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 64eec8f9fac2893a351dd6d27a756c5c16bde07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64eec8f9fac2893a351dd6d27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:43:27 2010 +0200 msi: Register dlls directly in the SelfRegModules and SelfUnregModules actions. --- dlls/msi/action.c | 82 ++++++++++++++++++---------------------------------- 1 files changed, 29 insertions(+), 53 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a5c6654..bb559c0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4333,23 +4333,38 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static void register_dll( const WCHAR *dll, BOOL unregister ) +{ + HMODULE hmod; + + hmod = LoadLibraryExW( dll, 0, LOAD_WITH_ALTERED_SEARCH_PATH ); + if (hmod) + { + HRESULT (WINAPI *func_ptr)( void ); + const char *func = unregister ? "DllUnregisterServer" : "DllRegisterServer"; + + func_ptr = (void *)GetProcAddress( hmod, func ); + if (func_ptr) + { + HRESULT hr = func_ptr(); + if (FAILED( hr )) + WARN("failed to register dll 0x%08x\n", hr); + } + else + WARN("entry point %s not found\n", func); + FreeLibrary( hmod ); + return; + } + WARN("failed to load library %u\n", GetLastError()); +} + static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; LPCWSTR filename; - LPWSTR FullName; MSIFILE *file; - DWORD len; - static const WCHAR ExeStr[] = - {'r','e','g','s','v','r','3','2','.','e','x','e',' ','\"',0}; - static const WCHAR close[] = {'\"',0}; - STARTUPINFOW si; - PROCESS_INFORMATION info; - BOOL brc; MSIRECORD *uirow; - memset(&si,0,sizeof(STARTUPINFOW)); - filename = MSI_RecordGetString(row,1); file = get_loaded_file( package, filename ); @@ -4359,23 +4374,9 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } - len = strlenW(ExeStr) + strlenW( file->TargetPath ) + 2; - - FullName = msi_alloc(len*sizeof(WCHAR)); - strcpyW(FullName,ExeStr); - strcatW( FullName, file->TargetPath ); - strcatW(FullName,close); - - TRACE("Registering %s\n",debugstr_w(FullName)); - brc = CreateProcessW(NULL, FullName, NULL, NULL, FALSE, 0, NULL, c_colon, - &si, &info); + TRACE("Registering %s\n", debugstr_w( file->TargetPath )); - if (brc) - { - CloseHandle(info.hThread); - msi_dialog_check_messages(info.hProcess); - CloseHandle(info.hProcess); - } + register_dll( file->TargetPath, FALSE ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, filename ); @@ -4383,7 +4384,6 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) ui_actiondata( package, szSelfRegModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( FullName ); return ERROR_SUCCESS; } @@ -4410,21 +4410,11 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package) static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) { - static const WCHAR regsvr32[] = - {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"',0}; - static const WCHAR close[] = {'\"',0}; MSIPACKAGE *package = param; LPCWSTR filename; - LPWSTR cmdline; MSIFILE *file; - DWORD len; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - BOOL ret; MSIRECORD *uirow; - memset( &si, 0, sizeof(STARTUPINFOW) ); - filename = MSI_RecordGetString( row, 1 ); file = get_loaded_file( package, filename ); @@ -4434,22 +4424,9 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) return ERROR_SUCCESS; } - len = strlenW( regsvr32 ) + strlenW( file->TargetPath ) + 2; - - cmdline = msi_alloc( len * sizeof(WCHAR) ); - strcpyW( cmdline, regsvr32 ); - strcatW( cmdline, file->TargetPath ); - strcatW( cmdline, close ); - - TRACE("Unregistering %s\n", debugstr_w(cmdline)); + TRACE("Unregistering %s\n", debugstr_w( file->TargetPath )); - ret = CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, c_colon, &si, &pi ); - if (ret) - { - CloseHandle( pi.hThread ); - msi_dialog_check_messages( pi.hProcess ); - CloseHandle( pi.hProcess ); - } + register_dll( file->TargetPath, TRUE ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, filename ); @@ -4457,7 +4434,6 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) ui_actiondata( package, szSelfUnregModules, uirow ); msiobj_release( &uirow->hdr ); - msi_free( cmdline ); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Add some tests for MsiGetSourcePath.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 2b0c45674fac9b655e5e3339b740fe79cad6ae7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0c45674fac9b655e5e3339b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:42:56 2010 +0200 msi: Add some tests for MsiGetSourcePath. --- dlls/msi/tests/package.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e4f7136..c9e0d65 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10151,6 +10151,20 @@ static void test_MsiGetSourcePath(void) "Expected path to be unchanged, got \"%s\"\n", path); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); + ok(size == 0, "Expected 0, got %d\n", size); + /* try SourceDir */ size = MAX_PATH; lstrcpyA(path, "kiwi"); @@ -10172,6 +10186,13 @@ static void test_MsiGetSourcePath(void) /* source path does not exist, but the property exists */ size = MAX_PATH; lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyA(path, "kiwi"); r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); @@ -10455,6 +10476,31 @@ static void test_MsiGetSourcePath(void) ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + /* remove property */ + r = MsiSetProperty(hpkg, "SourceDir", NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try SourceDir again */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SourceDir", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + + /* set property to a valid directory */ + r = MsiSetProperty(hpkg, "SOURCEDIR", cwd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* try SOURCEDIR again */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r); + ok(!lstrcmpA(path, "kiwi"), + "Expected path to be unchanged, got \"%s\"\n", path); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + MsiCloseHandle(hpkg); /* compressed source */

1 0

Hans Leidekker : msi: Set/ unset the SourceDir property at the right stage in the execution sequence.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: bd634c0491297bf05803a2b7ac113ba56ad07207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd634c0491297bf05803a2b7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:42:37 2010 +0200 msi: Set/unset the SourceDir property at the right stage in the execution sequence. --- dlls/msi/action.c | 6 +- dlls/msi/media.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 212 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd634c0491297bf05803a…

1 0

Hans Leidekker : msi: Never defer standard actions.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: ad971803daeb9057626982f9cfe47eefbb14227b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad971803daeb9057626982f9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:42:21 2010 +0200 msi: Never defer standard actions. --- dlls/msi/action.c | 54 ++++++++++++++++----------------------------------- dlls/msi/events.c | 2 +- dlls/msi/msipriv.h | 2 +- 3 files changed, 19 insertions(+), 39 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 29071d0..40f376a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -814,7 +814,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) if (needs_ui_sequence(package)) rc = ACTION_PerformUIAction(package, action, -1); else - rc = ACTION_PerformAction(package, action, -1, FALSE); + rc = ACTION_PerformAction(package, action, -1); msi_dialog_check_messages( NULL ); @@ -1618,7 +1618,7 @@ static UINT execute_script(MSIPACKAGE *package, UINT script ) action = package->script->Actions[script][i]; ui_actionstart(package, action); TRACE("Executing Action (%s)\n",debugstr_w(action)); - rc = ACTION_PerformAction(package, action, script, TRUE); + rc = ACTION_PerformAction(package, action, script); if (rc != ERROR_SUCCESS) break; } @@ -7319,47 +7319,27 @@ StandardActions[] = { NULL, NULL }, }; -static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, - UINT* rc, BOOL force ) +static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UINT *rc ) { BOOL ret = FALSE; - BOOL run = force; - int i; - - if (!run && !package->script->CurrentlyScripting) - run = TRUE; - - if (!run) - { - if (strcmpW(action,szInstallFinalize) == 0 || - strcmpW(action,szInstallExecute) == 0 || - strcmpW(action,szInstallExecuteAgain) == 0) - run = TRUE; - } + UINT i; i = 0; while (StandardActions[i].action != NULL) { - if (strcmpW(StandardActions[i].action, action)==0) + if (!strcmpW( StandardActions[i].action, action )) { - if (!run) + ui_actionstart( package, action ); + if (StandardActions[i].handler) { - ui_actioninfo(package, action, TRUE, 0); - *rc = schedule_action(package,INSTALL_SCRIPT,action); - ui_actioninfo(package, action, FALSE, *rc); + ui_actioninfo( package, action, TRUE, 0 ); + *rc = StandardActions[i].handler( package ); + ui_actioninfo( package, action, FALSE, *rc ); } else { - ui_actionstart(package, action); - if (StandardActions[i].handler) - { - *rc = StandardActions[i].handler(package); - } - else - { - FIXME("unhandled standard action %s\n",debugstr_w(action)); - *rc = ERROR_SUCCESS; - } + FIXME("unhandled standard action %s\n", debugstr_w(action)); + *rc = ERROR_SUCCESS; } ret = TRUE; break; @@ -7369,17 +7349,17 @@ static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, return ret; } -UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, BOOL force) +UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) { UINT rc = ERROR_SUCCESS; BOOL handled; TRACE("Performing action (%s)\n", debugstr_w(action)); - handled = ACTION_HandleStandardAction(package, action, &rc, force); + handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script, force); + handled = ACTION_HandleCustomAction(package, action, &rc, script, TRUE); if (!handled) { @@ -7397,7 +7377,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip TRACE("Performing action (%s)\n", debugstr_w(action)); - handled = ACTION_HandleStandardAction(package, action, &rc,TRUE); + handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) handled = ACTION_HandleCustomAction(package, action, &rc, script, FALSE); @@ -7462,7 +7442,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) if (needs_ui_sequence(package)) rc = ACTION_PerformUIAction(package, action, -1); else - rc = ACTION_PerformAction(package, action, -1, FALSE); + rc = ACTION_PerformAction(package, action, -1); msiobj_release(&row->hdr); } diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 4ed395b..157d185 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -163,7 +163,7 @@ static UINT ControlEvent_SpawnWaitDialog(MSIPACKAGE* package, LPCWSTR argument, static UINT ControlEvent_DoAction(MSIPACKAGE* package, LPCWSTR argument, msi_dialog* dialog) { - ACTION_PerformAction(package,argument,-1,TRUE); + ACTION_PerformAction(package, argument, -1); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0be3eb9..c9b7bc7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -865,7 +865,7 @@ extern WCHAR gszLogFile[MAX_PATH]; extern HINSTANCE msi_hInstance; /* action related functions */ -extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, BOOL force); +extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script); extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script); extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute);

1 0

Hans Leidekker : msi/tests: Initialize a string buffer and fix some leaks.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 148887082c7e611b2516d6833489f264b1a68850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148887082c7e611b2516d6833… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:41:49 2010 +0200 msi/tests: Initialize a string buffer and fix some leaks. --- dlls/msi/tests/db.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 17c5c1f..5c87e3f 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8886,6 +8886,7 @@ static void test_createtable(void) size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + MsiCloseHandle( hrec ); res = MsiViewClose( htab ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -8915,10 +8916,12 @@ static void test_createtable(void) res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + buffer[0] = 0; size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + MsiCloseHandle( hrec ); res = MsiViewClose( htab ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -8942,6 +8945,7 @@ static void test_createtable(void) res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + buffer[0] = 0; size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Hans Leidekker : msi/tests: Properly contruct the icon path for win9x.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: ac924566fb72cf8325f9037a81f2666605ffa8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac924566fb72cf8325f9037a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:42:06 2010 +0200 msi/tests: Properly contruct the icon path for win9x. --- dlls/msi/tests/install.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1d27658..fb78cb4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -10045,10 +10045,10 @@ static void test_icon_table(void) /* win9x with MSI 2.0 installs the icon to a different folder, same as above */ lstrcpyA(win9xpath, APP_DATA_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, "Microsoft\\Installer\\"); - lstrcatA(path, prodcode); - lstrcatA(path, "\\testicon"); + lstrcatA(win9xpath, "\\"); + lstrcatA(win9xpath, "Microsoft\\Installer\\"); + lstrcatA(win9xpath, prodcode); + lstrcatA(win9xpath, "\\testicon"); lstrcpyA(path, WINDOWS_DIR); lstrcatA(path, "\\");

1 0

Hans Leidekker : msi: Fix a memory leak.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: bb5ab2672039a7fc938080dcecee1a22298922aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5ab2672039a7fc938080dce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 23 09:41:23 2010 +0200 msi: Fix a memory leak. --- dlls/msi/appsearch.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 34130b6..a516bda 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -958,7 +958,10 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); ACTION_FreeSignature(&parentSig); if (!parent) + { + msiobj_release(&row->hdr); return ERROR_SUCCESS; + } } sz = MAX_PATH;

1 0

Thomas Mullaly : urlmon: Partially implemented IUri_GetHost.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: cfc0f97d93ccac3fa11c574978a3d1ff69581d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc0f97d93ccac3fa11c57497… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jun 24 16:24:48 2010 -0400 urlmon: Partially implemented IUri_GetHost. --- dlls/urlmon/tests/uri.c | 14 +++++++------- dlls/urlmon/uri.c | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 217654c..46b2d64 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -329,7 +329,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {".txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"127.0.0.1",S_OK,TRUE}, + {"127.0.0.1",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/test%20dir/test.txt",S_OK,TRUE}, {"/test%20dir/test.txt",S_OK,TRUE}, @@ -1233,7 +1233,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"127.0.0.100",S_OK,TRUE}, + {"127.0.0.100",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, @@ -1263,7 +1263,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"127.0.0.0",S_OK,TRUE}, + {"127.0.0.0",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, @@ -1293,7 +1293,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"0.1.226.64",S_OK,TRUE}, + {"0.1.226.64",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, @@ -1323,7 +1323,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"255.255.255.255",S_OK,TRUE}, + {"255.255.255.255",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, @@ -1383,7 +1383,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"4294967295",S_OK,TRUE}, + {"4294967295",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, @@ -1413,7 +1413,7 @@ static const uri_properties uri_tests[] = { {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, - {"127.001",S_OK,TRUE}, + {"127.001",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 060b92e..82f48a0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1241,6 +1241,22 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST } switch(uriProp) { + case Uri_PROPERTY_HOST: + if(This->host_start > -1) { + *pbstrProperty = SysAllocStringLen(This->canon_uri+This->host_start, This->host_len); + hres = S_OK; + } else { + /* Canonicalizing/parsing the host of a URI is only partially + * implemented, so return E_NOTIMPL for now. + */ + FIXME("(%p)->(%d %p %x) Partially implemented\n", This, uriProp, pbstrProperty, dwFlags); + return E_NOTIMPL; + } + + if(!(*pbstrProperty)) + hres = E_OUTOFMEMORY; + + break; case Uri_PROPERTY_PASSWORD: if(This->userinfo_split > -1) { *pbstrProperty = SysAllocStringLen( @@ -1338,6 +1354,18 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D } switch(uriProp) { + case Uri_PROPERTY_HOST: + if(This->host_start == -1) { + /* Canonicalizing/parsing the host of a URI is only partially + * implemented, so return E_NOTIMPL for now. + */ + FIXME("(%p)->(%d %p %x) Partially implemented\n", This, uriProp, pcchProperty, dwFlags); + return E_NOTIMPL; + } + + *pcchProperty = This->host_len; + hres = (This->host_start > -1) ? S_OK : S_FALSE; + break; case Uri_PROPERTY_PASSWORD: *pcchProperty = (This->userinfo_split > -1) ? This->userinfo_len-This->userinfo_split-1 : 0; hres = (This->userinfo_split > -1) ? S_OK : S_FALSE; @@ -1483,13 +1511,8 @@ static HRESULT WINAPI Uri_GetFragment(IUri *iface, BSTR *pstrFragment) static HRESULT WINAPI Uri_GetHost(IUri *iface, BSTR *pstrHost) { - Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pstrHost); - - if(!pstrHost) - return E_POINTER; - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, pstrHost); + return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_HOST, pstrHost, 0); } static HRESULT WINAPI Uri_GetPassword(IUri *iface, BSTR *pstrPassword)

1 0

Thomas Mullaly : urlmon/tests: Added more test URIs.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 6a1dd3d18b1f5caf5b5de487b93e8addf2c32e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1dd3d18b1f5caf5b5de487b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jun 24 00:00:38 2010 -0400 urlmon/tests: Added more test URIs. --- dlls/urlmon/tests/uri.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 210 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ab36dc5..217654c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -1219,6 +1219,216 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* It normalizes IPv4 addresses correctly. */ + { "http://127.000.000.100/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://127.0.0.100/",S_OK,TRUE}, + {"127.0.0.100",S_OK,TRUE}, + {"http://127.0.0.100/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"127.0.0.100",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://127.000.000.100/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Make sure it normalizes partial IPv4 addresses correctly. */ + { "http://127.0/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://127.0.0.0/",S_OK,TRUE}, + {"127.0.0.0",S_OK,TRUE}, + {"http://127.0.0.0/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"127.0.0.0",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://127.0/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Make sure it converts implicit IPv4's correctly. */ + { "http://123456/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://0.1.226.64/",S_OK,TRUE}, + {"0.1.226.64",S_OK,TRUE}, + {"http://0.1.226.64/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"0.1.226.64",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://123456/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* UINT_MAX */ + { "http://4294967295/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://255.255.255.255/",S_OK,TRUE}, + {"255.255.255.255",S_OK,TRUE}, + {"http://255.255.255.255/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"255.255.255.255",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://4294967295/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* UINT_MAX+1 */ + { "http://4294967296/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://4294967296/",S_OK,TRUE}, + {"4294967296",S_OK,TRUE}, + {"http://4294967296/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"4294967296",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://4294967296/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Window's doesn't normalize IP address for unknown schemes. */ + { "1234://4294967295/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"1234://4294967295/",S_OK,TRUE}, + {"4294967295",S_OK,TRUE}, + {"1234://4294967295/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"4294967295",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"1234://4294967295/",S_OK,FALSE}, + {"1234",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Window's doesn't normalize IP address for unknown schemes. */ + { "1234://127.001/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"1234://127.001/",S_OK,TRUE}, + {"127.001",S_OK,TRUE}, + {"1234://127.001/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"127.001",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"1234://127.001/",S_OK,FALSE}, + {"1234",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } };

1 0