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

Alexandre Julliard : urlmon/tests: Allow some more optional progress notifications.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 0789ec11449db52b6424e3959b7431f7f6524a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0789ec11449db52b6424e3959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 09:01:36 2012 +0200 urlmon/tests: Allow some more optional progress notifications. --- dlls/urlmon/tests/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a39b8ed..ce383ee 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -594,6 +594,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) SET_EXPECT(OnResponse); if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); + SET_EXPECT(ReportProgress_ENCODING); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -627,6 +628,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_ACCEPTRANGES); else if(test_redirect || test_abort) CLEAR_CALLED(ReportProgress_ACCEPTRANGES); + CLEAR_CALLED(ReportProgress_ENCODING); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -751,7 +753,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: - CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + CHECK_EXPECT2(ReportProgress_MIMETYPEAVAILABLE); if(tested_protocol != FILE_TEST && tested_protocol != ITS_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) { if(!short_read || !direct_read) CHECK_CALLED(Read); /* set in Continue */ @@ -831,7 +833,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_COOKIE_SENT: - CHECK_EXPECT(ReportProgress_COOKIE_SENT); + CHECK_EXPECT2(ReportProgress_COOKIE_SENT); ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_REDIRECTING:

1 0

Andrew Eikum : winmm: Close open wave devices upon process detach.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 31291cdc6ccc4c172ccf86f383c6a90f31a50ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31291cdc6ccc4c172ccf86f38… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 7 09:58:04 2012 -0500 winmm: Close open wave devices upon process detach. --- dlls/winmm/waveform.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d4dc9aa..a985ee8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -183,6 +183,26 @@ static LRESULT WID_Close(HWAVEIN hwave); void WINMM_DeleteWaveform(void) { + UINT i, j; + + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_out_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->open) + SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)device->handle, 0); + } + } + + for(i = 0; i < g_inmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_in_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->open) + SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)device->handle, 0); + } + } + /* FIXME: Free g_(in,out)_mmdevices? */ DeleteCriticalSection(&g_devthread_lock); }

1 0

Alexander E. Patrakov : dsound: Added a windowed-sinc resampler.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 275dfb83f2371a476b615b260465afb3cdf67f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275dfb83f2371a476b615b260… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon May 7 00:06:13 2012 +0600 dsound: Added a windowed-sinc resampler. --- dlls/dsound/dsound_private.h | 3 +- dlls/dsound/fir.h | 1587 ++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/mixer.c | 122 +++- tools/make_fir | 158 +++++ 4 files changed, 1852 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=275dfb83f2371a476b615…

1 0

Jeremy Newman : updated via suggestion from Adys
by Jeremy Newman May 8, 2012

May 8, 2012

Module: website Branch: master Commit: d2e3822e541724b7746acc17eaa776e01bd95b71 URL: http://source.winehq.org/git/website.git/?a=commit;h=d2e3822e541724b7746acc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 8 14:06:32 2012 -0500 updated via suggestion from Adys --- favicon.ico | Bin 1406 -> 1150 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.ico b/favicon.ico index 78b6d9b..3a71334 100644 Binary files a/favicon.ico and b/favicon.ico differ

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXSaveSurfaceToFile.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 8b17b0f5c6b469758fe78228611ad7f0b9a93d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b17b0f5c6b469758fe782286… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:23 2012 +0200 d3dx9/tests: Add tests for D3DXSaveSurfaceToFile. --- dlls/d3dx9_36/tests/surface.c | 84 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 79d4bc3..2138e45 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -917,6 +917,89 @@ static void test_D3DXCreateVolumeTexture(IDirect3DDevice9 *device) } } +static void test_D3DXSaveSurfaceToFile(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DSurface9 *surface; + RECT rect; + D3DLOCKED_RECT lock_rect; + D3DXIMAGE_INFO image_info; + const BYTE pixels[] = { 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff }; + DWORD pitch = sizeof(pixels) / 2; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); + if (FAILED(hr)) { + skip("Couldn't create surface\n"); + return; + } + + SetRect(&rect, 0, 0, 2, 2); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, pixels, D3DFMT_R8G8B8, pitch, NULL, &rect, D3DX_FILTER_NONE, 0); + if (SUCCEEDED(hr)) { + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.bmp", NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); + if (FAILED(hr)) goto next_tests; + + ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); + ok(image_info.Height == 2, "Wrong height %u\n", image_info.Height); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_BMP, "Wrong file format %u\n", image_info.ImageFileFormat); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); + if (FAILED(hr)) goto next_tests; + + ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); + + IDirect3DSurface9_UnlockRect(surface); + } else skip("Couldn't fill surface\n"); + +next_tests: + hr = D3DXSaveSurfaceToFileA(NULL, D3DXIFF_BMP, surface, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* PPM and TGA are supported, even though MSDN claims they aren't */ + todo_wine { + hr = D3DXSaveSurfaceToFileA("saved_surface.ppm", D3DXIFF_PPM, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&rect, 0, 0, 4, 4); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 2, 0, 1, 4); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 0, 2, 4, 1); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, -1, -1, 2, 2); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 0, 0, 0, 0); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + + DeleteFileA("saved_surface.bmp"); + DeleteFileA("saved_surface.ppm"); + DeleteFileA("saved_surface.tga"); + DeleteFileA("saved_surface.dds"); + + IDirect3DSurface9_Release(surface); +} + START_TEST(surface) { HWND wnd; @@ -952,6 +1035,7 @@ START_TEST(surface) test_D3DXLoadSurface(device); test_D3DXCreateCubeTexture(device); test_D3DXCreateVolumeTexture(device); + test_D3DXSaveSurfaceToFile(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Józef Kucia : d3dx9: Implement mapping from WICPixelFormat GUIDs to D3DFORMATs.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: ec51783494972d5cab6402976448037a731422d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec51783494972d5cab6402976… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:19 2012 +0200 d3dx9: Implement mapping from WICPixelFormat GUIDs to D3DFORMATs. --- dlls/d3dx9_36/surface.c | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 30906d7..44d4e06 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -31,6 +31,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* Wine-specific WIC GUIDs */ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); +static const struct +{ + const GUID *wic_guid; + D3DFORMAT d3dformat; +} wic_pixel_formats[] = { + { &GUID_WICPixelFormat8bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat1bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat4bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, + { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, + { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, + { &GUID_WICPixelFormat32bppBGR, D3DFMT_X8R8G8B8 }, + { &GUID_WICPixelFormat32bppBGRA, D3DFMT_A8R8G8B8 } +}; + +static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) +{ + int i; + + for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + { + if (IsEqualGUID(wic_pixel_formats[i].wic_guid, guid)) + return wic_pixel_formats[i].d3dformat; + } + + return D3DFMT_UNKNOWN; +} + /* dds_header.flags */ #define DDS_CAPS 0x1 #define DDS_HEIGHT 0x2 @@ -370,21 +398,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &pixel_format); if (SUCCEEDED(hr)) { - if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat1bppIndexed)) - info->Format = D3DFMT_L8; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat4bppIndexed)) - info->Format = D3DFMT_L8; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat8bppIndexed)) - info->Format = D3DFMT_L8; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat16bppBGR555)) - info->Format = D3DFMT_X1R5G5B5; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat24bppBGR)) - info->Format = D3DFMT_R8G8B8; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGR)) - info->Format = D3DFMT_X8R8G8B8; - else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGRA)) - info->Format = D3DFMT_A8R8G8B8; - else { + info->Format = wic_guid_to_d3dformat(&pixel_format); + if (info->Format == D3DFMT_UNKNOWN) { WARN("Unsupported pixel format %s\n", debugstr_guid(&pixel_format)); hr = D3DXERR_INVALIDDATA; }

1 0

Józef Kucia : d3dx9: Forward D3DXSaveSurfaceToFileA to D3DXSaveSurfaceToFileW.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: ea5f799a6b18004426c33386367d466dac11e13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5f799a6b18004426c333863… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:20 2012 +0200 d3dx9: Forward D3DXSaveSurfaceToFileA to D3DXSaveSurfaceToFileW. --- dlls/d3dx9_36/surface.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 44d4e06..ab316cf 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1364,11 +1364,27 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, } -HRESULT WINAPI D3DXSaveSurfaceToFileA(LPCSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, - LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *dst_filename, D3DXIMAGE_FILEFORMAT file_format, + IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect) { - FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); - return D3DERR_INVALIDCALL; + int len; + WCHAR *filename; + HRESULT hr; + + TRACE("(%s, %#x, %p, %p, %s): relay\n", + wine_dbgstr_a(dst_filename), file_format, src_surface, src_palette, wine_dbgstr_rect(src_rect)); + + if (!dst_filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, NULL, 0); + filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, filename, len); + + hr = D3DXSaveSurfaceToFileW(filename, file_format, src_surface, src_palette, src_rect); + + HeapFree(GetProcessHeap(), 0, filename); + return hr; } HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat,

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_GetChildren method and IDirect3DRMFrameArray interface .
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: df36fca97f7c5f17237be3348196ebfba3534010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df36fca97f7c5f17237be3348… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 09:40:26 2012 +0200 d3drm: Implement IDirect3DRMFrameX_GetChildren method and IDirect3DRMFrameArray interface. --- dlls/d3drm/frame.c | 160 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 23 ++++-- 2 files changed, 171 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df36fca97f7c5f17237be…

1 0

Austin English : wmvcore: Add a stub dll.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: d1cfbbb62cefb9de3fa1c6d0051aca68f98dc3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1cfbbb62cefb9de3fa1c6d00… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 3 12:41:30 2012 -0500 wmvcore: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/wmvcore/Makefile.in | 7 ++++++ dlls/wmvcore/wmvcore.spec | 20 +++++++++++++++++++ dlls/wmvcore/wmvcore_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 771cc60..896db3a 100755 --- a/configure +++ b/configure @@ -15457,6 +15457,7 @@ wine_fn_config_dll wldap32 enable_wldap32 implib,po wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils +wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll ws2_32 enable_ws2_32 implib diff --git a/configure.ac b/configure.ac index 1623ddc..857b99b 100644 --- a/configure.ac +++ b/configure.ac @@ -2945,6 +2945,7 @@ WINE_CONFIG_DLL(wldap32,,[implib,po]) WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils) +WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(ws2_32,,[implib]) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in new file mode 100644 index 0000000..3f06e19 --- /dev/null +++ b/dlls/wmvcore/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wmvcore.dll +IMPORTS = kernel32 + +C_SRCS = \ + wmvcore_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec new file mode 100644 index 0000000..1c6cb1f --- /dev/null +++ b/dlls/wmvcore/wmvcore.spec @@ -0,0 +1,20 @@ +@ stub WMCheckURLExtension +@ stub WMCheckURLScheme +@ stub WMCreateBackupRestorerPrivate +@ stub WMCreateSyncReaderPriv +@ stub WMIsAvailableOffline +@ stub WMValidateData +@ stub DllRegisterServer +@ stub WMCreateBackupRestorer +@ stub WMCreateEditor +@ stub WMCreateIndexer +@ stub WMCreateProfileManager +@ stub WMCreateReader +@ stub WMCreateReaderPriv +@ stub WMCreateSyncReader +@ stub WMCreateWriter +@ stub WMCreateWriterFileSink +@ stub WMCreateWriterNetworkSink +@ stub WMCreateWriterPriv +@ stub WMCreateWriterPushSink +@ stub WMIsContentProtected diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c new file mode 100644 index 0000000..096328b --- /dev/null +++ b/dlls/wmvcore/wmvcore_main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Austin English + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Christian Costa : dmusic: Midi message takes 4 bytes space but only 3 are relevant.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 9f05f54540f04e50e67cba7aed73ae67277df24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f05f54540f04e50e67cba7ae… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 4 08:40:38 2012 +0200 dmusic: Midi message takes 4 bytes space but only 3 are relevant. --- dlls/dmusic/buffer.c | 4 +- dlls/dmusic/tests/dmusic.c | 50 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index bf60470..2fd76b5 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -109,7 +109,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER if (new_write_pos > This->size) return DMUS_E_BUFFER_FULL; - /* Channel_message 0xZZYYXX is a midi message where XX = status byte, YY = byte 1 and ZZ = byte 2 */ + /* Channel_message 0xZZYYXX (3 bytes) is a midi message where XX = status byte, YY = byte 1 and ZZ = byte 2 */ if (!(channel_message & 0x80)) { @@ -120,7 +120,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER if (!This->write_pos) This->start_time = ref_time; - header.cbEvent = sizeof(channel_message); + header.cbEvent = 3; /* Midi message takes 4 bytes space but only 3 are relevant */ header.dwChannelGroup = channel_group; header.rtDelta = ref_time - This->start_time; header.dwFlags = DMUS_EVENT_STRUCTURED; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index fb4b307..24ae90d 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,7 +29,7 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline char* debugstr_guid(CONST GUID *id) +static inline const char* debugstr_guid(CONST GUID *id) { static char string[39]; sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", @@ -39,6 +39,16 @@ static inline char* debugstr_guid(CONST GUID *id) return string; } +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; +} + static void test_dmusic(void) { IDirectMusic *dmusic = NULL; @@ -127,6 +137,7 @@ static void test_dmbuffer(void) DWORD size; DWORD bytes; REFERENCE_TIME time; + LPBYTE data; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); if (hr != S_OK) @@ -161,18 +172,49 @@ static void test_dmbuffer(void) ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr); hr = IDirectMusicBuffer_PackStructured(dmbuffer, 20, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 30, 0, 0x000080); /* note off : chan 0, note 0 & vel 0 */ + ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); hr = IDirectMusicBuffer_GetUsedBytes(dmbuffer, &bytes); ok(hr == S_OK, "IDirectMusicBuffer_GetUsedBytes returned %x\n", hr); - ok(bytes == 24, "Buffer size is %u instead of 0\n", bytes); + ok(bytes == 48, "Buffer size is %u instead of 48\n", bytes); hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); ok(time == 20, "Buffer start time is wrong\n"); - hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 30); + hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 40); ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); - ok(time == 30, "Buffer start time is wrong\n"); + ok(time == 40, "Buffer start time is wrong\n"); + + hr = IDirectMusicBuffer_GetRawBufferPtr(dmbuffer, &data); + ok(hr == S_OK, "IDirectMusicBuffer_GetRawBufferPtr returned %x\n", hr); + if (hr == S_OK) + { + DMUS_EVENTHEADER* header; + DWORD message; + + /* Check message 1 */ + header = (DMUS_EVENTHEADER*)data; + data += sizeof(DMUS_EVENTHEADER); + ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); + ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); + ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); + message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ + data += sizeof(DWORD); + ok(message == 0x000090, "Message is %0x instead of 0x000090\n", message); + + /* Check message 2 */ + header = (DMUS_EVENTHEADER*)data; + data += sizeof(DMUS_EVENTHEADER); + ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); + ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); + ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); + message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ + ok(message == 0x000080, "Message 2 is %0x instead of 0x000080\n", message); + } if (dmbuffer) IDirectMusicBuffer_Release(dmbuffer);

1 0