September 2010 - Wine-devel

Re: [PATCH 3/3] include: Add MCI_INTEGER64 and MCI_INTEGER3264 mci types. (try 2)
by Jacek Caban 02 Sep '10

02 Sep '10

Hi Octavian, On 9/1/10 7:45 PM, Octavian Voicu wrote: > MCI_INTEGER64 is only defined for _WIN64 in DDK. > > MCI_INTEGER3264 is wine specific and will be needed because MCI_STATUS > return type is MCI_INTEGER64 in 64-bit winmm.dll, and MCI_INTEGER > in 32-bit winmm.dll. That's not a reason to add Wine-specific defines in public header. Jacek

3 3

Re: msvcrt:string Fix codepage table 1361 (Korean Johab) [try2]
by Alexandre Julliard 02 Sep '10

02 Sep '10

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > @@ -1563,8 +1564,11 @@ sub HANDLE_FILE(@) > } > printf OUTPUT "#include \"wine/unicode.h\"\n\n"; > > + if( $codepage == 1361 ) { @lb_ranges = ( 0x81, 0xd3, 0xd8, 0xde, 0xe0, 0xf9 ); } > + else { @lb_ranges = get_lb_ranges(); } There's no reason to hardcode the whole thing. If some lead bytes aren't detected properly you can add just those. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] winmm/tests: Add MCI parser tests.
by testbot＠testbot.winehq.org 01 Sep '10

01 Sep '10

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=4902 Your paranoid android. === W98SE (32 bit mci) === mci.c:926: Test failed: mci status position: 128

1 0

Re: [PATCH 2/3] winmm: Replace command ids with symbolic constants in mci command resources.
by Octavian Voicu 01 Sep '10

01 Sep '10

In order to prevent copy-paste errors, the changes were generated using the following script, executed from git root (there are two very long lines, might not work if they're wrapped): for i in MCI_OPEN MCI_CLOSE MCI_ESCAPE MCI_PLAY MCI_SEEK MCI_STOP MCI_PAUSE MCI_INFO MCI_GETDEVCAPS MCI_SPIN MCI_SET MCI_STEP MCI_RECORD MCI_SYSINFO MCI_BREAK MCI_SOUND MCI_SAVE MCI_STATUS MCI_CUE MCI_REALIZE MCI_WINDOW MCI_PUT MCI_WHERE MCI_FREEZE MCI_UNFREEZE MCI_LOAD MCI_CUT MCI_COPY MCI_PASTE MCI_UPDATE MCI_RESUME MCI_DELETE; do j=`egrep "^#define $i\\W" include/mmsystem.h | awk '{print $3}' | sed 's/0x0/0x00000/g'`; k=`echo $i | sed 's/MCI_//g'`; sed -i "s/${j}L, MCI_COMMAND_HEAD,/$i, 0, MCI_COMMAND_HEAD,/ig" dlls/mciavi32/mciavi_res.rc dlls/mciqtz32/mciavi_res.rc dlls/winmm/winmm_res.rc; done for i in MCI_CAPTURE MCI_MONITOR MCI_RESERVE MCI_SETAUDIO MCI_SIGNAL MCI_SETVIDEO MCI_QUALITY MCI_LIST MCI_UNDO MCI_CONFIGURE MCI_RESTORE; do j=`egrep "^#define $i\\W" include/digitalv.h | awk '{print $3}' | sed 's/0x0/0x00000/g'`; k=`echo $i | sed 's/MCI_//g'`; sed -i "s/${j}L, MCI_COMMAND_HEAD,/$i, 0, MCI_COMMAND_HEAD,/ig" dlls/mciavi32/mciavi_res.rc dlls/mciqtz32/mciavi_res.rc dlls/winmm/winmm_res.rc; done

1 0

Re: d3dx9: Implement D3DXFVFFromDeclarator. (try 2)
by Henri Verbeet 01 Sep '10

01 Sep '10

On 1 September 2010 02:40, Misha Koshelev <misha680(a)gmail.com> wrote: > + while (texture <= 8) What is the "texture == 8" case for? Also, it seems to me FVFs require texcoords to be assigned to consecutive texture units.

2 1

Re: [PATCH 4/6] winmm/tests: Add a few Open/Close MCI tests.
by testbot＠testbot.winehq.org 01 Sep '10

01 Sep '10

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=4900 Your paranoid android. === W98SE (32 bit mci) === mci.c:637: Test failed: Expect message 0001 from play to 250 wait notify mci.c:644: Test failed: got 0004 instead of MCI_NOTIFY_xyz 0000 from command after close

1 0

Re: [PATCH 2/6] winmm: Close MCI device after immediate auto-open commands.
by testbot＠testbot.winehq.org 01 Sep '10

01 Sep '10

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=4899 Your paranoid android. === W98SE (32 bit mci) === mci.c:613: Test failed: Expect message 0001 from play to 250 wait notify mci.c:620: Test failed: got 0004 instead of MCI_NOTIFY_xyz 0000 from command after close

1 0

Re: [PATCH 1/6] winmm: MCI open always creates an alias for subsequent commands.
by testbot＠testbot.winehq.org 01 Sep '10

01 Sep '10

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=4898 Your paranoid android. === W98SE (32 bit mci) === mci.c:681: Test failed: not enough time elapsed 58ms mci.c:737: Test failed: mci status position: 58

1 0

Re: [PATCH] wined3d: Add missing ckey, fx, and pal directdraw caps.
by Stefan Dösinger 01 Sep '10

01 Sep '10

Looks OK to me. (unless there are whitespace issues which I can't see in my current mail client) Am 01.09.2010 um 06:44 schrieb Octavian Voicu: > Fixes regression described in bug 24226. > --- > dlls/wined3d/directx.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 01b4e46..9e50f78 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -4259,7 +4259,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, > int ps_selected_mode; > struct shader_caps shader_caps; > struct fragment_caps fragment_caps; > - DWORD ckey_caps, blit_caps, fx_caps; > + DWORD ckey_caps, blit_caps, fx_caps, pal_caps; > > TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); > > @@ -4786,6 +4786,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, > WINEDDCAPS_COLORKEY | > WINEDDCAPS_COLORKEYHWASSIST | > WINEDDCAPS_ALIGNBOUNDARYSRC; > + pal_caps = WINEDDPCAPS_8BIT | > + WINEDDPCAPS_PRIMARYSURFACE; > > /* Fill the ddraw caps structure */ > pCaps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | > @@ -4796,6 +4798,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, > WINEDDCAPS2_PRIMARYGAMMA | > WINEDDCAPS2_WIDESURFACES | > WINEDDCAPS2_CANRENDERWINDOWED; > + pCaps->DirectDrawCaps.CKeyCaps = ckey_caps; > + pCaps->DirectDrawCaps.FXCaps = fx_caps; > + pCaps->DirectDrawCaps.PalCaps = pal_caps; > pCaps->DirectDrawCaps.SVBCaps = blit_caps; > pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; > pCaps->DirectDrawCaps.SVBFXCaps = fx_caps; > -- > 1.7.0.4 > > >

1 0

Re: shell32: add stubbed SHGetKnownFolderPath
by Alexandre Julliard 01 Sep '10

01 Sep '10

Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> writes: > @@ -111,3 +111,8 @@ typedef [v1_enum] enum tagSHCOLSTATE > } SHCOLSTATE; > > typedef DWORD SHCOLSTATEF; > + > +typedef GUID KNOWNFOLDERID; > + > +typedef KNOWNFOLDERID *REFKNOWNFOLDERID; This doesn't match the PSDK definitions. -- Alexandre Julliard julliard(a)winehq.org

1 0