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

Hans Leidekker : msi: Improve a trace.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: e637839a839c6001fc1c2a6ffbdc95162ccb4eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e637839a839c6001fc1c2a6ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:02 2010 +0100 msi: Improve a trace. --- dlls/msi/helpers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 2c472dd..c45ba23 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -713,7 +713,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action) if (!package->script) return FALSE; - TRACE("Registering Action %s as having fun\n",debugstr_w(action)); + TRACE("Registering %s as unique action\n", debugstr_w(action)); count = package->script->UniqueActionsCount; package->script->UniqueActionsCount++;

1 0

Hans Leidekker : msi: Look at the requested action when publishing assemblies, not the action taken.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 6c6b2a7a18e0b50ee19a5f3af51006a39eb2dc28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6b2a7a18e0b50ee19a5f3af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:57:37 2010 +0100 msi: Look at the requested action when publishing assemblies, not the action taken. --- dlls/msi/action.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 879a013..eec7b2b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6481,20 +6481,25 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) { ASSEMBLY_LIST *list = param; MSIASSEMBLY *assembly; + LPCWSTR component; assembly = msi_alloc_zero(sizeof(MSIASSEMBLY)); if (!assembly) return ERROR_OUTOFMEMORY; - assembly->component = get_loaded_component(list->package, MSI_RecordGetString(rec, 1)); + component = MSI_RecordGetString(rec, 1); + assembly->component = get_loaded_component(list->package, component); + if (!assembly->component) + return ERROR_SUCCESS; - if (!assembly->component || !assembly->component->Enabled || - !(assembly->component->Action & (INSTALLSTATE_LOCAL | INSTALLSTATE_SOURCE))) + if (assembly->component->ActionRequest != INSTALLSTATE_LOCAL && + assembly->component->ActionRequest != INSTALLSTATE_SOURCE) { - TRACE("Component not set for install, not publishing assembly\n"); - msi_free(assembly); + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + assembly->component->Action = assembly->component->Installed; return ERROR_SUCCESS; } + assembly->component->Action = assembly->component->ActionRequest; assembly->feature = find_feature_by_name(list->package, MSI_RecordGetString(rec, 2)); assembly->file = msi_find_file(list->package, assembly->component->KeyPath);

1 0

Vincent Povirk : ole32: Clear the sibling links when reinserting a renamed element.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 24ff70483519c22b201027a9c758d318d92a1ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ff70483519c22b201027a9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 10:02:17 2010 -0600 ole32: Clear the sibling links when reinserting a renamed element. --- dlls/ole32/storage32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 88e0524..837365b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -797,6 +797,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentEntry.name, pwcsNewName); + /* Delete any sibling links */ + currentEntry.leftChild = DIRENTRY_NULL; + currentEntry.rightChild = DIRENTRY_NULL; + StorageBaseImpl_WriteDirEntry(This, currentEntryRef, &currentEntry);

1 0

Hans Leidekker : msi: Look at the requested action when moving files, not the action taken.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: ff3ed5f05145b708c04a4ebc7e54bca36f2dc824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3ed5f05145b708c04a4ebc7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:57:14 2010 +0100 msi: Look at the requested action when moving files, not the action taken. --- dlls/msi/action.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 278d479..879a013 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6115,7 +6115,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; - LPCWSTR sourcename; + LPCWSTR sourcename, component; LPWSTR destname = NULL; LPWSTR sourcedir = NULL, destdir = NULL; LPWSTR source = NULL, dest = NULL; @@ -6123,13 +6123,18 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) DWORD size; BOOL ret, wildcards; - comp = get_loaded_component(package, MSI_RecordGetString(rec, 2)); - if (!comp || !comp->Enabled || - !(comp->Action & (INSTALLSTATE_LOCAL | INSTALLSTATE_SOURCE))) + component = MSI_RecordGetString(rec, 2); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL && comp->ActionRequest != INSTALLSTATE_SOURCE) { - TRACE("Component not set for install, not moving file\n"); + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; } + comp->Action = comp->ActionRequest; sourcename = MSI_RecordGetString(rec, 3); options = MSI_RecordGetInteger(rec, 7);

1 0

Huw Davies : oleaut32: Add a test for non-oleautomation error handling.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: dba91c064357a79e253a4bf47cd944bc92758941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba91c064357a79e253a4bf47… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 2 14:49:47 2010 +0000 oleaut32: Add a test for non-oleautomation error handling. --- dlls/oleaut32/tests/tmarshal.c | 19 +++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index ae4f2aa..33adf3c 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -895,12 +895,18 @@ static BSTR WINAPI NonOleAutomation_BstrRet(INonOleAutomation *iface) return SysAllocString(wszTestString); } +static HRESULT WINAPI NonOleAutomation_Error(INonOleAutomation *iface) +{ + return E_NOTIMPL; +} + static INonOleAutomationVtbl NonOleAutomation_VTable = { NonOleAutomation_QueryInterface, NonOleAutomation_AddRef, NonOleAutomation_Release, NonOleAutomation_BstrRet, + NonOleAutomation_Error }; static INonOleAutomation NonOleAutomation = { &NonOleAutomation_VTable }; @@ -1239,6 +1245,19 @@ static void test_typelibmarshal(void) ok(V_BSTR(&varresult) != NULL, "V_BSTR(&varresult) should not be NULL\n"); VariantClear(&varresult); + + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); + ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult)); + ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); + VariantClear(&varresult); + ITypeInfo_Release(pTypeInfo); /* tests call put_Name without named arg */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 41079d0..5dc3a12 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -184,6 +184,9 @@ library TestTypelib { [id(DISPID_NOA_BSTRRET)] BSTR BstrRet(); + + [id(DISPID_NOA_ERROR)] + HRESULT Error(); } diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 1cfd87b..ad8ba1b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -40,3 +40,4 @@ #define DISPID_TM_BYREF_UINT 21 #define DISPID_NOA_BSTRRET 1 +#define DISPID_NOA_ERROR 2

1 0

Hans Leidekker : msi: Look at the requested action when deleting services, not the action taken.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: c13d84fffcd2101ad1446f56b8cc53b82abbe5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13d84fffcd2101ad1446f56b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:56:51 2010 +0100 msi: Look at the requested action when deleting services, not the action taken. --- dlls/msi/action.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b99dce2..278d479 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5224,6 +5224,7 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + LPCWSTR component; LPWSTR name = NULL; DWORD event; SC_HANDLE scm = NULL, service = NULL; @@ -5232,9 +5233,18 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) if (!(event & msidbServiceControlEventDelete)) return ERROR_SUCCESS; - comp = get_loaded_component( package, MSI_RecordGetString(rec, 6) ); - if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + component = MSI_RecordGetString(rec, 6); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; deformat_string( package, MSI_RecordGetString(rec, 2), &name ); stop_service( name );

1 0

Hans Leidekker : msi: Add tests for removing values from .ini files.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 75ec82bbafa4f6f1566dac8a161d6039790aa529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ec82bbafa4f6f1566dac8a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:59:19 2010 +0100 msi: Add tests for removing values from .ini files. --- dlls/msi/tests/install.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index db1b154..722e427 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1601,6 +1601,54 @@ static const CHAR frp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR riv_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "inifile.txt\tinifile\tinifile.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR riv_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "inifile\t\t\tinifile feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR riv_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "inifile\tinifile\n"; + +static const CHAR riv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "inifile\t{A0F15705-4F57-4437-88C4-6C8B37ACC6DE}\tMSITESTDIR\t0\t\tinifile.txt\n"; + +static const CHAR riv_ini_file_dat[] = "IniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n" + "s72\tl255\tS72\tl96\tl128\tl255\ti2\ts72\n" + "IniFile\tIniFile\n" + "inifile1\ttest.ini\tMSITESTDIR\tsection1\tkey1\tvalue1\t0\tinifile\n"; + +static const CHAR riv_remove_ini_file_dat[] = "RemoveIniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n" + "s72\tl255\tS72\tl96\tl128\tL255\ti2\ts72\n" + "RemoveIniFile\tRemoveIniFile\n" + "inifile1\ttest.ini\tMSITESTDIR\tsectionA\tkeyA\tvalueA\t2\tinifile\n"; + +static const CHAR riv_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RemoveIniValues\t\t3000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2492,6 +2540,20 @@ static const msi_table frp_tables[] = ADD_TABLE(property) }; +static const msi_table riv_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(riv_component), + ADD_TABLE(riv_feature), + ADD_TABLE(riv_feature_comp), + ADD_TABLE(riv_file), + ADD_TABLE(riv_ini_file), + ADD_TABLE(riv_remove_ini_file), + ADD_TABLE(riv_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8591,6 +8653,57 @@ static void test_find_related_products(void) delete_test_files(); } +static void test_remove_ini_values(void) +{ + UINT r; + DWORD len; + char inifile[MAX_PATH], buf[0x10]; + HANDLE file; + BOOL ret; + + create_test_files(); + create_file("msitest\\inifile.txt", 1000); + create_database(msifile, riv_tables, sizeof(riv_tables) / sizeof(msi_table)); + + lstrcpyA(inifile, PROG_FILES_DIR); + lstrcatA(inifile, "\\msitest"); + CreateDirectoryA(inifile, NULL); + lstrcatA(inifile, "\\test.ini"); + file = CreateFileA(inifile, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, 0, NULL); + CloseHandle(file); + + ret = WritePrivateProfileStringA("section1", "key1", "value1", inifile); + ok(ret, "failed to write profile string %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("sectionA", "keyA", "valueA", inifile); + ok(ret, "failed to write profile string %u\n", GetLastError()); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); + ok(len == 6, "got %u expected 6\n", len); + + len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n"); + ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n"); + ok(delete_pf("msitest", FALSE), "directory removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8696,6 +8809,7 @@ START_TEST(install) test_remove_duplicate_files(); test_remove_registry_values(); test_find_related_products(); + test_remove_ini_values(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveIniValues standard action.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: b891d0888a6d7c30376cfa936ba94c5669be6e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b891d0888a6d7c30376cfa936… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:55 2010 +0100 msi: Implement the RemoveIniValues standard action. --- dlls/msi/action.c | 234 +++++++++++++++++++++++++++++++++++++++++++--------- dlls/msi/msipriv.h | 1 + include/msidefs.h | 9 ++ 3 files changed, 205 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b891d0888a6d7c30376cf…

1 0

Hans Leidekker : msi: Look at the requested action when stopping services, not the action taken.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 2d3676d912b1391b2bce58917408f017bad51cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3676d912b1391b2bce58917… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:56:26 2010 +0100 msi: Look at the requested action when stopping services, not the action taken. --- dlls/msi/action.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0011bc5..b99dce2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5173,6 +5173,7 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + LPCWSTR component; LPWSTR name; DWORD event; @@ -5180,9 +5181,18 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) if (!(event & msidbServiceControlEventStop)) return ERROR_SUCCESS; - comp = get_loaded_component( package, MSI_RecordGetString( rec, 6 ) ); - if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + component = MSI_RecordGetString( rec, 6 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); stop_service( name );

1 0

Jörg Höhle : winmm/tests: Fix up to 3 MCI test failures.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: bafbc9820e8a6bb4799540a9ea3936f5b98a5c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafbc9820e8a6bb4799540a9e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Feb 28 20:19:03 2010 +0100 winmm/tests: Fix up to 3 MCI test failures. --- dlls/winmm/tests/mci.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f9ab137..bbc21dd 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -150,7 +150,7 @@ static void test_notification(HWND hwnd, const char* command, WPARAM type) seen = PeekMessageA(&msg, hwnd, MM_MCINOTIFY, MM_MCINOTIFY, PM_REMOVE); } if(!seen) - ok(type==0, "Expect message %lx from %s\n", type, command); + ok(type==0, "Expect message %04lx from %s\n", type, command); else if(msg.hwnd != hwnd) ok(msg.hwnd == hwnd, "Didn't get the handle to our test window\n"); else if(msg.message != MM_MCINOTIFY) @@ -251,6 +251,7 @@ static void test_recordWAVE(HWND hwnd) WORD nch = 1; WORD nbits = 16; DWORD nsamp = 16000, expect; + UINT ndevs = waveInGetNumDevs(); MCIERROR err, ok_pcm; MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; @@ -293,19 +294,29 @@ static void test_recordWAVE(HWND hwnd) /* MCI appears to scan the available devices for support of this format, * returning MCIERR_OUTOFRANGE on machines with no sound. + * However some w2k8/w7 machines return no error when there's no wave + * input device (perhaps querying waveOutGetNumDevs instead of waveIn?), + * still the record command below fails with MCIERR_WAVE_INPUTSUNSUITABLE. * Don't skip here, record will fail below. */ err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err || err==MCIERR_OUTOFRANGE,"mci set format tag pcm returned %s\n", dbg_mcierr(err)); ok_pcm = err; - err = mciSendString("set x samplespersec 41000 alignment 4 channels 2", NULL, 0, NULL); - ok(err==ok_pcm,"mci set samples+align+channels returned %s\n", dbg_mcierr(err)); - + /* MSDN warns against not setting all wave format parameters. + * Indeed, it produces strange results, incl. + * inconsistent PCMWAVEFORMAT headers in the saved file. + */ + err = mciSendString("set x bytespersec 22050 alignment 2 samplespersec 11025 channels 1 bitspersample 16", NULL, 0, NULL); + ok(err==ok_pcm,"mci set 5 wave parameters returned %s\n", dbg_mcierr(err)); /* Investigate: on w2k, set samplespersec 22050 sets nChannels to 2! * err = mciSendString("set x samplespersec 22050", NULL, 0, NULL); * ok(!err,"mci set samplespersec returned %s\n", dbg_mcierr(err)); */ + /* Checks are generally performed immediately. */ + err = mciSendString("set x bitspersample 4", NULL, 0, NULL); + todo_wine ok(err==MCIERR_OUTOFRANGE,"mci set bitspersample 4 returned %s\n", dbg_mcierr(err)); + parm.set.wFormatTag = WAVE_FORMAT_PCM; parm.set.nSamplesPerSec = nsamp; parm.set.wBitsPerSample = nbits; @@ -321,7 +332,10 @@ static void test_recordWAVE(HWND hwnd) /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendString("record x to 2000 wait", NULL, 0, hwnd); ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); - ok(!err || err==(ok_pcm==MCIERR_OUTOFRANGE ? MCIERR_WAVE_INPUTSUNSUITABLE : 0),"mci record to 2000 returned %s\n", dbg_mcierr(err)); + if(!ndevs) todo_wine /* with sound disabled */ + ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); + else + ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); if(err) { if (err==MCIERR_WAVE_INPUTSUNSUITABLE) skip("Please install audio driver. Everything is skipped.\n"); @@ -699,7 +713,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* This test used(?) to cause intermittent crashes when Wine exits, after * fixme:winmm:MMDRV_Exit Closing while ll-driver open */ - MCIERROR err, ok_snd; + MCIERROR err, ok_snd = waveOutGetNumDevs() ? 0 : MCIERR_HARDWARE; char buf[512], path[300], command[330]; memset(buf, 0, sizeof(buf)); memset(path, 0, sizeof(path)); @@ -711,12 +725,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); - ok_snd = waveOutGetNumDevs() ? 0 : MCIERR_HARDWARE; + /* Who knows why some machines pass all tests but return MCIERR_HARDWARE here? */ err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); - todo_wine ok(err==ok_snd,"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd || broken(err==MCIERR_HARDWARE),"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); err = mciSendString("sound SystemExclamation notify wait", NULL, 0, hwnd); - todo_wine ok(err==ok_snd,"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd || broken(err==MCIERR_HARDWARE),"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); test_notification(hwnd, "sound notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); buf[0]=0;

1 0