March 2012 - Wine-devel - list.winehq.org

Implementing a DSS provider
by M C 29 Mar '12

29 Mar '12

Hello everyone, I am doing some research in regards GSOC, and would like to find out if anyone besides Juan Lang is experienced enough to make suggestions in regards to bug 10506 and/or the implementation of a DSS provider.

1 0

Re: [PATCH 2/5] dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Christian Costa <titan.costa(a)gmail.com> writes: > With this patch I get exactly the same output for ports caps (except guid) as native. > I kept the comment regarding dmusic32 usage altough the native version > of dmusic I used does standard winmm calls to get port informations. > --- > dlls/dmusic/Makefile.in | 2 - > dlls/dmusic/dmusic.c | 120 ++++++++++++++++++++++++++++++++--------------- > 2 files changed, 82 insertions(+), 40 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M dmime.dll -T ../../.. -p dmime_test.exe.so performance.c && touch performance.ok performance.c:111: Test failed: Got unexpected portcaps struct size: 00000004 make[1]: *** [performance.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: MsiGetFileHash
by Hans Leidekker 29 Mar '12

29 Mar '12

On Thu, 2012-03-29 at 18:29 +0200, Robert van Herk wrote: > + mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); > + if (mapping) > + { > + p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); > + if (p) > + { > + MD5_CTX ctx; > + > + MD5Init( &ctx ); > + MD5Update( &ctx, p, length ); > + MD5Final( &ctx ); > + UnmapViewOfFile( p ); > + > + memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); > + r = ERROR_SUCCESS; > + } > + CloseHandle( mapping ); > + } > + } else { > + /* Empty file -> set hash to 0 */ > + memset( pHash->dwData, 0, sizeof pHash->dwData ); > + r = ERROR_SUCCESS; > } > + > CloseHandle( handle ); Please use 4 space indentation and put brackets on a new line like in the rest of that function. Same for the test. Please also provide a more descriptive subject line and prefix it with "msi: "

1 0

SoC 2012 Ideas
by Charles Davis 29 Mar '12

29 Mar '12

Hi, Since I graduate this year, this may be the last time I participate--or at least, attempt to participate, since last year didn't quite work out for me :(--in Summer of Code. (I realize I was supposed to email you last week, but what's done is done.) So, without further ado, here's what I'm proposing: 1) Make Wine use App Sandbox on Mac OS X. A project that used to be listed on the SoC ideas page was to implement proper sandboxing in Wine. Apparently, you think this is unrealistic, because you took it down. (Not the page, just that suggestion.) But, I think that if I narrowed my focus a bit, it could be possible to do this. I'm proposing using the Mac OS App Sandbox API--the beginnings of which were introduced in 10.5 and which came into its own in 10.7--to improve security of Wine on Mac OS. Wine is an excellent candidate for the App Sandbox, because most of its file-system activity is limited to a single directory--namely, the Wine prefix. I'm not sure what you think of this, though, so I'm throwing this out there to get feedback. At the very least, I would like to be able to limit Wine's file-system activity to the prefix. 2) HLSL compiler. Well, my D3D bytecode backend to LLVM didn't pan out like I'd hoped. Maybe an LLVM-based compiler is too complex for Wine right now. But perhaps we don't need it right now anyway. If CodeWeavers can't afford to pay me, maybe Google can. I can add a simple parser and compiler (that performs little or no optimization) that hopefully would be sufficient for Wine's purposes. 3) Integrate pieces of DCE/RPC into Wine. As you may or may not know, in Mac OS 10.7, Apple stopped using Samba (probably because it uses the GPL3 as its license) in favor of their own implementation--which just so happens to be based on the original DCE/RPC implementation (the same one that was used as a base for MS RPC). I figured we could cannibalize pieces of it for our own use. Or is that not acceptable? What do you think? I'm not sure how useful or feasible these are, so I'm posting to the list before. Chip

2 1

Re: [PATCH 3/3] (try2) gdi32: Add support for loading scalable font resources.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Huw Davies <huw(a)codeweavers.com> writes: > --- > dlls/gdi32/font.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 75 insertions(+), 0 deletions(-) This one doesn't build: gcc -m32 -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2 -D__WINESRC__ -D_GDI32_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -fno-omit-frame-pointer -Wpointer-arith -Wlogical-op -Werror -I/usr/include/freetype2 -g -O2 -o font.o font.c font.c: In function ‘AddFontResourceExW’: font.c:3498:59: error: ‘count’ may be used uninitialized in this function [-Werror=uninitialized] font.c:3475:36: note: ‘count’ was declared here cc1: all warnings being treated as errors make[1]: *** [font.o] Error 1 Admittedly count would always be initialized with the files we create, but we probably shouldn't rely on that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Andrew Eikum 29 Mar '12

29 Mar '12

On Thu, Mar 29, 2012 at 08:52:45AM +0200, Christian Costa wrote: > + midiOutGetDevCapsW(index - 1, &caps, sizeof(caps)); > ... > + CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); > + IDirectMusicSynth8_GetPortCaps(synth, port_caps); Maybe I'm pickier than most people, but I like error checking on these sorts of calls. They make it easier to find what is happening when something goes terribly and unexpectedly wrong.

2 2

Re: [PATCH 5/5] dmusic: Implement partially SetDirectSound.
by Andrew Eikum 29 Mar '12

29 Mar '12

It would be nice to see some tests for this. For example, how does this IDirectSound reference relate to the one created by IDirectMusicPerformance::InitAudio()? On Thu, Mar 29, 2012 at 08:53:10AM +0200, Christian Costa wrote: > > --- > dlls/dmusic/dmusic.c | 27 +++++++++++++++++++++------ > dlls/dmusic/dmusic_private.h | 2 ++ > 2 files changed, 23 insertions(+), 6 deletions(-) > > diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c > index 8f2edea..60d6b8a 100644 > --- a/dlls/dmusic/dmusic.c > +++ b/dlls/dmusic/dmusic.c > @@ -52,19 +52,22 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface) { > return refCount; > } > > -static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { > +static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) > +{ > IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > ULONG refCount = InterlockedDecrement(&This->ref); > > TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); > > if (!refCount) { > + if (This->dsound) > + IDirectSound_Release(This->dsound); > HeapFree(GetProcessHeap(), 0, This->ppPorts); > HeapFree(GetProcessHeap(), 0, This); > } > > DMUSIC_UnlockModule(); > - > + > return refCount; > } > > @@ -257,10 +260,22 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LP > return S_OK; > } > > -static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd) { > - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > - FIXME("(%p, %p, %p): stub\n", This, pDirectSound, hWnd); > - return S_OK; > +static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd) > +{ > + IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; > + > + FIXME("(%p, %p, %p): partial implementation\n", This, dsound, wnd); > + > + if (dsound) > + { > + This->dsound = dsound; > + IDirectSound_AddRef(dsound); > + } > + > + /* If no direct sound object is given, native does not create one yet */ > + This->dsound_inited = TRUE; > + > + return S_OK; > } > > static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock) { > diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h > index c05adf0..b0655d6 100644 > --- a/dlls/dmusic/dmusic_private.h > +++ b/dlls/dmusic/dmusic_private.h > @@ -96,6 +96,8 @@ struct IDirectMusic8Impl { > IReferenceClockImpl* pMasterClock; > IDirectMusicPort** ppPorts; > int nrofports; > + BOOL dsound_inited; > + IDirectSound* dsound; > }; > > /***************************************************************************** > > >

2 1

Re: [PATCH 3/3] dmsynth: Put port caps that match native ones.
by Andrew Eikum 29 Mar '12

29 Mar '12

Just to be clear, which "native" do you mean? Does this match Windows 7's dmusic behavior, or something else? I've been trying to target Windows 7's behavior in the new audio design. Also... On Thu, Mar 29, 2012 at 08:53:52AM +0200, Christian Costa wrote: > - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB | DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY; > + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; /* DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY */ I'd just remove the unused flags. No need for crufty comments.

2 1

Re: po: Update German translation
by Julian Rüger 29 Mar '12

29 Mar '12

Hi André, Am Dienstag, den 27.03.2012, 21:43 +0200 schrieb André Hentschel: > --- > po/de.po | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > #: jscript.rc:37 >-#, fuzzy > #| msgid "Invalid parameter.\n" > msgid "Invalid character" >-msgstr "Ungültiger Parameter.\n" >+msgstr "Ungültiges Zeichen" du solltest die alte msgid auch entfernen. (Ist ein neues Feature, wurden schon andere drauf hingewiesen ;) Viele Grüsse, Julian

2 2

Re: [PATCH 1/2] vbscript: Added Mid function implementation
by Marvin 29 Mar '12

29 Mar '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17548 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0