June 2009 - Wine-Devel - list.winehq.org

Re: Remove division from inner loop
by Henri Verbeet June 17, 2009

June 17, 2009

2009/6/16 Michael Abbott <michael(a)araneidae.co.uk>: > - /* The depth data is normalized, so needs to be > scaled, the stencil data isn't. */ Looks like the patch got wrapped. You'll probably want to just attach the output of git format-patch.

2 1

Re: comdlg32/tests: fix file dialog resize failures on NT4 and with tiny desk tops.
by Paul Vriens June 17, 2009

June 17, 2009

Rein Klazes wrote: > --- > dlls/comdlg32/tests/filedlg.c | 10 +++++++--- > dlls/comdlg32/tests/rsrc.rc | 16 ++++++++++++++++ > 2 files changed, 23 insertions(+), 3 deletions(-) > Thanks Rein, This fixes the failures on my boxes. -- Cheers, Paul.

1 0

RFC: dmime: Implement the DirectMusicTool8 class factory.
by Francois Gouget June 16, 2009

June 16, 2009

--- So all the code in dlls/dmime/tool.c was unused because nothing was calling DMUSIC_CreateDirectMusicTool8Impl(). Apparently the intent was to call it from a class factory so I looked around and came up with the following patch that implements a class factory for DirectMusicTool8. However I have never implemented a class factory before and don't know much about them. So does this patch make sense? Does the fact that we have an IID_IDirectMusicTool8 instead of a CLSID_XXX hint at something I'm missing? How come this was not done when the file was first added? That said IDirectMusicTool8Impl looks like one big stub. So if it makes more sense to remove it entirely I can do that too. dlls/dmime/dmime_main.c | 56 +++++++++++++++++++++++++++++++++++++++++++- dlls/dmime/dmime_private.h | 2 +- dlls/dmime/tool.c | 2 +- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index f4abddd..8bd95a9 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -729,6 +729,56 @@ static const IClassFactoryVtbl WaveTrackCF_Vtbl = { static IClassFactoryImpl WaveTrack_CF = {&WaveTrackCF_Vtbl}; /****************************************************************** + * DirectMusicTool8 ClassFactory + */ +static HRESULT WINAPI Tool8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + + if (ppobj == NULL) return E_POINTER; + + return E_NOINTERFACE; +} + +static ULONG WINAPI Tool8CF_AddRef(LPCLASSFACTORY iface) { + DMIME_LockModule(); + + return 2; /* non-heap based object */ +} + +static ULONG WINAPI Tool8CF_Release(LPCLASSFACTORY iface) { + DMIME_UnlockModule(); + + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI Tool8CF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { + TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); + + return DMUSIC_CreateDirectMusicTool8Impl (riid, ppobj, pOuter); +} + +static HRESULT WINAPI Tool8CF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { + TRACE("(%d)\n", dolock); + + if (dolock) + DMIME_LockModule(); + else + DMIME_UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl Tool8CF_Vtbl = { + Tool8CF_QueryInterface, + Tool8CF_AddRef, + Tool8CF_Release, + Tool8CF_CreateInstance, + Tool8CF_LockServer +}; + +static IClassFactoryImpl Tool8_CF = {&Tool8CF_Vtbl}; + +/****************************************************************** * DllMain * * @@ -821,7 +871,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) *ppv = &WaveTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; - } + } else if (IsEqualCLSID (rclsid, &IID_IDirectMusicTool8) && IsEqualIID (riid, &IID_IClassFactory)) { + *ppv = &Tool8_CF; + IClassFactory_AddRef((IClassFactory*)*ppv); + return S_OK; + } WARN("(%s, %s, %p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 308c2c8..d21061d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -72,7 +72,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVO extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentStateImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicToolImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicTool8Impl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DMUSIC_CreateDirectMusicPatternTrackImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DMUSIC_CreateDirectMusicLyricsTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); diff --git a/dlls/dmime/tool.c b/dlls/dmime/tool.c index 1654bb8..81f4bca 100644 --- a/dlls/dmime/tool.c +++ b/dlls/dmime/tool.c @@ -119,7 +119,7 @@ static const IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicobjImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI DMUSIC_CreateDirectMusicTool8Impl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicTool8Impl* obj; obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTool8Impl)); -- 1.6.3.1

2 3

Re: comdlg32: Delay setting the initial size of resizable file dialog until the CDN_INITDONE notification has been processed.
by Paul Vriens June 16, 2009

June 16, 2009

Rein Klazes wrote: > With tests. Fixes bug #18516 > --- > dlls/comdlg32/filedlg.c | 6 +- > dlls/comdlg32/tests/filedlg.c | 126 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 130 insertions(+), 2 deletions(-) > Hi Rein, This is introducing test failures on at least NT4. (Just as I was down to zero :( ). Could you have a look? -- Cheers, Paul.

3 4

Request for Patchreview
by André Hentschel June 16, 2009

June 16, 2009

Can someone please review my patch http://www.winehq.org/pipermail/wine-patches/2009-June/074195.html. Its about the Installer-Button in Appwiz.cpl Thanks Best Regards André Hentschel

4 8

How to force use of DirectX8 instead of DirectX9?
by Joerg-Cyril.Hoehle＠t-systems.com June 16, 2009

June 16, 2009

Hi, What is the recommended way not to use Wine's DirectX9 and fall back to DirectX8 instead? Some applications list DirectX 8.1 as their minimal graphics requirement, yet they come with DirectX9 on the CD and presumably use Wine's DirectX9. The author of the screenshot at http://www.adventure-treff.de/images/bild.php?bild=/features/ankh_grafikver… shows how graphics differ a lot for Ankh, depending on whether DirectX 8 or 9 is being used in MS-Windows. Perhaps forcing use of DirectX8 can help make some applications run? (Or help locate bugs) Thanks for your help, Jörg Höhle

5 4

Re: wintrust: Implement WVTAsn1SpcSpOpusInfoDecode (resend)
by Alexandre Julliard June 16, 2009

June 16, 2009

Juan Lang <juan.lang(a)gmail.com> writes: > No difference, just a rebase. Please let me know if I'm missing > something obvious. Fixes bug 17696. It doesn't work here: ../../../tools/runtest -q -P wine -M wintrust.dll -T ../../.. -p wintrust_test.exe.so asn.c && touch asn.ok asn.c:888: Test failed: CryptDecodeObjectEx failed: c0000005 make[2]: *** [asn.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: (resend) kernel32: Fix error returns from CreateFile (at least the simple ones).
by Alexandre Julliard June 16, 2009

June 16, 2009

Guy Albertelli <galberte(a)neo.rr.com> writes: > Changelog: > - CreateFile[AW] should return ERROR_PATH_NOT_FOUND when > STATUS_FILE_IS_A_DIRECTORY is returned from NtCreateFile and > the requested filename has a trailing \ This breaks the tests: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so profile.c && touch profile.ok profile.c:968: Test failed: Expected ERROR_ACCESS_DENIED, got 3 make[2]: *** [profile.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/4] [wined3d] move creation of NP2 fixup uniforms into separate loop
by Henri Verbeet June 16, 2009

June 16, 2009

2009/6/15 Tobias Jakobi <Liquid.Acid(a)gmx.net>: > Why do you need this to be in a separate loop? Also, could you please fix your mailer to set a proper Content-Type, instead of application/octet-stream?

3 6

Re: wininet: Always create a URL cache entry.
by Jacek Caban June 16, 2009

June 16, 2009

Hi Hans, Hans Leidekker wrote: > Fixes file downloads in ie7. > > -Hans > > diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c > index 8f9f404..2721427 100644 > --- a/dlls/wininet/http.c > +++ b/dlls/wininet/http.c > @@ -3807,8 +3807,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, > } > while (loop_next); > > - /* FIXME: Better check, when we have to create the cache file */ > - if(bSuccess && (lpwhr->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) { > + if(bSuccess) { > I think we should check at least INTERNET_FLAG_NO_CACHE_WRITE flag here. Jacek

2 1