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

Andrey Turkin : userenv: Implement stubbed userenv.dll.138.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: baf86a13f3f93a5f9076e714523d11052078dabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf86a13f3f93a5f9076e7145… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Mar 2 15:35:26 2010 +0300 userenv: Implement stubbed userenv.dll.138. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 8b0b749..bde8c07 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,3 +1,5 @@ +138 stdcall @(long str str str str long str long long str str long) USERENV_138 + @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stdcall DestroyEnvironmentBlock(ptr) @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 38fb64c..ddf0e21 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -176,3 +176,40 @@ BOOL WINAPI UnloadUserProfile( HANDLE hToken, HANDLE hProfile ) FIXME("(%p, %p): stub\n", hToken, hProfile); return FALSE; } + +/****************************************************************************** + * USERENV.138 + * + * Create .lnk file + * + * PARAMETERS + * int csidl [in] well-known directory location to create link in + * LPCSTR lnk_dir [in] directory (relative to directory specified by csidl) to create link in + * LPCSTR lnk_filename [in] filename of the link file without .lnk extension + * LPCSTR lnk_target [in] file/directory pointed to by link + * LPCSTR lnk_iconfile [in] link icon resource filename + * DWORD lnk_iconid [in] link icon resource id in file referred by lnk_iconfile + * LPCSTR work_directory [in] link target's work directory + * WORD hotkey [in] link hotkey (virtual key id) + * DWORD win_state [in] initial window size (SW_SHOWMAXIMIZED to start maximized, + * SW_SHOWMINNOACTIVE to start minimized, everything else is default state) + * LPCSTR comment [in] comment - link's comment + * LPCSTR loc_filename_resfile [in] resource file which holds localized filename for this link file + * DWORD loc_filename_resid [in] resource id for this link file's localized filename + * + * RETURNS + * TRUE: Link file was successfully created + * FALSE: Link file was not created + */ +BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, + LPCSTR lnk_target, LPCSTR lnk_iconfile, DWORD lnk_iconid, + LPCSTR work_directory, WORD hotkey, DWORD win_state, LPCSTR comment, + LPCSTR loc_filename_resfile, DWORD loc_filename_resid) +{ + FIXME("(%d,%s,%s,%s,%s,%d,%s,0x%x,%d,%s,%s,%d) - stub\n", csidl, debugstr_a(lnk_dir), + debugstr_a(lnk_filename), debugstr_a(lnk_target), debugstr_a(lnk_iconfile), + lnk_iconid, debugstr_a(work_directory), hotkey, win_state, + debugstr_a(comment), debugstr_a(loc_filename_resfile), loc_filename_resid ); + + return FALSE; +}

1 0

Jörg Höhle : winmm/tests: Fix up to 3 MCI test failures.
by Alexandre Julliard 02 Mar '10

02 Mar '10

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

Hans Leidekker : msi: Improve a trace.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: a64372ca44e08dbaaf9376607ea2d6e6c38879dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64372ca44e08dbaaf9376607… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:55:06 2010 +0100 msi: Improve a trace. --- dlls/msi/action.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 872e8dd..0569cc7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6688,7 +6688,10 @@ static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) { - TRACE("%p\n", package); + static const WCHAR szAvailableFreeReg[] = + {'A','V','A','I','L','A','B','L','E','F','R','E','E','R','E','G',0}; + + TRACE("%p %d kilobytes\n", package, msi_get_property_int( package, szAvailableFreeReg, 0 )); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Only create environment strings when the component is set to be installed.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: c8308ef99da4361aa558fa02665421d2e9d3540a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8308ef99da4361aa558fa026… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:55:31 2010 +0100 msi: Only create environment strings when the component is set to be installed. --- dlls/msi/action.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0569cc7..6ff4c67 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5702,13 +5702,14 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; - LPCWSTR name, value; + LPCWSTR name, value, component; LPWSTR data = NULL, newval = NULL; LPWSTR deformatted = NULL, ptr; DWORD flags, type, size; LONG res; HKEY env = NULL, root; LPCWSTR environment; + MSICOMPONENT *comp; static const WCHAR user_env[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; @@ -5719,6 +5720,19 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', 'E','n','v','i','r','o','n','m','e','n','t',0}; + component = MSI_RecordGetString(rec, 4); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL) + { + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_LOCAL; + name = MSI_RecordGetString(rec, 2); value = MSI_RecordGetString(rec, 3);

1 0

Hans Leidekker : msi: Look at the requested action when installing services , not the action taken.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 87448dcaebabc44c79703cd7a5b708896e4f8751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87448dcaebabc44c79703cd7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:56:01 2010 +0100 msi: Look at the requested action when installing services, not the action taken. --- dlls/msi/action.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6ff4c67..0011bc5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5001,15 +5001,24 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) MSIPACKAGE *package = param; MSICOMPONENT *comp; SC_HANDLE scm = NULL, service = NULL; - LPCWSTR *vector = NULL; + LPCWSTR component, *vector = NULL; LPWSTR name, args; DWORD event, numargs; UINT r = ERROR_FUNCTION_FAILED; - 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_LOCAL) + { + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_LOCAL; + deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3);

1 0

Hans Leidekker : msi: Look at the requested action when stopping services, not the action taken.
by Alexandre Julliard 02 Mar '10

02 Mar '10

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

Anders Jonsson : wordpad: Update Swedish translation.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 61a56d3492e41f739ea705008d055b9178f7e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a56d3492e41f739ea705008… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Mar 1 22:47:24 2010 +0100 wordpad: Update Swedish translation. --- programs/wordpad/Sv.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 2fae294..edc35a9 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -247,8 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zooma in" STRING_PREVIEW_ZOOMOUT, "Zooma ut" STRING_PREVIEW_CLOSE, "Stäng" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "Sida" + STRING_PREVIEW_PAGES, "Sidor" END STRINGTABLE DISCARDABLE

1 0

Reece Dunn : hlink/tests: Add more tests to show a difference in string and moniker hlinks.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: a2ae7a2b3d603cdd8e613ed15fc1bbc5c7520e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ae7a2b3d603cdd8e613ed15… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Mon Mar 1 22:21:40 2010 +0000 hlink/tests: Add more tests to show a difference in string and moniker hlinks. --- dlls/hlink/tests/hlink.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 1802196..30b06f0 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -135,6 +135,13 @@ static void test_reference(void) ok(r == S_OK, "failed\n"); CoTaskMemFree(str); + r = IHlink_GetStringReference(lnk, -1, NULL, NULL); + ok(r == S_OK, "failed, r=%08x\n", r); + + r = IHlink_GetStringReference(lnk, -1, NULL, &str); + ok(r == S_OK, "failed, r=%08x\n", r); + ok(str == NULL, "string should be null\n"); + r = IHlink_GetStringReference(lnk, HLINKGETREF_DEFAULT, &str, NULL); ok(r == S_OK, "failed\n"); ok(!lstrcmpW(str, url2), "url wrong\n"); @@ -1212,6 +1219,18 @@ static void test_HlinkGetSetStringReference(void) CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); + hres = IHlink_GetStringReference(link, -1, &fnd_tgt, NULL); + todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " + "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + CoTaskMemFree(fnd_tgt); + + hres = IHlink_GetStringReference(link, -1, NULL, NULL); + ok(hres == S_OK, "failed, hres=%08x\n", hres); + + hres = IHlink_GetStringReference(link, -1, NULL, &fnd_loc); + ok(hres == S_OK, "failed, hres=%08x\n", hres); + CoTaskMemFree(fnd_loc); + hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres);

1 0

Reece Dunn : ole32: IMoniker_IsRunning returns E_INVALIDARG when bindctx is NULL.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 0ed4c6df24a040c32ada6f49c91f81b226670e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed4c6df24a040c32ada6f49c… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Mon Mar 1 23:15:11 2010 +0000 ole32: IMoniker_IsRunning returns E_INVALIDARG when bindctx is NULL. --- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/tests/moniker.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 5535a97..7402b8e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -670,7 +670,7 @@ CompositeMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, else{ if (pbc==NULL) - return E_POINTER; + return E_INVALIDARG; /* If pmkToLeft and pmkNewlyRunning are both NULL, this method checks the ROT to see whether */ /* the moniker is running. If so, the method returns S_OK; otherwise, it recursively calls */ diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index f83eb23..ff8f9b4 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -561,7 +561,7 @@ static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface, return S_OK; else { if (pbc==NULL) - return E_POINTER; + return E_INVALIDARG; res=IBindCtx_GetRunningObjectTable(pbc,&rot); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7cc5f78..b4e3e2f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1495,7 +1495,6 @@ static void test_item_moniker(void) /* IsRunning test */ hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); @@ -1631,7 +1630,6 @@ static void test_generic_composite_moniker(void) /* IsRunning test */ hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); @@ -1645,7 +1643,6 @@ static void test_generic_composite_moniker(void) todo_wine ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr); - todo_wine hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr);

1 0

Andrey Turkin : shdocvw: Return success code in ITaskBarList::HrInit.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 46a04b72c03bd8438bd95d349a8cc5313e592705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a04b72c03bd8438bd95d349… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Mar 2 07:55:00 2010 +0300 shdocvw: Return success code in ITaskBarList::HrInit. --- dlls/shdocvw/taskbarlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index 0281695..2c38080 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -81,9 +81,9 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList *iface, HWND hwnd)

1 0