April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_LockRect ().
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 883e7bbe87276277da4b976a5e8f5e84a069a3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=883e7bbe87276277da4b976a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:10 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_LockRect(). --- dlls/d3d8/cubetexture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 5a3496a..ebfff7f 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -312,6 +312,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -323,8 +324,10 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), - locked_rect, rect, flags); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DCubeTexture8Impl.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: b8d07a2b44f9ae7594d6a6c8805f8f559168c775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d07a2b44f9ae7594d6a6c88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:13 2012 +0200 d3d8: Get rid of IDirect3DCubeTexture8Impl. --- dlls/d3d8/cubetexture.c | 209 ++++++++++++++++++++++------------------------ dlls/d3d8/d3d8_private.h | 20 +---- dlls/d3d8/device.c | 6 +- dlls/d3d8/texture.c | 4 +- 4 files changed, 108 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8d07a2b44f9ae7594d6a…

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_UnlockRect ().
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: e0390da628cc9365c28360a514a01327e2bca5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0390da628cc9365c28360a51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:11 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_UnlockRect(). --- dlls/d3d8/cubetexture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index ebfff7f..ff41e1c 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -338,6 +338,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -348,7 +349,10 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); + } wined3d_mutex_unlock(); return hr;

1 0

Piotr Caban : msvcrt: Added more length modifiers in scanf function.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 7240170ceedecef6aac674e795fdc4e1a74e131a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7240170ceedecef6aac674e79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 16:32:57 2012 +0200 msvcrt: Added more length modifiers in scanf function. --- dlls/msvcrt/scanf.h | 12 +++++++++--- dlls/msvcrt/tests/scanf.c | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 9f6911e..cc2b861 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -198,8 +198,14 @@ _FUNCTION_ { /* read prefix (if any) */ while (!prefix_finished) { switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; + case 'h': h_prefix++; break; + case 'l': + if(*(format+1) == 'l') { + I64_prefix = 1; + format++; + } + l_prefix = 1; + break; case 'w': w_prefix = 1; break; case 'L': L_prefix = 1; break; case 'I': @@ -294,7 +300,7 @@ _FUNCTION_ { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); - else if (h_prefix) _SET_NUMBER_(short int); + else if (h_prefix == 1) _SET_NUMBER_(short int); else _SET_NUMBER_(int); } } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 8b13bdc..fb9d8e8 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -27,6 +27,7 @@ static void test_sscanf( void ) char buffer[100], buffer1[100]; char format[20]; int result, ret; + LONGLONG result64; char c; void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; @@ -125,6 +126,25 @@ static void test_sscanf( void ) ok(ret == 0 , "problem with format arg \"%%*c%%n\"\n"); ok(number_so_far == 1,"Read wrong arg for \"%%n\" %d instead of 2\n",number_so_far); + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = sscanf(buffer, "%hd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + ret = sscanf(buffer, "%hhd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + + strcpy(buffer,"12345678901234"); + ret = sscanf(buffer, "%lld", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = sprintf(buffer1, "%lld", result64); + ok(ret==14 || broken(ret==10), "sprintf retuned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = sscanf(buffer, "%i", &result);

1 0

Piotr Caban : msvcrt: Fixed 'h' modifier handling when printing integers.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 0cc16fc8a56ef9511366dec8a904cd8da34b661c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc16fc8a56ef9511366dec8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 15:21:47 2012 +0200 msvcrt: Fixed 'h' modifier handling when printing integers. --- dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/tests/printf.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a60ba74..79a03a9 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -525,11 +525,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, VT_I8, valist).get_longlong); else if(flags.Format=='d' || flags.Format=='i') - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, - VT_INT, valist).get_int); + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, flags.IntegerLength!='h' ? + pf_args(args_ctx, pos, VT_INT, valist).get_int : + (short)pf_args(args_ctx, pos, VT_INT, valist).get_int); else - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, (unsigned)pf_args( - args_ctx, pos, VT_INT, valist).get_int); + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, flags.IntegerLength!='h' ? + (unsigned)pf_args(args_ctx, pos, VT_INT, valist).get_int : + (unsigned short)pf_args(args_ctx, pos, VT_INT, valist).get_int); #ifdef PRINTF_WIDE i = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, tmp, -1, &flags, locinfo); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ff86516..1507a01 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -607,6 +607,16 @@ static void test_sprintf( void ) r = sprintf(buffer, format); ok(!strcmp(buffer,"%0"), "failed: \"%s\"\n", buffer); ok( r==2, "return count wrong\n"); + + format = "%hx"; + r = sprintf(buffer, format, 0x12345); + ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); + + format = "%hhx"; + r = sprintf(buffer, format, 0x123); + ok(!strcmp(buffer,"123"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, 0x12345); + ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); } static void test_swprintf( void )

1 0

Christian Costa : dmband: Add tests.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 54168bde5ce5cfdd4d76edec351d3729f08b6da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54168bde5ce5cfdd4d76edec3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:28:35 2012 +0200 dmband: Add tests. --- configure | 1 + configure.ac | 1 + dlls/dmband/tests/Makefile.in | 7 ++++ dlls/dmband/tests/dmband.c | 81 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 37845fb..bb49fe2 100755 --- a/configure +++ b/configure @@ -15022,6 +15022,7 @@ wine_fn_config_dll dispex enable_dispex wine_fn_config_test dlls/dispex/tests dispex_test wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband +wine_fn_config_test dlls/dmband/tests dmband_test wine_fn_config_dll dmcompos enable_dmcompos wine_fn_config_dll dmime enable_dmime wine_fn_config_test dlls/dmime/tests dmime_test diff --git a/configure.ac b/configure.ac index a57f133..efc03af 100644 --- a/configure.ac +++ b/configure.ac @@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(dispex) WINE_CONFIG_TEST(dlls/dispex/tests) WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) +WINE_CONFIG_TEST(dlls/dmband/tests) WINE_CONFIG_DLL(dmcompos) WINE_CONFIG_DLL(dmime) WINE_CONFIG_TEST(dlls/dmime/tests) diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in new file mode 100644 index 0000000..71660aa --- /dev/null +++ b/dlls/dmband/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dmband.dll +IMPORTS = oleaut32 ole32 uuid + +C_SRCS = \ + dmband.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c new file mode 100644 index 0000000..ecc767a --- /dev/null +++ b/dlls/dmband/tests/dmband.c @@ -0,0 +1,81 @@ +/* + * Unit tests for dmband functions + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "wine/test.h" +#include "uuids.h" +#include "ole2.h" +#include "initguid.h" +#include "dmusici.h" +#include "dmplugin.h" + +DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); + +static void test_dmband(void) +{ + IDirectMusicBand *band; + IUnknown *unknown = NULL; + IDirectMusicTrack *track = NULL; + IPersistStream *stream = NULL; + IPersistStream *private = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (LPVOID*)&band); + if (hr != S_OK) + { + skip("Cannot create DirectMusicBand object (%x)\n", hr); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); + ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + todo_wine ok((LPVOID)track == (LPVOID)unknown, "Interface are not the same %p != %p\n", stream, private); + hr = IUnknown_QueryInterface(unknown, &IID_IPersistStream, (LPVOID*)&stream); + ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + /* Query private interface */ + hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicBandTrackPrivate, (LPVOID*)&private); + todo_wine ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + + trace("Interfaces: unknown = %p, track = %p, stream = %p, private = %p\n", unknown, track, stream, private); + + if (private) + IPersistStream_Release(private); + if (stream) + IPersistStream_Release(stream); + if (track) + IDirectMusicTrack_Release(track); + if (unknown) + IUnknown_Release(unknown); + IDirectMusicBand_Release(band); +} + +START_TEST(dmband) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_dmband(); + + CoUninitialize(); +}

1 0

Christian Costa : dmband: Display flag variables in hexadecimal and rename some parameters.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 916bfc6cf4217df459992e505799a27fd5e20477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916bfc6cf4217df459992e505… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:28:44 2012 +0200 dmband: Display flag variables in hexadecimal and rename some parameters. --- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 74 ++++++++++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index d1b8029..e67bc8e 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -406,7 +406,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR TRACE_(dmfile)(" - dwNoteRanges[2]: %u\n", inst.dwNoteRanges[2]); TRACE_(dmfile)(" - dwNoteRanges[3]: %u\n", inst.dwNoteRanges[3]); TRACE_(dmfile)(" - dwPChannel: %u\n", inst.dwPChannel); - TRACE_(dmfile)(" - dwFlags: %u\n", inst.dwFlags); + TRACE_(dmfile)(" - dwFlags: %x\n", inst.dwFlags); TRACE_(dmfile)(" - bPan: %u\n", inst.bPan); TRACE_(dmfile)(" - bVolume: %u\n", inst.bVolume); TRACE_(dmfile)(" - nTranspose: %d\n", inst.nTranspose); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 7d5ed0c..878ccc0 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -103,10 +103,13 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Init (LPDIRECTMUSI return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_InitPlay(LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* segment_state, IDirectMusicPerformance* performance, void** state_data, DWORD virtual_track8id, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %p, %p, %p, %d, %x): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) { @@ -115,18 +118,20 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_EndPlay (LPDIRECTM return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): semi-stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); - /* Sends following pMSG: - - DMUS_PATCH_PMSG - - DMUS_TRANSPOSE_PMSG - - DMUS_CHANNEL_PRIORITY_PMSG - - DMUS_MIDI_PMSG - */ +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Play(LPDIRECTMUSICTRACK8 iface, void* state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance* performance, IDirectMusicSegmentState* segment_state, DWORD virtual_id) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - return S_OK; + FIXME("(%p, %p, %d, %d, %d, %x, %p, %p, %d): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + + /* Sends following pMSG: + - DMUS_PATCH_PMSG + - DMUS_TRANSPOSE_PMSG + - DMUS_CHANNEL_PRIORITY_PMSG + - DMUS_MIDI_PMSG + */ + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { @@ -182,25 +187,34 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Clone (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), - wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_PlayEx(LPDIRECTMUSICTRACK8 iface, void* state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance* performance, IDirectMusicSegmentState* segment_state, DWORD virtual_id) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %x, %p, %p, %d): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx(LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* rtNext, void* param, void* state_data, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %s, 0x%s, %p, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx(LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* param, void* state_data, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %s, 0x%s, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), param, state_data, flags); + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {

1 0

André Hentschel : winedbg: Solve ARM disassembling fixmes.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: abc304f3091bc467889fe99f1af05b6aee9fb6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc304f3091bc467889fe99f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:12:07 2012 +0200 winedbg: Solve ARM disassembling fixmes. --- programs/winedbg/be_arm.c | 50 +++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3e4d8c5..52126ff 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -139,7 +139,7 @@ static UINT arm_disasm_singletrans(UINT inst) short writeback = (inst >> 21) & 0x01; short byte = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short immediate = !((inst >> 25) & 0x01); short offset = inst & 0x0fff; @@ -147,11 +147,21 @@ static UINT arm_disasm_singletrans(UINT inst) dbg_printf("\n\t%s%s%s%s", load ? "ldr" : "str", byte ? "b" : "", writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, [r%u, #%d]", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), - get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -163,17 +173,28 @@ static UINT arm_disasm_halfwordtrans(UINT inst) short writeback = (inst >> 21) & 0x01; short immediate = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, r%u, #%d", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -207,7 +228,7 @@ static UINT arm_disasm_blocktrans(UINT inst) static UINT arm_disasm_swi(UINT inst) { UINT comment = inst & 0x00ffffff; - dbg_printf("\n\tswi%s\t#%d/0x%08x", get_cond(inst), comment, comment); + dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); return 0; } @@ -244,16 +265,19 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) WORD CPnum = (inst >> 8) & 0x0f; WORD CRd = (inst >> 12) & 0x0f; WORD load = (inst >> 20) & 0x01; - /* FIXME: what to do with bit 21 (writeback) */ + WORD writeback = (inst >> 21) & 0x01; WORD translen = (inst >> 22) & 0x01; WORD direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + WORD indexing = (inst >> 24) & 0x01; short offset = (inst & 0xff) << 2; if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond(inst)); - dbg_printf("\t%u, cr%u, [r%u, #%d]", CPnum, CRd, get_nibble(inst, 4), offset); + if (indexing) + dbg_printf("\t%u, cr%u, [r%u, #%d]%s", CPnum, CRd, get_nibble(inst, 4), offset, writeback?"!":""); + else + dbg_printf("\t%u, cr%u, [r%u], #%d", CPnum, CRd, get_nibble(inst, 4), offset); return 0; }

1 0

Hans Leidekker : iphlpapi: Add tests for GetExtendedTcpTable.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: d2dbd9bdac15cf270bffdca9d54e12cf39a563fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dbd9bdac15cf270bffdca9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:44 2012 +0200 iphlpapi: Add tests for GetExtendedTcpTable. --- dlls/iphlpapi/tests/iphlpapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0cbfb31..ec388a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -66,6 +66,7 @@ typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG) typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); +typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -87,6 +88,7 @@ static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static NotifyAddrChangeFunc gNotifyAddrChange = NULL; static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; +static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; static void loadIPHlpApi(void) { @@ -130,6 +132,8 @@ static void loadIPHlpApi(void) hLibrary, "NotifyAddrChange"); gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( hLibrary, "CancelIPChangeNotify"); + gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( + hLibrary, "GetExtendedTcpTable"); } } @@ -154,6 +158,7 @@ static void freeIPHlpApi(void) gGetUdpTable = NULL; gNotifyAddrChange = NULL; gCancelIPChangeNotify = NULL; + gGetExtendedTcpTable = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -970,6 +975,39 @@ static void test_GetAdaptersAddresses(void) HeapFree(GetProcessHeap(), 0, ptr); } +static void test_GetExtendedTcpTable(void) +{ + DWORD ret, size; + MIB_TCPTABLE *table; + MIB_TCPTABLE_OWNER_PID *table_pid; + + if (!gGetExtendedTcpTable) + { + win_skip("GetExtendedTcpTable not available\n"); + return; + } + ret = gGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); +} + START_TEST(iphlpapi) { @@ -987,6 +1025,7 @@ START_TEST(iphlpapi) testWin2KFunctions(); test_GetAdaptersAddresses(); + test_GetExtendedTcpTable(); freeIPHlpApi(); } }

1 0

Alexander Morozov : kernel32/tests: Add more tests for early closing mapping handle.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 5c9ca5cb53d98c39420a7a9f46ff06b1d6e8a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ca5cb53d98c39420a7a9f4… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Apr 16 15:47:07 2012 +0400 kernel32/tests: Add more tests for early closing mapping handle. --- dlls/kernel32/tests/virtual.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2c3f22d..4ca47e0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -809,9 +809,56 @@ static void test_MapViewOfFile(void) ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); CloseHandle(mapping); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + SetLastError(0xdeadbeef); + file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok( ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); + CloseHandle(map2); + CloseHandle(mapping); + + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + todo_wine + ok( map2 == 0, "OpenFileMappingA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); + CloseHandle(map2); + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed\n" ); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); + CloseHandle(mapping); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + SetLastError(0xdeadbeef); + ret = UnmapViewOfFile(ptr); + ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + CloseHandle(file); + DeleteFileA(testfile); } static void test_NtMapViewOfSection(void)

1 0