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

Piotr Caban : msvcrt: Fixed 'h' modifier handling when printing integers.
by Alexandre Julliard 16 Apr '12

16 Apr '12

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

Piotr Caban : msvcrt: Added more length modifiers in scanf function.
by Alexandre Julliard 16 Apr '12

16 Apr '12

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

Christian Costa : dmband: Add tests.
by Alexandre Julliard 16 Apr '12

16 Apr '12

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 16 Apr '12

16 Apr '12

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

Christian Costa : d3drm: Pass the first requested interface when notifying the application.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: efba6cd03b4142333813c1f7e609c3df8d49959c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba6cd03b4142333813c1f7e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:36:31 2012 +0200 d3drm: Pass the first requested interface when notifying the application. --- dlls/d3drm/d3drm.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3db6b9e..ba29e6e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder; TRACE("Found TID_D3DRMMesh\n"); @@ -1361,26 +1360,31 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMMESHBUILDER3 meshbuilder; + FIXME("Load mesh data and notify application\n"); - hr = IDirect3DRM3_CreateMeshBuilder(iface, &pMeshBuilder); + hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + LPDIRECT3DRMOBJECT object = NULL; - hr = IDirect3DRMMeshBuilder3_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void**)&pMeshBuilder3); + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); if (SUCCEEDED(hr)) { - hr = load_mesh_data(pMeshBuilder3, pData); - IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); + hr = load_mesh_data(meshbuilder, pData); + if (SUCCEEDED(hr)) + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); } - if (SUCCEEDED(hr)) - LoadProc((LPDIRECT3DRMOBJECT)pMeshBuilder3, &IID_IDirect3DRMMeshBuilder, ArgLP); - IDirect3DRMMeshBuilder_Release(pMeshBuilder3); + IDirect3DRMMeshBuilder3_Release(meshbuilder); } if (FAILED(hr)) @@ -1391,7 +1395,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1399,21 +1402,33 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMFRAME3 frame; + FIXME("Fake frame data and notify application\n"); hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); if (SUCCEEDED(hr)) { - LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + LPDIRECT3DRMOBJECT object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } IDirect3DRMFrame3_Release(frame); } if (FAILED(hr)) - ERR("Cannot process mesh\n"); + ERR("Cannot process frame\n"); } }

1 0

Alexandre Julliard : gdi32: Add a GetBoundsRect driver entry point.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 582a2f511f23f4677434a8ffff70b1ba8a0a8567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582a2f511f23f4677434a8fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 16:17:14 2012 +0200 gdi32: Add a GetBoundsRect driver entry point. --- dlls/gdi32/dc.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 10 ++++++++++ dlls/gdi32/path.c | 1 + dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 12 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c256f26..a35e4fa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -222,6 +222,22 @@ void update_dc( DC *dc ) /*********************************************************************** + * fetch_device_bounds + * + * Fetch and clear the device-specific bounds, and add them to the DC if necessary. + */ +static BOOL fetch_device_bounds( DC *dc ) +{ + RECT rect; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetBoundsRect ); + UINT ret = physdev->funcs->pGetBoundsRect( physdev, &rect, DCB_RESET ); + + if (dc->bounds_enabled && ret == DCB_SET) add_bounds_rect( &dc->bounds, &rect ); + return ret; +} + + +/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -1316,6 +1332,12 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if ( !dc ) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + if (rect) { if (is_rect_empty( &dc->bounds )) @@ -1351,6 +1373,12 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | (is_rect_empty( &dc->bounds ) ? DCB_RESET : DCB_SET); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9f1a633..af4f6e7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -599,6 +599,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 36bf48f..43dcc20 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -311,6 +311,11 @@ static BOOL nulldrv_GdiRealizationInfo( PHYSDEV dev, void *info ) return FALSE; } +static UINT nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return DCB_RESET; +} + static BOOL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT last, LPABC abc ) { return FALSE; @@ -758,6 +763,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_FrameRgn, /* pFrameRgn */ nulldrv_GdiComment, /* pGdiComment */ nulldrv_GdiRealizationInfo, /* pGdiRealizationInfo */ + nulldrv_GetBoundsRect, /* pGetBoundsRect */ nulldrv_GetCharABCWidths, /* pGetCharABCWidths */ nulldrv_GetCharABCWidthsI, /* pGetCharABCWidthsI */ nulldrv_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 883ca5a..3356911 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -75,6 +75,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_FrameRgn, /* pFrameRgn */ EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a5d3c3..3875e4f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7772,6 +7772,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ freetype_GdiRealizationInfo, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e02c6be..6ccbfe4 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -60,6 +60,15 @@ static INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_da /****************************************************************** + * MFDRV_GetBoundsRect + */ +static UINT MFDRV_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return 0; +} + + +/****************************************************************** * MFDRV_GetDeviceCaps * *A very simple implementation that returns DT_METAFILE @@ -120,6 +129,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + MFDRV_GetBoundsRect, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 058a48a..ec6348c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2274,6 +2274,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 4b8567d..bc03b25 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -367,7 +367,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) SetMapMode( hdc, MM_TEXT ); Rectangle( hdc, 2, 2, 5, 5 ); type = GetBoundsRect( hdc, &rect, DCB_RESET ); - todo_wine ok( !type, "GetBoundsRect succeeded on %s\n", descr ); } else diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index b2597d7..c51a7e3 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -857,6 +857,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ PSDRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index de0d029..324e3f0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -491,6 +491,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ X11DRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7c763fc..7cd87d9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2684,6 +2684,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eb64b36..01e2ebb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -101,6 +101,7 @@ struct gdi_dc_funcs BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); BOOL (*pGdiRealizationInfo)(PHYSDEV,void*); + UINT (*pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); @@ -211,7 +212,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 24 +#define WINE_GDI_DRIVER_VERSION 25 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Add bounds tracking to all the DIB engine entry points.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 34457aa4c3bf445c7c95bf048422d37ac07a6bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34457aa4c3bf445c7c95bf048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 11 14:49:30 2012 +0200 gdi32: Add bounds tracking to all the DIB engine entry points. --- dlls/gdi32/dibdrv/bitblt.c | 5 +++ dlls/gdi32/dibdrv/dc.c | 31 +++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 71 ++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/dc.c | 18 +++++----- dlls/gdi32/tests/dib.c | 16 ++------- 6 files changed, 118 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34457aa4c3bf445c7c95b…

1 0

Piotr Caban : msvcrt: Added support for %W and %U format in strftime.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bfa3045816d2d9caf64b4a13fb06fb77b6361ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa3045816d2d9caf64b4a13f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 12:26:16 2012 +0200 msvcrt: Added support for %W and %U format in strftime. --- dlls/msvcrt/tests/time.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/time.c | 16 +++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 6fb7491..c6e2a9c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -704,6 +704,32 @@ static void test_strftime(void) ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_wday = 0; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_yday = 365; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "53"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "52"), "got %s\n", bufA); + gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; retA = strftime(bufA, 256, "%c", gmt_tm); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 69bd391..bc68218 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1077,9 +1077,19 @@ MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, break; case 'U': case 'W': - FIXME("format %c not yet supported (%x)\n", *format, alternate); - str[0] = 0; - return 0; + if(mstm->tm_wday<0 || mstm->tm_wday>6 || mstm->tm_yday<0 || mstm->tm_yday>365) + goto einval_error; + if(*format == 'U') + tmp = mstm->tm_wday; + else if(!mstm->tm_wday) + tmp = 6; + else + tmp = mstm->tm_wday-1; + + tmp = mstm->tm_yday/7 + (tmp<=mstm->tm_yday%7); + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 53)) + return 0; + break; case '%': str[ret++] = '%'; break;

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::bottom implementation.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 53adfe77d39f6ae3e0ad86d915cbaee6fccea631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53adfe77d39f6ae3e0ad86d91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:22 2012 +0200 mshtml: Added IHTMLStyle2::bottom implementation. --- dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index e3bd22f..d85ea97 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -205,15 +205,19 @@ static HRESULT WINAPI HTMLStyle2_get_unicodeBidi(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_bottom(IHTMLStyle2 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, 0); } static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle2_put_right(IHTMLStyle2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9c7da84..cecdd20 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -52,6 +52,16 @@ static BSTR a2bstr(const char *str) return ret; } +#define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) +static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) +{ + ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(v)); + if(expect) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(v), expect), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), expect); + else + ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); +} + #define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) { @@ -305,6 +315,22 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_direction failed: %08x\n", hres); ok(!strcmp_wa(str, "ltr"), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* bottom */ + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_bottom(style2, &v); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + test_var_bstr(&v, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 4; + hres = IHTMLStyle2_put_bottom(style2, v); + ok(hres == S_OK, "put_bottom failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_bottom(style2, &v); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + test_var_bstr(&v, "4px"); } static void test_style3(IHTMLStyle3 *style3)

1 0

Jacek Caban : mshtml: Added support for IHTMLEventObj:: cancelBubble property.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: cea8bc5237268be68185c1bb2081915f5c6fc6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea8bc5237268be68185c1bb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:46 2012 +0200 mshtml: Added support for IHTMLEventObj::cancelBubble property. --- dlls/mshtml/htmlevent.c | 18 +++++++---- dlls/mshtml/tests/events.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2d8dc83..b9c9aad 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -250,6 +250,7 @@ typedef struct { const event_info_t *type; nsIDOMEvent *nsevent; BOOL prevent_default; + BOOL cancel_bubble; } HTMLEventObj; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) @@ -471,17 +472,20 @@ static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL v) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + This->cancel_bubble = !!v; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = VARIANT_FALSE; + *p = This->cancel_bubble ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } @@ -1016,7 +1020,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode call_event_handlers(doc, event_obj, *get_node_event_target(node), node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); - if(!(event_info[eid].flags & EVENT_BUBBLE)) + if(!(event_info[eid].flags & EVENT_BUBBLE) || (event_obj && event_obj->cancel_bubble)) break; nsIDOMNode_GetParentNode(nsnode, &parent); @@ -1028,7 +1032,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode nsIDOMNode_GetNodeType(nsnode, &node_type); }while(node_type == ELEMENT_NODE); - if(!(event_info[eid].flags & EVENT_BUBBLE)) + if(!(event_info[eid].flags & EVENT_BUBBLE) || (event_obj && event_obj->cancel_bubble)) break; case DOCUMENT_NODE: @@ -1076,7 +1080,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(node && node->vtbl->handle_event) { hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); - if(FAILED(hres) || prevent_default) + if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d1f4e9b..6d74f40 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -78,7 +78,9 @@ DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); +DEFINE_EXPECT(submit_onclick_cancel); DEFINE_EXPECT(submit_onclick_attached); +DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); static HWND container_hwnd = NULL; @@ -429,6 +431,7 @@ static void _test_event_shiftkey(unsigned line, IHTMLEventObj *event, VARIANT_BO ok_(__FILE__,line)(b == exval, "shiftKey = %x, expected %x\n", b, exval); } +#define test_event_cancelbubble(a,b) _test_event_cancelbubble(__LINE__,a,b) static void _test_event_cancelbubble(unsigned line, IHTMLEventObj *event, VARIANT_BOOL exval) { VARIANT_BOOL b; @@ -1015,6 +1018,27 @@ static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCI EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached); +static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event; + HRESULT hres; + + CHECK_EXPECT(submit_onclick_attached_check_cancel); + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + test_event_src("INPUT"); + + event = NULL; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(event != NULL, "event == NULL\n"); + + test_event_cancelbubble(event, VARIANT_TRUE); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached_check_cancel); + static VARIANT onclick_retval, onclick_event_retval; static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -1042,6 +1066,33 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID EVENT_HANDLER_FUNC_OBJ(submit_onclick_setret); +static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event; + HRESULT hres; + + CHECK_EXPECT(submit_onclick_cancel); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + + event = NULL; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(event != NULL, "event == NULL\n"); + + test_event_cancelbubble(event, VARIANT_FALSE); + + hres = IHTMLEventObj_put_cancelBubble(event, VARIANT_TRUE); + ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); + IHTMLEventObj_Release(event); + + test_event_cancelbubble(event, VARIANT_TRUE); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_cancel); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1930,6 +1981,23 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); + elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_check_cancel_obj); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&submit_onclick_cancel_obj; + hres = IHTMLElement_put_onclick(submit, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + SET_EXPECT(submit_onclick_cancel); + SET_EXPECT(submit_onclick_attached_check_cancel); + SET_EXPECT(submit_onclick_attached); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_cancel); + CHECK_CALLED(submit_onclick_attached_check_cancel); + CHECK_CALLED(submit_onclick_attached); + IHTMLElement_Release(submit); }

1 0