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

Owen Rudge : mapi32: Add support to MAPISendMailW for ANSI fallback.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 0eb0292eb5d7bcd44a4621c217c347b29638203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb0292eb5d7bcd44a4621c21… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 25 15:46:58 2012 +0100 mapi32: Add support to MAPISendMailW for ANSI fallback. --- dlls/mapi32/sendmail.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 4784968..da19259 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -548,6 +548,27 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return MAPI_E_NOT_SUPPORTED; } +static lpMapiRecipDesc convert_recipient_from_unicode(lpMapiRecipDescW recipW, lpMapiRecipDesc dest) +{ + lpMapiRecipDesc ret; + + if (!recipW) + return NULL; + + if (dest) + ret = dest; + else + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc)); + + ret->ulRecipClass = recipW->ulRecipClass; + ret->lpszName = convert_from_unicode(recipW->lpszName); + ret->lpszAddress = convert_from_unicode(recipW->lpszAddress); + ret->ulEIDSize = recipW->ulEIDSize; + ret->lpEntryID = recipW->lpEntryID; + + return ret; +} + /************************************************************************** * MAPISendMailW (MAPI32.256) * @@ -578,6 +599,105 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (MAPIInitialize(NULL) == S_OK) return sendmail_extended_mapi(session, uiparam, message, flags); + if (mapiFunctions.MAPISendMail) + { + MapiMessage messageA; + ULONG ret; + + if (flags & MAPI_FORCE_UNICODE) + return MAPI_E_UNICODE_NOT_SUPPORTED; + + /* Convert to ANSI and send to MAPISendMail */ + ZeroMemory(&messageA, sizeof(MapiMessage)); + + messageA.lpszSubject = convert_from_unicode(message->lpszSubject); + messageA.lpszNoteText = convert_from_unicode(message->lpszNoteText); + messageA.lpszMessageType = convert_from_unicode(message->lpszMessageType); + messageA.lpszDateReceived = convert_from_unicode(message->lpszDateReceived); + messageA.lpszConversationID = convert_from_unicode(message->lpszConversationID); + messageA.flFlags = message->flFlags; + messageA.lpOriginator = convert_recipient_from_unicode(message->lpOriginator, NULL); + messageA.nRecipCount = message->nRecipCount; + messageA.nFileCount = message->nFileCount; + + if (message->nRecipCount && message->lpRecips) + { + lpMapiRecipDesc recipsA; + int i; + + recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); + + for (i = 0; i < message->nRecipCount; i++) + { + convert_recipient_from_unicode(&message->lpRecips[i], &recipsA[i]); + } + + messageA.lpRecips = recipsA; + } + + if (message->nFileCount && message->lpFiles) + { + lpMapiFileDesc filesA; + int i; + + filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); + + for (i = 0; i < message->nFileCount; i++) + { + filesA[i].flFlags = message->lpFiles[i].flFlags; + filesA[i].nPosition = message->lpFiles[i].nPosition; + filesA[i].lpszPathName = convert_from_unicode(message->lpFiles[i].lpszPathName); + filesA[i].lpszFileName = convert_from_unicode(message->lpFiles[i].lpszFileName); + filesA[i].lpFileType = message->lpFiles[i].lpFileType; + } + + messageA.lpFiles = filesA; + } + + ret = mapiFunctions.MAPISendMail(session, uiparam, &messageA, flags, reserved); + + /* Now free everything we allocated */ + if (message->lpOriginator) + { + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszAddress); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator); + } + + if (message->nRecipCount && message->lpRecips) + { + int i; + + for (i = 0; i < message->nRecipCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszAddress); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpRecips); + } + + if (message->nFileCount && message->lpFiles) + { + int i; + + for (i = 0; i < message->nFileCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszPathName); + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszFileName); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpFiles); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpszSubject); + HeapFree(GetProcessHeap(), 0, messageA.lpszNoteText); + HeapFree(GetProcessHeap(), 0, messageA.lpszDateReceived); + HeapFree(GetProcessHeap(), 0, messageA.lpszConversationID); + + return ret; + } + /* Display an error message since we apparently have no mail clients */ LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR));

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: a0bb28f7d98793cca4e6920e0c6114e243ccf0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bb28f7d98793cca4e6920e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:12:31 2012 +0200 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c92ed62..71c66a5 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -326,7 +326,7 @@ static void test_gettext(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, - "expected NULL, got %p", toolinfoA.lpszText); + "expected NULL, got %p\n", toolinfoA.lpszText); } else {

1 0

Józef Kucia : d3dx9/tests: Add DDS pixel format tests for D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: b157bc7cfa3f02d5078fbc8acae5b0ab3f1d7145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b157bc7cfa3f02d5078fbc8ac… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Apr 19 21:54:22 2012 +0200 d3dx9/tests: Add DDS pixel format tests for D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/tests/surface.c | 93 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 87aa03e..996dcf5 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -138,6 +138,72 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons return D3DERR_INVALIDCALL; } +#define DDS_CAPS 0x00000001 +#define DDS_HEIGHT 0x00000002 +#define DDS_WIDTH 0x00000004 +#define DDS_PIXELFORMAT 0x00001000 + +#define DDSCAPS_TEXTURE 0x00001000 + +#define DDSPF_ALPHAPIXELS 0x00000001 +#define DDSPF_ALPHA 0x00000002 +#define DDSPF_FOURCC 0x00000004 +#define DDSPF_RGB 0x00000040 +#define DDSPF_LUMINANCE 0x00020000 + +static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, + D3DFORMAT expected_format) +{ + HRESULT hr; + D3DXIMAGE_INFO info; + struct + { + DWORD magic; + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD padding[14]; + struct + { + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; + } pixel_format; + DWORD caps; + DWORD padding2[4]; + BYTE data[256]; + } dds; + + memset(&dds, 0, sizeof(dds)); + + dds.magic = MAKEFOURCC('D','D','S',' '); + dds.size = 124; + dds.flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; + dds.height = 4; + dds.width = 4; + dds.pixel_format.size = sizeof(dds.pixel_format); + dds.pixel_format.flags = flags; + dds.pixel_format.fourcc = fourcc; + dds.pixel_format.bpp = bpp; + dds.pixel_format.rmask = rmask; + dds.pixel_format.gmask = gmask; + dds.pixel_format.bmask = bmask; + dds.pixel_format.amask = amask; + dds.caps = DDSCAPS_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); + if (SUCCEEDED(hr)) + ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format); +} + static void test_D3DXGetImageInfo(void) { HRESULT hr; @@ -309,8 +375,35 @@ static void test_D3DXGetImageInfo(void) ok(info.ResourceType == D3DRTYPE_VOLUMETEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_VOLUMETEXTURE); 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_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); } + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + /* cleanup */ if(testdummy_ok) DeleteFileA("testdummy.bmp");

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 2551ff7d5cc7821453d741171362aa4db2e39af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ff7d5cc7821453d741171… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Apr 25 21:21:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index 07c0bb7..7a4c1a9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3520,16 +3520,12 @@ msgid "URI to be decoded is incorrect" msgstr "해독하는 URI가 올바르지 않음" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "열거 값이 범위를 벗어남.\n" +msgstr "분수 값이 범위를 벗어남" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "첨자가 범위를 벗어남" +msgstr "정밀도 범위를 벗어남" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain ().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 11a2231c11b2deeaec6c65a1c2fbb92558348e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a2231c11b2deeaec6c65a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:11 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 602baac..7fd300fb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -463,6 +463,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain *wined3d_swapchain = NULL; + IDirect3DSwapChain9Impl *swapchain_impl; HRESULT hr; TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", iface, swapchain_idx, swapchain); @@ -471,7 +472,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec hr = wined3d_device_get_swapchain(This->wined3d_device, swapchain_idx, &wined3d_swapchain); if (SUCCEEDED(hr) && wined3d_swapchain) { - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain); + *swapchain = &swapchain_impl->IDirect3DSwapChain9_iface; IDirect3DSwapChain9_AddRef(*swapchain); wined3d_swapchain_decref(wined3d_swapchain); }

1 0

Henri Verbeet : d3d9: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 138edd31e596a14ba69f8c53b05cada71ea0143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=138edd31e596a14ba69f8c53b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:12 2012 +0200 d3d9: Use the surface implementation pointer in reset_enum_callback(). --- dlls/d3d9/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7fd300fb..ddfaae6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -507,7 +507,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) wined3d_resource_get_desc(resource, &desc); if (desc.pool == WINED3D_POOL_DEFAULT) { - IDirect3DSurface9 *surface; + IDirect3DSurface9Impl *surface; if (desc.resource_type != WINED3D_RTYPE_SURFACE) { @@ -516,9 +516,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) } surface = wined3d_resource_get_parent(resource); - - IDirect3DSurface9_AddRef(surface); - if (IDirect3DSurface9_Release(surface)) + if (surface->ref) { WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); return D3DERR_INVALIDCALL;

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetBackBuffer ().
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: fb5bc7240860fb5e603616be969729ef355e81f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5bc7240860fb5e603616be9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:13 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetBackBuffer(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ddfaae6..20635a0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -596,6 +596,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -606,7 +607,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Merge volumetexture.c into texture.c.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 5145b131998276e8d837df1e6d7ba5ef5aafdd57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5145b131998276e8d837df1e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:14 2012 +0200 d3d9: Merge volumetexture.c into texture.c. --- dlls/d3d9/Makefile.in | 3 +- dlls/d3d9/texture.c | 419 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/volumetexture.c | 454 --------------------------------------------- 3 files changed, 420 insertions(+), 456 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5145b131998276e8d837d…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DBaseTexture9Impl.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d01e0647d14a79b4a9ce78200eb737d62f9ce298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01e0647d14a79b4a9ce78200… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:15 2012 +0200 d3d9: Get rid of IDirect3DBaseTexture9Impl. --- dlls/d3d9/d3d9_private.h | 15 +-------------- dlls/d3d9/device.c | 12 +++++++++--- dlls/d3d9/texture.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2b5a5c7..d814dd0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -289,20 +289,6 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; -/* --------------------- */ -/* IDirect3DBaseTexture9 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DBaseTexture9 implementation structure - */ -typedef struct IDirect3DBaseTexture9Impl -{ - const IDirect3DBaseTexture9Vtbl *lpVtbl; - LONG ref; - struct wined3d_texture *wined3d_texture; -} IDirect3DBaseTexture9Impl; - struct d3d9_texture { IDirect3DBaseTexture9 IDirect3DBaseTexture9_iface; @@ -317,6 +303,7 @@ HRESULT texture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; HRESULT volumetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; /* ----------------------- */ /* IDirect3DStateBlock9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 20635a0..943c608 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -975,14 +975,17 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(IDirect3DDevice9Ex *ifa IDirect3DBaseTexture9 *src_texture, IDirect3DBaseTexture9 *dst_texture) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *src_impl, *dst_impl; HRESULT hr; TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, src_texture, dst_texture); + src_impl = unsafe_impl_from_IDirect3DBaseTexture9(src_texture); + dst_impl = unsafe_impl_from_IDirect3DBaseTexture9(dst_texture); + wined3d_mutex_lock(); hr = wined3d_device_update_texture(This->wined3d_device, - ((IDirect3DBaseTexture9Impl *)src_texture)->wined3d_texture, - ((IDirect3DBaseTexture9Impl *)dst_texture)->wined3d_texture); + src_impl->wined3d_texture, dst_impl->wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -1717,13 +1720,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(IDirect3DDevice9Ex *iface, IDirect3DBaseTexture9 *texture) { IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); + wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, - texture ? ((IDirect3DBaseTexture9Impl *)texture)->wined3d_texture : NULL); + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 3c08cc3..7891596 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1243,6 +1243,16 @@ static const IDirect3DVolumeTexture9Vtbl d3d9_texture_3d_vtbl = d3d9_texture_3d_AddDirtyBox, }; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); +} + static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent) { HeapFree(GetProcessHeap(), 0, parent);

1 0

Vincent Povirk : gdiplus: Remove FIXME on implemented function.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 4a78d7c6b4087317d3d29e311ae9af7f5d6b828c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a78d7c6b4087317d3d29e311… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:17:42 2012 -0500 gdiplus: Remove FIXME on implemented function. --- dlls/gdiplus/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ac5328e..b05d74a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1520,7 +1520,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient *brush, GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, INT *count) { - FIXME("(%p,%p): stub\n", brush, count); + TRACE("(%p,%p)\n", brush, count); if (!brush || !count) return InvalidParameter;

1 0