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

Detlef Riekenberg : devenum: Remove tabs and duplicate newlines from TRACE.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 25cf21bddcd660dd65f5109487d2a2d2300a2b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cf21bddcd660dd65f510948… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 7 21:21:24 2012 +0200 devenum: Remove tabs and duplicate newlines from TRACE. --- dlls/devenum/createdevenum.c | 5 ++--- dlls/devenum/factory.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index f4e8727..4a2e101 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -62,7 +62,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void); static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, void **ppv) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -463,8 +463,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( HKEY hbasekey; HRESULT hr; - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", iface, debugstr_guid(clsidDeviceClass), - ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); if (!ppEnumMoniker) return E_POINTER; diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index 215eb3a..c808fa5 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER; @@ -81,7 +81,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER;

1 0

Józef Kucia : d3dx9/tests: Use consistent naming for DDS defines.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: ecb1c602f4f50c066ca86cb88b3b6f89e0d62401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb1c602f4f50c066ca86cb88… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon May 7 22:29:06 2012 +0200 d3dx9/tests: Use consistent naming for DDS defines. --- dlls/d3dx9_36/tests/surface.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2138e45..981d480 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -143,13 +143,13 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_WIDTH 0x00000004 #define DDS_PIXELFORMAT 0x00001000 -#define DDSCAPS_TEXTURE 0x00001000 +#define DDS_CAPS_TEXTURE 0x00001000 -#define DDSPF_ALPHAPIXELS 0x00000001 -#define DDSPF_ALPHA 0x00000002 -#define DDSPF_FOURCC 0x00000004 -#define DDSPF_RGB 0x00000040 -#define DDSPF_LUMINANCE 0x00020000 +#define DDS_PF_ALPHA 0x00000001 +#define DDS_PF_ALPHA_ONLY 0x00000002 +#define DDS_PF_FOURCC 0x00000004 +#define DDS_PF_RGB 0x00000040 +#define DDS_PF_LUMINANCE 0x00020000 static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, @@ -196,7 +196,7 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, dds.pixel_format.gmask = gmask; dds.pixel_format.bmask = bmask; dds.pixel_format.amask = amask; - dds.caps = DDSCAPS_TEXTURE; + dds.caps = DDS_CAPS_TEXTURE; hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); @@ -375,30 +375,30 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from volume map in memory\n"); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); - check_dds_pixel_format(DDSPF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); - check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4); - check_dds_pixel_format(DDSPF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2); - check_dds_pixel_format(DDSPF_ALPHA, 0, 8, 0, 0, 0, 0xff, D3DFMT_A8); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2); - check_dds_pixel_format(DDSPF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, D3DFMT_X4R4G4B4); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); - check_dds_pixel_format(DDSPF_RGB | DDSPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); - check_dds_pixel_format(DDSPF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); - check_dds_pixel_format(DDSPF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); - check_dds_pixel_format(DDSPF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); - check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); - check_dds_pixel_format(DDSPF_LUMINANCE | DDSPF_ALPHAPIXELS, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4); + check_dds_pixel_format(DDS_PF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2); + check_dds_pixel_format(DDS_PF_ALPHA_ONLY, 0, 8, 0, 0, 0, 0xff, D3DFMT_A8); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, D3DFMT_X4R4G4B4); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); todo_wine { hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info);

1 0

Nikolay Sivov : shell32: Implement IShellDispatch2::IsServiceRunning().
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 9af543aad8ff50ba0e5ad7a1803b6608433a3717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af543aad8ff50ba0e5ad7a18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 7 13:42:27 2012 +0400 shell32: Implement IShellDispatch2::IsServiceRunning(). --- dlls/shell32/shelldispatch.c | 45 ++++++++++++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 61 ++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 29298b3..825c405 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winsvc.h" #include "shlwapi.h" #include "shlobj.h" #include "shldisp.h" @@ -1038,10 +1039,48 @@ static HRESULT WINAPI ShellDispatch_ServiceStop(IShellDispatch2 *iface, BSTR ser return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BSTR service, VARIANT *running) +static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BSTR name, VARIANT *running) { - FIXME("(%s, %p): stub\n", debugstr_w(service), running); - return E_NOTIMPL; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + DWORD dummy; + + TRACE("(%s, %p)\n", debugstr_w(name), running); + + V_VT(running) = VT_BOOL; + V_BOOL(running) = VARIANT_FALSE; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm) + { + ERR("failed to connect to service manager\n"); + return S_OK; + } + + service = OpenServiceW(scm, name, SERVICE_QUERY_STATUS); + if (!service) + { + ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); + CloseServiceHandle(service); + return S_OK; + } + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, + sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(scm); + return S_OK; + } + + if (status.dwCurrentState == SERVICE_RUNNING) + V_BOOL(running) = VARIANT_TRUE; + + CloseServiceHandle(service); + CloseServiceHandle(scm); + + return S_OK; } static HRESULT WINAPI ShellDispatch_CanStartStopService(IShellDispatch2 *iface, BSTR service, VARIANT *ret) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 2ccc364..307e0fc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -27,6 +27,9 @@ #include "shlwapi.h" #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); @@ -303,6 +306,63 @@ static void test_namespace(void) IShellDispatch_Release(sd); } +static void test_service(void) +{ + static const WCHAR spooler[] = {'S','p','o','o','l','e','r',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + IShellDispatch2 *sd; + DWORD dummy; + HRESULT hr; + BSTR name; + VARIANT v; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch2, (void**)&sd); + if (hr != S_OK) + { + win_skip("IShellDispatch2 not supported\n"); + return; + } + + V_VT(&v) = VT_I2; + V_I2(&v) = 10; + hr = IShellDispatch2_IsServiceRunning(sd, NULL, &v); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + EXPECT_HR(hr, S_OK); + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + service = OpenServiceW(scm, spooler, SERVICE_QUERY_STATUS); + QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy); + CloseServiceHandle(service); + CloseServiceHandle(scm); + + /* service should exist */ + name = SysAllocString(spooler); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + if (status.dwCurrentState == SERVICE_RUNNING) + ok(V_BOOL(&v) == VARIANT_TRUE, "got %d\n", V_BOOL(&v)); + else + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + /* service doesn't exist */ + name = SysAllocString(dummyW); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -314,6 +374,7 @@ START_TEST(shelldispatch) init_function_pointers(); test_namespace(); + test_service(); CoUninitialize(); }

1 0

Jeremy Newman : updated via suggestion from Adys
by Jeremy Newman 08 May '12

08 May '12

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

Christian Costa : d3drm: Implement IDirect3DRMFrameX_GetChildren method and IDirect3DRMFrameArray interface .
by Alexandre Julliard 07 May '12

07 May '12

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 07 May '12

07 May '12

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 07 May '12

07 May '12

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

Józef Kucia : d3dx9: Implement mapping from WICPixelFormat GUIDs to D3DFORMATs.
by Alexandre Julliard 07 May '12

07 May '12

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 07 May '12

07 May '12

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

Józef Kucia : d3dx9: Implement D3DXSaveSurfaceToFileW.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: ec70b67b8d908d1ee11708d18a75774cb9a9bdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec70b67b8d908d1ee11708d18… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:21 2012 +0200 d3dx9: Implement D3DXSaveSurfaceToFileW. --- dlls/d3dx9_36/surface.c | 166 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ab316cf..e5d0dc6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -59,6 +59,19 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) return D3DFMT_UNKNOWN; } +static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) +{ + int i; + + for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + { + if (wic_pixel_formats[i].d3dformat == format) + return wic_pixel_formats[i].wic_guid; + } + + return NULL; +} + /* dds_header.flags */ #define DDS_CAPS 0x1 #define DDS_HEIGHT 0x2 @@ -1387,9 +1400,154 @@ HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *dst_filename, D3DXIMAGE_FILEFO return hr; } -HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, - LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *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; + IWICImagingFactory *factory; + IWICBitmapEncoder *encoder = NULL; + IWICBitmapFrameEncode *frame = NULL; + IPropertyBag2 *encoder_options = NULL; + IWICStream *stream = NULL; + HRESULT hr; + HRESULT initresult; + const CLSID *encoder_clsid; + const GUID *pixel_format_guid; + WICPixelFormatGUID wic_pixel_format; + D3DFORMAT d3d_pixel_format; + D3DSURFACE_DESC src_surface_desc; + D3DLOCKED_RECT locked_rect; + int width, height; + + TRACE("(%s, %#x, %p, %p, %s)\n", + wine_dbgstr_w(dst_filename), file_format, src_surface, src_palette, wine_dbgstr_rect(src_rect)); + + if (!dst_filename || !src_surface) return D3DERR_INVALIDCALL; + + if (src_palette) + { + FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); + return D3DERR_INVALIDCALL; + } + + switch (file_format) + { + case D3DXIFF_BMP: + encoder_clsid = &CLSID_WICBmpEncoder; + break; + case D3DXIFF_PNG: + encoder_clsid = &CLSID_WICPngEncoder; + break; + case D3DXIFF_JPG: + encoder_clsid = &CLSID_WICJpegEncoder; + break; + case D3DXIFF_DDS: + case D3DXIFF_DIB: + case D3DXIFF_HDR: + case D3DXIFF_PFM: + case D3DXIFF_TGA: + case D3DXIFF_PPM: + FIXME("File format %#x is not supported yet\n", file_format); + return E_NOTIMPL; + default: + return D3DERR_INVALIDCALL; + } + + IDirect3DSurface9_GetDesc(src_surface, &src_surface_desc); + if (src_rect) + { + if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom) + return D3D_OK; + if (src_rect->left < 0 || src_rect->top < 0) + return D3DERR_INVALIDCALL; + if (src_rect->left > src_rect->right || src_rect->top > src_rect->bottom) + return D3DERR_INVALIDCALL; + if (src_rect->right > src_surface_desc.Width || src_rect->bottom > src_surface_desc.Height) + return D3DERR_INVALIDCALL; + + width = src_rect->right - src_rect->left; + height = src_rect->bottom - src_rect->top; + } + else + { + width = src_surface_desc.Width; + height = src_surface_desc.Height; + } + + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICStream_InitializeFromFilename(stream, dst_filename, GENERIC_WRITE); + if (FAILED(hr)) goto cleanup_err; + + hr = CoCreateInstance(encoder_clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + IStream_Release((IStream *)stream); + stream = NULL; + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame, &encoder_options); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapFrameEncode_Initialize(frame, encoder_options); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapFrameEncode_SetSize(frame, width, height); + if (FAILED(hr)) goto cleanup_err; + + pixel_format_guid = d3dformat_to_wic_guid(src_surface_desc.Format); + if (!pixel_format_guid) + { + FIXME("Pixel format %#x is not supported yet\n", src_surface_desc.Format); + hr = E_NOTIMPL; + goto cleanup; + } + + memcpy(&wic_pixel_format, pixel_format_guid, sizeof(GUID)); + hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &wic_pixel_format); + d3d_pixel_format = wic_guid_to_d3dformat(&wic_pixel_format); + if (SUCCEEDED(hr) && d3d_pixel_format != D3DFMT_UNKNOWN) + { + TRACE("Using pixel format %s %#x\n", debugstr_guid(&wic_pixel_format), d3d_pixel_format); + + if (src_surface_desc.Format == d3d_pixel_format) /* Simple copy */ + { + hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + IWICBitmapFrameEncode_WritePixels(frame, height, + locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); + IDirect3DSurface9_UnlockRect(src_surface); + hr = IWICBitmapFrameEncode_Commit(frame); + } + } + else FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_surface_desc.Format, d3d_pixel_format); + } + else WARN("Unsupported pixel format %#x\n", src_surface_desc.Format); + + if (SUCCEEDED(hr)) hr = IWICBitmapEncoder_Commit(encoder); + +cleanup_err: + if (FAILED(hr)) hr = D3DERR_INVALIDCALL; + +cleanup: + if (stream) IStream_Release((IStream *)stream); + + if (frame) IWICBitmapFrameEncode_Release(frame); + if (encoder_options) IPropertyBag2_Release(encoder_options); + + if (encoder) IWICBitmapEncoder_Release(encoder); + + if (SUCCEEDED(initresult)) CoUninitialize(); + + return hr; }

1 0