April 2007 - Wine-Commits - list.winehq.org

James Hawkins : msi: Add handling for the concurrent install custom action.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 98eafa870c619dbf78ae28feb8f5abc904de5cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98eafa870c619dbf78ae28feb… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 15 03:12:23 2007 -0500 msi: Add handling for the concurrent install custom action. --- dlls/msi/custom.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 11 ++--- 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c1c7e96..c38ea98 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -54,6 +54,8 @@ static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, @@ -250,6 +252,10 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) case 17: rc = HANDLE_CustomType17(package,source,target,type,action); break; + case 23: /* installs another package in the source tree */ + deformat_string(package,target,&deformated); + rc = HANDLE_CustomType23(package,source,deformated,type,action); + break; case 50: /*EXE file specified by a property value */ rc = HANDLE_CustomType50(package,source,target,type,action); break; @@ -548,6 +554,41 @@ static DWORD WINAPI DllThread( LPVOID arg ) return rc; } +static DWORD WINAPI ACTION_CAInstallPackage(const GUID *guid) +{ + msi_custom_action_info *info; + UINT r = ERROR_FUNCTION_FAILED; + INSTALLUILEVEL old_level; + + info = find_action_by_guid(guid); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid(guid)); + return r; + } + + old_level = MsiSetInternalUI(INSTALLUILEVEL_BASIC, NULL); + r = MsiInstallProductW(info->source, info->target); + MsiSetInternalUI(old_level, NULL); + + return r; +} + +static DWORD WINAPI ConcurrentInstallThread(LPVOID arg) +{ + LPGUID guid = arg; + DWORD rc; + + TRACE("concurrent installation (%x) started\n", GetCurrentThreadId()); + + rc = ACTION_CAInstallPackage(guid); + + TRACE("concurrent installation (%x) returned %i\n", GetCurrentThreadId(), rc); + + MsiCloseAllHandles(); + return rc; +} + static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -579,6 +620,63 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( return info; } +static msi_custom_action_info *do_msidbCAConcurrentInstall( + MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action) +{ + msi_custom_action_info *info; + + info = msi_alloc( sizeof *info ); + if (!info) + return NULL; + + msiobj_addref( &package->hdr ); + info->package = package; + info->type = type; + info->target = strdupW( target ); + info->source = strdupW( source ); + info->action = strdupW( action ); + CoCreateGuid( &info->guid ); + + EnterCriticalSection( &msi_custom_action_cs ); + list_add_tail( &msi_pending_custom_actions, &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); + + info->handle = CreateThread( NULL, 0, ConcurrentInstallThread, &info->guid, 0, NULL ); + if (!info->handle) + { + free_custom_action_data( info ); + return NULL; + } + + return info; +} + +static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + msi_custom_action_info *info; + WCHAR package_path[MAX_PATH]; + DWORD size; + + static const WCHAR backslash[] = {'\\',0}; + + MSI_GetPropertyW(package, cszSourceDir, package_path, &size); + lstrcatW(package_path, backslash); + lstrcatW(package_path, source); + + if (GetFileAttributesW(package_path) == INVALID_FILE_ATTRIBUTES) + { + ERR("Source package does not exist: %s\n", debugstr_w(package_path)); + return ERROR_FUNCTION_FAILED; + } + + TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); + + info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); + + return wait_thread_handle(info); +} + static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6c8b078..5b7050f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1417,13 +1417,10 @@ static void test_concurrentinstall(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); r = MsiInstallProductA(msifile, NULL); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile(msifile); }

1 0

James Hawkins : msi: Add tests for the concurrent installation custom action.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 4cc48b7710eead6051652eb646c44d82f741bcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc48b7710eead6051652eb64… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 15 03:09:01 2007 -0500 msi: Add tests for the concurrent installation custom action. --- dlls/msi/tests/install.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index cc490a7..6c8b078 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -316,6 +316,45 @@ static const CHAR cie_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\t "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; +static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "InstallFiles\t\t4000\n" + "InstallServices\t\t5000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "RunInstall\t\t1600\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100"; + +static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "RunInstall\t23\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + +static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; + +static const CHAR ci2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; + +static const CHAR ci2_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\taugustus"; + +static const CHAR ci2_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "augustus\taugustus\taugustus\t500\t\t\t8192\t1"; + typedef struct _msi_table { const CHAR *filename; @@ -451,6 +490,31 @@ static const msi_table cie_tables[] = ADD_TABLE(property), }; +static const msi_table ci_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(ci_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(ci_custom_action), +}; + +static const msi_table ci2_tables[] = +{ + ADD_TABLE(ci2_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1314,10 +1378,6 @@ static void test_cabisextracted(void) create_file("augustus", 500); create_file("caesar", 500); - create_database(msifile, mm_tables, sizeof(mm_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); create_cab_file("test2.cab", MEDIA_SIZE, "augustus\0"); create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); @@ -1338,6 +1398,36 @@ static void test_cabisextracted(void) DeleteFile(msifile); } +static void test_concurrentinstall(void) +{ + UINT r; + CHAR path[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + CreateDirectoryA("msitest\\msitest", NULL); + create_file("msitest\\maximus", 500); + create_file("msitest\\msitest\\augustus", 500); + + create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\msitest\\concurrent.msi"); + create_database(path, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1366,6 +1456,7 @@ START_TEST(install) test_readonlyfile(); test_setdirproperty(); test_cabisextracted(); + test_concurrentinstall(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Generalize the msi_custom_action_info struct so other custom actions can use it .
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 06df9f790d175432be7352ae555bb441c21a351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06df9f790d175432be7352ae5… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 15 03:10:00 2007 -0500 msi: Generalize the msi_custom_action_info struct so other custom actions can use it. --- dlls/msi/custom.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index d1d492c..c1c7e96 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -412,8 +412,8 @@ static UINT wait_process_handle(MSIPACKAGE* package, UINT type, typedef struct _msi_custom_action_info { struct list entry; MSIPACKAGE *package; - LPWSTR dllname; - LPWSTR function; + LPWSTR source; + LPWSTR target; HANDLE handle; LPWSTR action; INT type; @@ -428,8 +428,8 @@ static void free_custom_action_data( msi_custom_action_info *info ) if (info->handle) CloseHandle( info->handle ); msi_free( info->action ); - msi_free( info->dllname ); - msi_free( info->function ); + msi_free( info->source ); + msi_free( info->target ); msiobj_release( &info->package->hdr ); msi_free( info ); } @@ -497,16 +497,16 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) return r; } - TRACE("%s %s\n", debugstr_w( info->dllname ), debugstr_w( info->function ) ); + TRACE("%s %s\n", debugstr_w( info->source ), debugstr_w( info->target ) ); - hModule = LoadLibraryW( info->dllname ); + hModule = LoadLibraryW( info->source ); if (!hModule) { - ERR("failed to load dll %s\n", debugstr_w( info->dllname ) ); + ERR("failed to load dll %s\n", debugstr_w( info->source ) ); return r; } - proc = strdupWtoA( info->function ); + proc = strdupWtoA( info->target ); fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); msi_free( proc ); if (fn) @@ -514,7 +514,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) hPackage = alloc_msihandle( &info->package->hdr ); if (hPackage) { - TRACE("calling %s\n", debugstr_w( info->function ) ); + TRACE("calling %s\n", debugstr_w( info->target ) ); r = fn( hPackage ); MsiCloseHandle( hPackage ); } @@ -522,7 +522,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) ERR("failed to create handle for %p\n", info->package ); } else - ERR("GetProcAddress(%s) failed\n", debugstr_w( info->function ) ); + ERR("GetProcAddress(%s) failed\n", debugstr_w( info->target ) ); FreeLibrary(hModule); @@ -549,7 +549,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) } static msi_custom_action_info *do_msidbCustomActionTypeDll( - MSIPACKAGE *package, INT type, LPCWSTR dllname, LPCWSTR function, LPCWSTR action ) + MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { msi_custom_action_info *info; @@ -560,8 +560,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( msiobj_addref( &package->hdr ); info->package = package; info->type = type; - info->function = strdupW( function ); - info->dllname = strdupW( dllname ); + info->target = strdupW( target ); + info->source = strdupW( source ); info->action = strdupW( action ); CoCreateGuid( &info->guid );

1 0

James Hawkins : msi: Run the InstallExecute sequence if the InstallUISequnce table is empty.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 6da8041d4752e86d65d46348f84810bcd99c823a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da8041d4752e86d65d46348f… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 15 03:10:58 2007 -0500 msi: Run the InstallExecute sequence if the InstallUISequnce table is empty. --- dlls/msi/action.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 51d827e..f047a27 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -584,6 +584,30 @@ static UINT msi_apply_transforms( MSIPACKAGE *package ) return r; } +BOOL ui_sequence_exists( MSIPACKAGE *package ) +{ + MSIQUERY *view; + UINT rc; + + static const WCHAR ExecSeqQuery [] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','I','n','s','t','a','l','l', + 'U','I','S','e','q','u','e','n','c','e','`', + ' ','W','H','E','R','E',' ', + '`','S','e','q','u','e','n','c','e','`',' ', + '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', + '`','S','e','q','u','e','n','c','e','`',0}; + + rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); + if (rc == ERROR_SUCCESS) + { + msiobj_release(&view->hdr); + return TRUE; + } + + return FALSE; +} + /**************************************************** * TOP level entry points *****************************************************/ @@ -592,7 +616,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui = FALSE; + BOOL ui = FALSE, ui_exists; static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -647,10 +671,11 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package); ui = TRUE; - if (rc == ERROR_SUCCESS) + ui_exists = ui_sequence_exists(package); + if (rc == ERROR_SUCCESS || !ui_exists) { package->script->InWhatSequence |= SEQUENCE_EXEC; - rc = ACTION_ProcessExecSequence(package,TRUE); + rc = ACTION_ProcessExecSequence(package,ui_exists); } } else

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 3d92b2931ca4b3902a632562b7a6b07de32b7fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d92b2931ca4b3902a632562b… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Apr 14 08:56:54 2007 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index 0a5b2fd..525ff59 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -232,5 +232,5 @@ HELP <��>�� ġ�� \n" WCMD_NO, "�ƴϿ�" WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ�. \n" WCMD_NOFTYPE, "�� '%s'�� �� ɵ� ��ϴ�.'\n" - WCMD_OVERWRITE, "Overwrite" + WCMD_OVERWRITE, "����" }

1 0

Francois Gouget : advapi32: Fix and extend the RegQueryValueEx() tests.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: b934fc90ebd63e222aeca780c312bcbd9a3bd09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b934fc90ebd63e222aeca780c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 13 23:11:21 2007 +0200 advapi32: Fix and extend the RegQueryValueEx() tests. - Added tests for empty and zero-byte strings. Wine passes these tests, sort of. - Check that the returned string is correct. - All known Windows versions implement RegQueryValueExA(), so complain if it is not implemented. - Only allow the Win9x quirks for the Ansi version. - Query the name2A/W value for the string2A/W tests! - The test_hkey_main_Value_A/W() functions were doing a sizeof() on the string parameter to compute the string's full size! - We must reset GLE before each test, otherwise Win9x skips all but the first test. --- dlls/advapi32/tests/registry.c | 108 ++++++++++++++++++++++++++++++++------- 1 files changed, 88 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2d84058..2643334 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -79,38 +79,87 @@ static void setup_main_key(void) assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); } -static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string) +static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, + DWORD full_byte_len) { DWORD ret, type, cbData; - DWORD str_byte_len, full_byte_len; - + DWORD str_byte_len; + LPSTR value; + static const char nA[]={'N', 0}; + + type=0xdeadbeef; + cbData=0xdeadbeef; + /* When successful RegQueryValueExA() leaves GLE as is, + * so we must reset it to detect unimplemented functions. + */ + SetLastError(0xdeadbeef); ret = RegQueryValueExA(hkey_main, name, NULL, &type, NULL, &cbData); GLE = GetLastError(); ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%d\n", ret, GLE); + /* It is wrong for the Ansi version to not be implemented */ + ok(GLE == 0xdeadbeef, "RegQueryValueExA set GLE = %u\n", GLE); if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; - str_byte_len = lstrlenA(string) + 1; - full_byte_len = sizeof(string); + str_byte_len = (string ? lstrlenA(string) : 0) + 1; ok(type == REG_SZ, "RegQueryValueExA returned type %d\n", type); - ok(cbData == full_byte_len || cbData == str_byte_len, + ok(cbData == full_byte_len || cbData == str_byte_len /* Win9x */, "cbData=%d instead of %d or %d\n", cbData, full_byte_len, str_byte_len); + + value = HeapAlloc(GetProcessHeap(), 0, (cbData+2)*sizeof(*value)); + strcpy(value, nA); + type=0xdeadbeef; + ret = RegQueryValueExA(hkey_main, name, NULL, &type, (BYTE*)value, &cbData); + GLE = GetLastError(); + ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%d\n", ret, GLE); + if (!string) + { + /* When cbData == 0, RegQueryValueExA() should not modify the buffer */ + ok(strcmp(value, nA) == 0 || (cbData == 1 && *value == '\0') /* Win9x */, + "RegQueryValueExA failed: '%s' != '%s'\n", value, string); + } + else + { + ok(strcmp(value, string) == 0, "RegQueryValueExA failed: '%s' != '%s'\n", + value, string); + } + HeapFree(GetProcessHeap(), 0, value); } -static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string) +static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, + DWORD full_byte_len) { DWORD ret, type, cbData; - DWORD str_byte_len, full_byte_len; + LPWSTR value; + static const WCHAR nW[]={'N', 0}; + type=0xdeadbeef; + cbData=0xdeadbeef; + /* When successful RegQueryValueExW() leaves GLE as is, + * so we must reset it to detect unimplemented functions. + */ + SetLastError(0xdeadbeef); ret = RegQueryValueExW(hkey_main, name, NULL, &type, NULL, &cbData); GLE = GetLastError(); ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; - str_byte_len = (lstrlenW(string) + 1) * sizeof(WCHAR); - full_byte_len = sizeof(string); ok(type == REG_SZ, "RegQueryValueExW returned type %d\n", type); - ok(cbData == full_byte_len || cbData == str_byte_len, - "cbData=%d instead of %d or %d\n", cbData, full_byte_len, str_byte_len); + ok(cbData == full_byte_len, + "cbData=%d instead of %d\n", cbData, full_byte_len); + + value = HeapAlloc(GetProcessHeap(), 0, (cbData+2)*sizeof(*value)); + lstrcpyW(value, nW); + type=0xdeadbeef; + ret = RegQueryValueExW(hkey_main, name, NULL, &type, (BYTE*)value, &cbData); + GLE = GetLastError(); + ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); + if (!string) + { + /* When cbData == 0, RegQueryValueExW() should not modify the buffer */ + string=nW; + } + ok(lstrcmpW(value, string) == 0, "the string RegQueryValueExW is wrong\n"); + HeapFree(GetProcessHeap(), 0, value); } static void test_set_value(void) @@ -119,25 +168,44 @@ static void test_set_value(void) static const WCHAR name1W[] = {'C','l','e','a','n','S','i','n','g','l','e','S','t','r','i','n','g', 0}; static const WCHAR name2W[] = {'S','o','m','e','I','n','t','r','a','Z','e','r','o','e','d','S','t','r','i','n','g', 0}; + static const WCHAR emptyW[] = {0}; static const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 0 ,'L','o','t', 0 , 0 , 0 , 0}; static const char name1A[] = "CleanSingleString"; static const char name2A[] = "SomeIntraZeroedString"; + static const char emptyA[] = ""; static const char string1A[] = "ThisNeverBreaks"; static const char string2A[] = "This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; + /* Test RegSetValueExA with a 'zero-byte' string (as Office 2003 does). + * Surprisingly enough we're supposed to get zero bytes out of it. + * FIXME: Wine's on-disk file format does not differentiate this with + * regular empty strings but there's no way to test as it requires + * stopping the wineserver. + */ + ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)emptyA, 0); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, NULL, 0); + test_hkey_main_Value_W(name1W, NULL, 0); + + /* test RegSetValueExA with an empty string */ + ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)emptyA, sizeof(emptyA)); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, emptyA, sizeof(emptyA)); + test_hkey_main_Value_W(name1W, emptyW, sizeof(emptyW)); + /* test RegSetValueExA with normal string */ ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)string1A, sizeof(string1A)); ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); - test_hkey_main_Value_A(name1A, string1A); - test_hkey_main_Value_W(name1W, string1W); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); /* test RegSetValueExA with intrazeroed string */ ret = RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (const BYTE *)string2A, sizeof(string2A)); ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); - test_hkey_main_Value_A(name1A, string1A); - test_hkey_main_Value_W(name1W, string1W); + test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); + test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); /* 9x doesn't support W-calls, so don't test them then */ if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; @@ -145,14 +213,14 @@ static void test_set_value(void) /* test RegSetValueExW with normal string */ ret = RegSetValueExW(hkey_main, name1W, 0, REG_SZ, (const BYTE *)string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); - test_hkey_main_Value_A(name1A, string1A); - test_hkey_main_Value_W(name1W, string1W); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); /* test RegSetValueExW with intrazeroed string */ ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)string2W, sizeof(string2W)); ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); - test_hkey_main_Value_A(name1A, string1A); - test_hkey_main_Value_W(name1W, string1W); + test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); + test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); } static void create_test_entries(void)

1 0

Kai Blin : secur32: Move NTLM debug output to a seperate "ntlm" channel.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 7e6c5aad3cf33b708b00806fb35c51cd4904ff7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6c5aad3cf33b708b00806fb… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Apr 14 17:20:37 2007 +0200 secur32: Move NTLM debug output to a seperate "ntlm" channel. --- dlls/secur32/base64_codec.c | 2 +- dlls/secur32/dispatcher.c | 2 +- dlls/secur32/ntlm.c | 2 +- dlls/secur32/util.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/base64_codec.c b/dlls/secur32/base64_codec.c index d09b24d..9f5eaec 100644 --- a/dlls/secur32/base64_codec.c +++ b/dlls/secur32/base64_codec.c @@ -23,7 +23,7 @@ #include "sspi.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 5d82172..71c8300 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -39,7 +39,7 @@ #define INITIAL_BUFFER_SIZE 200 -WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, char* const argv[]) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5744830..6768bab 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -31,7 +31,7 @@ #include "hmac_md5.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); #define NTLM_MAX_BUF 1904 #define MIN_NTLM_AUTH_MAJOR_VERSION 3 diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index 3994f51..e3df37c 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -28,7 +28,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); /* The CRC32 code is copyright (C) 1986 Gary S. Brown and was placed in the * public domain.

1 0

Chia-I Wu : kernel32: Fix non-terminated separator string.
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: bbbd42787c1c7d7cd171e37e64fd6a68376079a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbd42787c1c7d7cd171e37e6… Author: Chia-I Wu <b90201047(a)ntu.edu.tw> Date: Fri Apr 13 19:01:50 2007 +0800 kernel32: Fix non-terminated separator string. --- dlls/kernel32/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ee6967b..6e96eea 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -325,8 +325,8 @@ done: */ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) { - static const WCHAR sepW[] = {'-','_','.','@'}; - static const WCHAR winsepW[] = {'-','_'}; + static const WCHAR sepW[] = {'-','_','.','@',0}; + static const WCHAR winsepW[] = {'-','_',0}; static const WCHAR posixW[] = {'P','O','S','I','X',0}; static const WCHAR cW[] = {'C',0}; static const WCHAR latinW[] = {'l','a','t','i','n',0};

1 0

Chris Robinson : quartz: Create DirectSound device and buffer at filter creation and connection respectively .
by Alexandre Julliard April 16, 2007

April 16, 2007

Module: wine Branch: master Commit: 147b0cf5acbde59d3b6a15bfe53da1fc938c6854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147b0cf5acbde59d3b6a15bfe… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 13 09:32:56 2007 -0700 quartz: Create DirectSound device and buffer at filter creation and connection respectively. --- dlls/quartz/dsoundrender.c | 227 +++++++++++++++++++++++-------------------- 1 files changed, 121 insertions(+), 106 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ed2eda2..2492052 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -69,7 +69,6 @@ typedef struct DSoundRenderImpl DWORD buf_size; DWORD write_pos; DWORD write_loops; - BOOL init; DWORD last_play_pos; DWORD play_loops; @@ -108,93 +107,6 @@ static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLE } -static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) -{ - HRESULT hr; - WAVEFORMATEX wav_fmt; - AM_MEDIA_TYPE amt; - WAVEFORMATEX* format; - DSBUFFERDESC buf_desc; - DSoundRenderImpl *This = (DSoundRenderImpl *)iface; - - hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); - if (FAILED(hr)) { - ERR("Unable to retrieve media type\n"); - return hr; - } - - TRACE("MajorType %s\n", debugstr_guid(&amt.majortype)); - TRACE("SubType %s\n", debugstr_guid(&amt.subtype)); - TRACE("Format %s\n", debugstr_guid(&amt.formattype)); - TRACE("Size %d\n", amt.cbFormat); - - dump_AM_MEDIA_TYPE(&amt); - - format = (WAVEFORMATEX*)amt.pbFormat; - TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); - TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %u\n", format->nSamplesPerSec); - TRACE("nAvgBytesPerSec = %u\n", format->nAvgBytesPerSec); - TRACE("nBlockAlign = %d\n", format->nBlockAlign); - TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); - TRACE("cbSize = %d\n", format->cbSize); - - /* Lock the critical section to make sure we're still marked to play while - setting up the playback buffer */ - EnterCriticalSection(&This->csFilter); - - if (This->state != State_Running) { - hr = VFW_E_WRONG_STATE; - goto getout; - } - - hr = DirectSoundCreate(NULL, &This->dsound, NULL); - if (FAILED(hr)) { - ERR("Cannot create Direct Sound object\n"); - goto getout; - } - - This->buf_size = format->nAvgBytesPerSec; - - wav_fmt = *format; - wav_fmt.cbSize = 0; - - memset(&buf_desc,0,sizeof(DSBUFFERDESC)); - buf_desc.dwSize = sizeof(DSBUFFERDESC); - buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | - DSBCAPS_CTRLFREQUENCY | DSBCAPS_GETCURRENTPOSITION2; - buf_desc.dwBufferBytes = This->buf_size; - buf_desc.lpwfxFormat = &wav_fmt; - hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL); - if (FAILED(hr)) { - ERR("Can't create sound buffer !\n"); - IDirectSound_Release(This->dsound); - goto getout; - } - - hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume); - if (FAILED(hr)) - ERR("Can't set volume to %ld (%x)!\n", This->volume, hr); - - hr = IDirectSoundBuffer_SetPan(This->dsbuffer, This->pan); - if (FAILED(hr)) - ERR("Can't set pan to %ld (%x)!\n", This->pan, hr); - - hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - if (FAILED(hr)) { - ERR("Can't start sound buffer (%x)!\n", hr); - IDirectSoundBuffer_Release(This->dsbuffer); - IDirectSound_Release(This->dsound); - goto getout; - } - - This->write_pos = 0; - -getout: - LeaveCriticalSection(&This->csFilter); - return hr; -} - static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPos, DWORD *pWritePos, REFERENCE_TIME *pRefTime) { HRESULT hr; @@ -334,22 +246,8 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("\n"); } #endif - - if (!This->init) - { - hr = DSoundRender_CreateSoundBuffer(iface); - if (SUCCEEDED(hr)) - This->init = TRUE; - else - { - ERR("Unable to create DSound buffer\n"); - return hr; - } - } - - hr = DSoundRender_SendSampleData(This, pbSrcStream, cbSrcStream); - return hr; + return DSoundRender_SendSampleData(This, pbSrcStream, cbSrcStream); } static HRESULT DSoundRender_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) @@ -410,11 +308,20 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { + hr = DirectSoundCreate(NULL, &pDSoundRender->dsound, NULL); + if (FAILED(hr)) + ERR("Cannot create Direct Sound object (%x)\n", hr); + } + + if (SUCCEEDED(hr)) + { pDSoundRender->ppPins[0] = (IPin *)pDSoundRender->pInputPin; *ppv = (LPVOID)pDSoundRender; } else { + if (pDSoundRender->pInputPin) + IPin_Release((IPin*)pDSoundRender->pInputPin); CoTaskMemFree(pDSoundRender->ppPins); pDSoundRender->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pDSoundRender->csFilter); @@ -743,6 +650,114 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = DSoundRender_QueryVendorInfo }; +static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +{ + InputPin *This = (InputPin *)iface; + PIN_DIRECTION pindirReceive; + DSoundRenderImpl *DSImpl; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); + dump_AM_MEDIA_TYPE(pmt); + + EnterCriticalSection(This->pin.pCritSec); + { + DSImpl = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; + + if (This->pin.pConnectedTo) + hr = VFW_E_ALREADY_CONNECTED; + + if (SUCCEEDED(hr) && This->pin.fnQueryAccept(This->pin.pUserData, pmt) != S_OK) + hr = VFW_E_TYPE_NOT_ACCEPTED; + + if (SUCCEEDED(hr)) + { + IPin_QueryDirection(pReceivePin, &pindirReceive); + + if (pindirReceive != PINDIR_OUTPUT) + { + ERR("Can't connect from non-output pin\n"); + hr = VFW_E_INVALID_DIRECTION; + } + } + + if (SUCCEEDED(hr)) + { + WAVEFORMATEX *format; + DSBUFFERDESC buf_desc; + + TRACE("MajorType %s\n", debugstr_guid(&pmt->majortype)); + TRACE("SubType %s\n", debugstr_guid(&pmt->subtype)); + TRACE("Format %s\n", debugstr_guid(&pmt->formattype)); + TRACE("Size %d\n", pmt->cbFormat); + + format = (WAVEFORMATEX*)pmt->pbFormat; + + DSImpl->buf_size = format->nAvgBytesPerSec; + + memset(&buf_desc,0,sizeof(DSBUFFERDESC)); + buf_desc.dwSize = sizeof(DSBUFFERDESC); + buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | + DSBCAPS_CTRLFREQUENCY | + DSBCAPS_GETCURRENTPOSITION2; + buf_desc.dwBufferBytes = DSImpl->buf_size; + buf_desc.lpwfxFormat = format; + hr = IDirectSound_CreateSoundBuffer(DSImpl->dsound, &buf_desc, &DSImpl->dsbuffer, NULL); + if (FAILED(hr)) + ERR("Can't create sound buffer (%x)\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume); + if (FAILED(hr)) + ERR("Can't set volume to %ld (%x)\n", DSImpl->volume, hr); + + hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan); + if (FAILED(hr)) + ERR("Can't set pan to %ld (%x)\n", DSImpl->pan, hr); + + DSImpl->write_pos = 0; + hr = S_OK; + if (DSImpl->state == State_Running) + hr = IDirectSoundBuffer_Play(DSImpl->dsbuffer, 0, 0, DSBPLAY_LOOPING); + if (FAILED(hr)) + ERR("Can't play sound buffer (%x)\n", hr); + } + + if (SUCCEEDED(hr)) + { + CopyMediaType(&This->pin.mtCurrent, pmt); + This->pin.pConnectedTo = pReceivePin; + IPin_AddRef(pReceivePin); + } + else + { + if (DSImpl->dsbuffer) + IDirectSoundBuffer_Release(DSImpl->dsbuffer); + DSImpl->dsbuffer = NULL; + } + } + LeaveCriticalSection(This->pin.pCritSec); + + return hr; +} + +static HRESULT WINAPI DSoundRender_InputPin_Disconnect(IPin * iface) +{ + IPinImpl *This = (IPinImpl*)iface; + DSoundRenderImpl *DSImpl; + + TRACE("(%p)->()\n", iface); + + DSImpl = (DSoundRenderImpl*)This->pinInfo.pFilter; + if (DSImpl->dsbuffer) + IDirectSoundBuffer_Release(DSImpl->dsbuffer); + DSImpl->dsbuffer = NULL; + + return IPinImpl_Disconnect(iface); +} + static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) { InputPin* This = (InputPin*)iface; @@ -762,14 +777,14 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) return hr; } -static const IPinVtbl DSoundRender_InputPin_Vtbl = +static const IPinVtbl DSoundRender_InputPin_Vtbl = { InputPin_QueryInterface, IPinImpl_AddRef, InputPin_Release, InputPin_Connect, - InputPin_ReceiveConnection, - IPinImpl_Disconnect, + DSoundRender_InputPin_ReceiveConnection, + DSoundRender_InputPin_Disconnect, IPinImpl_ConnectedTo, IPinImpl_ConnectionMediaType, IPinImpl_QueryPinInfo,

1 0

wiki/. wikiconfig.py
by Dimi Paun April 14, 2007

April 14, 2007

ChangeSet ID: 1176559294704701967378245 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/04/14 07:01:34 Modified files: . : wikiconfig.py Log message: Add the MoinMoin link as requested by the author. Old revision New revision Changes Path 1.5 1.6 +1 -1 wiki/wikiconfig.py Index: wiki/wikiconfig.py diff -u -p wiki/wikiconfig.py:1.5 wiki/wikiconfig.py:1.6 --- wiki/wikiconfig.py 14 Apr 2007 14: 1:34 -0000 +++ /dev/null 14 Apr 2007 14: 1:34 -0000 @@ -163,5 +163,5 @@ class Config(DefaultConfig): # The Wiki credits page_credits = [ - 'Sponsored by <a href="http://lattica.com/">Lattica</a>' + 'Sponsored by <a href="http://lattica.com/">Lattica</a> <a href="http://moinmoin.wikiwikiweb.de/">MoinMoin Powered</a>' ]

1 0