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

André Hentschel : d3drm: Implement IDirect3DRMTextureX_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: e5de199289a2de2cb62bb9c5afcb192ae7f6eafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5de199289a2de2cb62bb9c5a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 15:39:36 2012 +0200 d3drm: Implement IDirect3DRMTextureX_GetClassName. --- dlls/d3drm/tests/d3drm.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/texture.c | 18 ++++++++++++++---- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index dbfd7d1..e975289 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1041,6 +1041,45 @@ static void test_Material2(void) IDirect3DRM_Release(pD3DRM); } +static void test_Texture(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMTEXTURE pTexture; + D3DRMIMAGE initimg = { + 2, 2, 1, 1, 32, + TRUE, 2 * sizeof(DWORD), NULL, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL + }; + DWORD pixel[4] = { 20000, 30000, 10000, 0 }; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + initimg.buffer1 = &pixel; + hr = IDirect3DRM_CreateTexture(pD3DRM, &initimg, &pTexture); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); + + hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture_GetClassName(pTexture, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMTexture_GetClassName(pTexture, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture_Release(pTexture); + + IDirect3DRM_Release(pD3DRM); +} + static void test_frame_transform(void) { HRESULT hr; @@ -1108,6 +1147,7 @@ START_TEST(d3drm) test_Frame(); test_Light(); test_Material2(); + test_Texture(); test_frame_transform(); test_d3drm_load(); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 44a9061..cfa7e85 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -160,9 +160,11 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_GetName(IDirect3DRMTexture2* iface static HRESULT WINAPI IDirect3DRMTexture2Impl_GetClassName(IDirect3DRMTexture2* iface, LPDWORD size, LPSTR name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); - return E_NOTIMPL; + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + + return IDirect3DRMTexture3_GetClassName(&This->IDirect3DRMTexture3_iface, size, name); } /*** IDirect3DRMTexture3 methods ***/ @@ -522,9 +524,17 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_GetName(IDirect3DRMTexture3* iface static HRESULT WINAPI IDirect3DRMTexture3Impl_GetClassName(IDirect3DRMTexture3* iface, LPDWORD size, LPSTR name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + + if (!size || *size < strlen("Texture") || !name) + return E_INVALIDARG; + + strcpy(name, "Texture"); + *size = sizeof("Texture"); + + return D3DRM_OK; } /*** IDirect3DRMTexture3 methods ***/

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 069e93f715162e401a1fa49f31ce96e165799c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=069e93f715162e401a1fa49f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 19:02:53 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_GetClassName. --- dlls/d3drm/device.c | 18 ++++++++++----- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 8dca026..60fbe98 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -191,13 +191,13 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetName(IDirect3DRMDevice2* iface, } static HRESULT WINAPI IDirect3DRMDevice2Impl_GetClassName(IDirect3DRMDevice2* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMDevice methods ***/ @@ -613,13 +613,19 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetName(IDirect3DRMDevice3* iface, } static HRESULT WINAPI IDirect3DRMDevice3Impl_GetClassName(IDirect3DRMDevice3* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Device") || !name) + return E_INVALIDARG; + + strcpy(name, "Device"); + *size = sizeof("Device"); + + return D3DRM_OK; } /*** IDirect3DRMDevice methods ***/ diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 5393742..67571c0 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid +IMPORTS = dxguid ddraw user32 C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e975289..f304346 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1080,6 +1080,54 @@ static void test_Texture(void) IDirect3DRM_Release(pD3DRM); } +static void test_Device(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECTDRAWCLIPPER pClipper; + LPDIRECT3DRMDEVICE pDevice; + GUID driver; + HWND window; + RECT rc; + DWORD size; + CHAR cname[64] = {0}; + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = DirectDrawCreateClipper(0, &pClipper, NULL); + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); + + hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window); + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); + + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); + hr = IDirect3DRM3_CreateDeviceFromClipper(pD3DRM, pClipper, &driver, rc.right, rc.bottom, &pDevice); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); + + hr = IDirect3DRMDevice_GetClassName(pDevice, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMDevice_GetClassName(pDevice, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMDevice_GetClassName(pDevice, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMDevice_GetClassName(pDevice, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + IDirect3DRMDevice_Release(pDevice); + IDirectDrawClipper_Release(pClipper); + + IDirect3DRM_Release(pD3DRM); + DestroyWindow(window); +} + static void test_frame_transform(void) { HRESULT hr; @@ -1145,6 +1193,7 @@ START_TEST(d3drm) test_MeshBuilder3(); test_Mesh(); test_Frame(); + test_Device(); test_Light(); test_Material2(); test_Texture();

1 0

André Hentschel : d3drm: Implement IDirect3DRMWinDevice_GetClassName.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: d9ec2b6dfddb1dbc6f38b93a25cebd7a6a2a24d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ec2b6dfddb1dbc6f38b93a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 17 19:04:50 2012 +0200 d3drm: Implement IDirect3DRMWinDevice_GetClassName. --- dlls/d3drm/device.c | 6 +++--- dlls/d3drm/tests/d3drm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 60fbe98..d85670a 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1115,13 +1115,13 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice* ifa } static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice* iface, - LPDWORD size, LPSTR name) + LPDWORD size, LPSTR name) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMWinDevice methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f304346..e71d89f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <d3drm.h> #include <initguid.h> +#include <d3drmwin.h> #include "wine/test.h" @@ -1086,6 +1087,7 @@ static void test_Device(void) LPDIRECT3DRM pD3DRM; LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; + LPDIRECT3DRMWINDEVICE pWinDevice; GUID driver; HWND window; RECT rc; @@ -1121,6 +1123,30 @@ static void test_Device(void) ok(size == sizeof("Device"), "wrong size: %u\n", size); ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + /* WinDevice */ + hr = IDirect3DRMDevice_QueryInterface(pDevice, &IID_IDirect3DRMWinDevice, (LPVOID*)&pWinDevice); + if (FAILED(hr)) + { + win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr); + goto cleanup; + } + + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + IDirect3DRMWinDevice_Release(pWinDevice); + +cleanup: IDirect3DRMDevice_Release(pDevice); IDirectDrawClipper_Release(pClipper);

1 0

Thomas Faber : ws2_32/tests: Add missing parentheses to ok() output.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: c574ab9680f69c9c443c6ec61829621bd1fd8bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c574ab9680f69c9c443c6ec61… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:03:50 2012 +0200 ws2_32/tests: Add missing parentheses to ok() output. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2543873..6fa4249 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1182,14 +1182,14 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); err = setsockopt(s, 0xffffffff, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); timeout = SOCKTIMEOUT1; SetLastError(0xdeadbeef); err = setsockopt(s, 0x00008000, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); closesocket(s);

1 0

Thomas Faber : wininet: Use the correct struct in a sizeof.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 7d24e5922937beb0a2c2b47d6fab86c5c19ec1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d24e5922937beb0a2c2b47d6… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 16:18:36 2012 +0200 wininet: Use the correct struct in a sizeof. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3d0ae34..1788bf2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2129,7 +2129,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe INTERNET_CERTIFICATE_INFOA *info = (INTERNET_CERTIFICATE_INFOA*)buffer; DWORD len; - memset(info, 0, sizeof(INTERNET_CERTIFICATE_INFOW)); + memset(info, 0, sizeof(*info)); info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; len = CertNameToStrA(context->dwCertEncodingType,

1 0

Akihiro Sagawa : gdi32/tests: Make GetStockObject tests pass on East-Asian machines.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: afdc84cf0366c8e161004bf1e7bf9ccedbb4c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdc84cf0366c8e161004bf1e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 16 23:15:51 2012 +0900 gdi32/tests: Make GetStockObject tests pass on East-Asian machines. --- dlls/gdi32/tests/font.c | 116 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 87 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9e5602b..218b980 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4373,38 +4373,69 @@ static int get_font_dpi(const LOGFONT *lf) static void test_stock_fonts(void) { + static const int font[] = + { + ANSI_FIXED_FONT, ANSI_VAR_FONT, SYSTEM_FONT, DEVICE_DEFAULT_FONT, DEFAULT_GUI_FONT + /* SYSTEM_FIXED_FONT, OEM_FIXED_FONT */ + }; static const struct test_data { - int id, weight, height, dpi; + int charset, weight, height, dpi; const char face_name[LF_FACESIZE]; - } td[] = + } td[][11] = { - { ANSI_FIXED_FONT, FW_NORMAL, 12, 96, "Courier" }, - { ANSI_FIXED_FONT, FW_NORMAL, 12, 120, "Courier" }, - { ANSI_VAR_FONT, FW_NORMAL, 12, 96, "MS Sans Serif" }, - { ANSI_VAR_FONT, FW_NORMAL, 12, 120, "MS Sans Serif" }, - { SYSTEM_FONT, FW_BOLD, 16, 96, "System" }, - { SYSTEM_FONT, FW_BOLD, 20, 120, "System" }, - { DEVICE_DEFAULT_FONT, FW_BOLD, 16, 96, "System" }, - { DEVICE_DEFAULT_FONT, FW_BOLD, 20, 120, "System" }, - { DEFAULT_GUI_FONT, FW_NORMAL, -11, 96, "MS Shell Dlg" }, - { DEFAULT_GUI_FONT, FW_NORMAL, -13, 120, "MS Shell Dlg" } - - /*{ SYSTEM_FIXED_FONT, FW_NORMAL, 15, 96, "Fixedsys" },*/ - /*{ SYSTEM_FIXED_FONT, FW_NORMAL, 20, 120, "Fixedsys" },*/ - /*{ OEM_FIXED_FONT, FW_NORMAL, 16, 96, "Terminal" },*/ - /*{ OEM_FIXED_FONT, FW_NORMAL, 20, 120, "Terminal" },*/ + { /* ANSI_FIXED_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" }, + { 0 } + }, + { /* ANSI_VAR_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" }, + { 0 } + }, + { /* SYSTEM_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEVICE_DEFAULT_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" }, + { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" }, + { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" }, + { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" }, + { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" }, + { 0 } + } }; - int i; + int i, j; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < sizeof(font)/sizeof(font[0]); i++) { HFONT hfont; LOGFONT lf; int ret; - hfont = GetStockObject(td[i].id); - ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, td[i].id); + hfont = GetStockObject(font[i]); + ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); ret = GetObject(hfont, sizeof(lf), &lf); if (ret != sizeof(lf)) @@ -4414,16 +4445,43 @@ static void test_stock_fonts(void) continue; } - ret = get_font_dpi(&lf); - if (ret != td[i].dpi) + for (j = 0; td[i][j].face_name[0] != 0; j++) { - trace("%d: font %s %d dpi doesn't match test data %d\n", i, lf.lfFaceName, ret, td[i].dpi); - continue; - } + if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + { + continue; + } - ok(td[i].weight == lf.lfWeight, "%d: expected lfWeight %d, got %d\n", i, td[i].weight, lf.lfWeight); - ok(td[i].height == lf.lfHeight, "%d: expected lfHeight %d, got %d\n", i, td[i].height, lf.lfHeight); - ok(!lstrcmp(td[i].face_name, lf.lfFaceName), "%d: expected lfFaceName %s, got %s\n", i, td[i].face_name, lf.lfFaceName); + ret = get_font_dpi(&lf); + if (ret != td[i][j].dpi) + { + trace("%d(%d): font %s %d dpi doesn't match test data %d\n", + i, j, lf.lfFaceName, ret, td[i][j].dpi); + continue; + } + + if ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset != DEFAULT_CHARSET) + todo_wine ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); + else + ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); + if ((font[i] == DEFAULT_GUI_FONT && td[i][j].charset != DEFAULT_CHARSET) || + ((font[i] == DEVICE_DEFAULT_FONT || font[i] == SYSTEM_FONT) && td[i][j].charset == SHIFTJIS_CHARSET)) + todo_wine ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); + else + ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); + if (td[i][j].face_name[0] == '?') + { + /* Wine doesn't have this font, skip this case for now. + Actually, the face name is localized on Windows and varies + dpending on Windows versions (e.g. Japanese NT4 vs win2k). */ + trace("%d(%d): default gui font is %s\n", i, j, lf.lfFaceName); + } + else + { + ok(!lstrcmp(td[i][j].face_name, lf.lfFaceName), "%d(%d): expected lfFaceName %s, got %s\n", i, j, td[i][j].face_name, lf.lfFaceName); + } + break; + } } }

1 0

Alexandre Julliard : gdi32: Fix the contents of the region data in metafiles.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: b61925e1eaa729705236ba7044e6af59b19fe456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61925e1eaa729705236ba704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 10:54:20 2012 +0200 gdi32: Fix the contents of the region data in metafiles. --- dlls/gdi32/mfdrv/graphics.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 665926b..439fca5 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -309,13 +309,21 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) *Param++ = pCurRect->right; } } - len = Param - (WORD *)mr; + + if (StartBand) + { + *StartBand = Param - StartBand - 3; + *Param++ = *StartBand; + if(*StartBand > MaxBands) + MaxBands = *StartBand; + Bands++; + } mr->rdParm[0] = 0; mr->rdParm[1] = 6; mr->rdParm[2] = 0x1234; mr->rdParm[3] = 0; - mr->rdParm[4] = len * 2; + mr->rdParm[4] = (Param - mr->rdParm) * sizeof(WORD); mr->rdParm[5] = Bands; mr->rdParm[6] = MaxBands; mr->rdParm[7] = rgndata->rdh.rcBound.left; @@ -323,7 +331,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) mr->rdParm[9] = rgndata->rdh.rcBound.right; mr->rdParm[10] = rgndata->rdh.rcBound.bottom; mr->rdFunction = META_CREATEREGION; - mr->rdSize = len / 2; + mr->rdSize = Param - (WORD *)mr; ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2 ); HeapFree( GetProcessHeap(), 0, mr ); HeapFree( GetProcessHeap(), 0, rgndata );

1 0

Alexandre Julliard : wing32: Don't recommend a top-down DIB.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: cdd18731a751fb85438783b61dea45ceacc7097a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd18731a751fb85438783b61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 10:54:50 2012 +0200 wing32: Don't recommend a top-down DIB. --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 7ec5914..0c942a6 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -42,7 +42,7 @@ BOOL WINAPI WinGRecommendDIBFormat( BITMAPINFO *bmi ) bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = 320; - bmi->bmiHeader.biHeight = -1; + bmi->bmiHeader.biHeight = 1; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = 8; bmi->bmiHeader.biCompression = BI_RGB;

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHMultiply3.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 60a0fb30dfc444805b443438e0de9ce9ce2e9517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a0fb30dfc444805b443438e… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jun 15 11:51:54 2012 +0800 d3dx9_36: Implementation of D3DXSHMultiply3. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 101 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 28 ++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d8fcaa4..338585a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -280,7 +280,7 @@ @ stub D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) @ stub D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHMultiply2(ptr ptr ptr) -@ stub D3DXSHMultiply3(ptr ptr ptr) +@ stdcall D3DXSHMultiply3(ptr ptr ptr) @ stub D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 499d368..529665b 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1967,6 +1967,8 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n) return pout; } +/*_________________D3DXSH________________*/ + FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) { UINT i; @@ -1978,3 +1980,102 @@ FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) return out; } + +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) +{ + FLOAT t, ta, tb; + + TRACE("(%p, %p, %p)\n", out, a, b); + + out[0]= 0.28209479f * a[0] * b[0]; + + ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; + tb = 0.28209479f * b[0] - 0.12615662f * b[6] - 0.21850968f * b[8]; + out[1] = ta * b[1] + tb * a[1]; + t = a[1] * b[1]; + out[0] += 0.28209479f * t; + out[6] = -0.12615662f * t; + out[8] = -0.21850968f * t; + + ta = 0.21850968f * a[5]; + tb = 0.21850968f * b[5]; + out[1] += ta * b[2] + tb * a[2]; + out[2] = ta * b[1] + tb * a[1]; + t = a[1] * b[2] +a[2] * b[1]; + out[5] = 0.21850968f * t; + + ta = 0.21850968f * a[4]; + tb = 0.21850968f * b[4]; + out[1] += ta * b[3] + tb * a[3]; + out[3] = ta * b[1] + tb * a[1]; + t = a[1] * b[3] + a[3] * b[1]; + out[4] = 0.21850968f * t; + + ta = 0.28209480f * a[0] + 0.25231326f * a[6]; + tb = 0.28209480f * b[0] + 0.25231326f * b[6]; + out[2] += ta * b[2] + tb * a[2]; + t = a[2] * b[2]; + out[0] += 0.28209480f * t; + out[6] += 0.25231326f * t; + + ta = 0.21850969f * a[7]; + tb = 0.21850969f * b[7]; + out[2] += ta * b[3] + tb * a[3]; + out[3] += ta * b[2] + tb * a[2]; + t = a[2] * b[3] + a[3] * b[2]; + out[7] = 0.21850969f * t; + + ta = 0.28209479f * a[0] - 0.12615663f * a[6] + 0.21850969f * a[8]; + tb = 0.28209479f * b[0] - 0.12615663f * b[6] + 0.21850969f * b[8]; + out[3] += ta * b[3] + tb * a[3]; + t = a[3] * b[3]; + out[0] += 0.28209479f * t; + out[6] -= 0.12615663f * t; + out[8] += 0.21850969f * t; + + ta = 0.28209479f * a[0] - 0.18022375f * a[6]; + tb = 0.28209479f * b[0] - 0.18022375f * b[6]; + out[4] += ta * b[4] + tb * a[4]; + t = a[4] * b[4]; + out[0] += 0.28209479f * t; + out[6] -= 0.18022375f * t; + + ta = 0.15607835f * a[7]; + tb = 0.15607835f * b[7]; + out[4] += ta * b[5] + tb * a[5]; + out[5] += ta * b[4] + tb * a[4]; + t = a[4] * b[5] + a[5] * b[4]; + out[7] += 0.15607834f * t; + + ta = 0.28209479f * a[0] + 0.09011186 * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186 * b[6] - 0.15607835f * b[8]; + out[5] += ta * b[5] + tb * a[5]; + t = a[5] * b[5]; + out[0] += 0.28209479f * t; + out[6] += 0.09011186f * t; + out[8] -= 0.15607835f * t; + + ta = 0.28209480f * a[0]; + tb = 0.28209480f * b[0]; + out[6] += ta * b[6] + tb * a[6]; + t = a[6] * b[6]; + out[0] += 0.28209480f * t; + out[6] += 0.18022376f * t; + + ta = 0.28209479f * a[0] + 0.09011186 * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186 * b[6] + 0.15607835f * b[8]; + out[7] += ta * b[7] + tb * a[7]; + t = a[7] * b[7]; + out[0] += 0.28209479f * t; + out[6] += 0.09011186f * t; + out[8] += 0.15607835f * t; + + ta = 0.28209479f * a[0] - 0.18022375f * a[6]; + tb = 0.28209479f * b[0] - 0.18022375f * b[6]; + out[8] += ta * b[8] + tb * a[8]; + t = a[8] * b[8]; + out[0] += 0.28209479f * t; + out[6] -= 0.18022375f * t; + + return out; +} diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index e732691..c2a652c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2399,6 +2399,33 @@ static void test_D3DXSHAdd(void) } } +static void test_D3DXSHMultiply3(void) +{ + unsigned int i; + FLOAT a[20], b[20], c[20]; + const FLOAT expected[] = + { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, + 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f, }; + + + for (i = 0; i < 20; i++) + { + a[i] = 1.0f + (FLOAT)i/100.0f; + b[i] = 3.0f - (FLOAT)i/100.0f; + c[i] = (FLOAT)i; + } + + D3DXSHMultiply3(c, a, b); + for (i = 0; i < 9; i++) + ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + +/* D3DXSHMultiply does not modify the elements of the array after the nineth element */ + for (i = 8; i < 19; i++) + ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + + return; +} + START_TEST(math) { D3DXColorTest(); @@ -2416,4 +2443,5 @@ START_TEST(math) test_D3DXVec_Array(); test_D3DXFloat_Array(); test_D3DXSHAdd(); + test_D3DXSHMultiply3(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index a1fd70a..b650b48 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -378,6 +378,7 @@ D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UI FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); #ifdef __cplusplus }

1 0

Nozomi Kodama : d3dx9_36: Recognize A8B8G8R8 format.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 5523820b810d16fd17da86fcf7930fd3f27acdf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5523820b810d16fd17da86fcf… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sat Jun 16 03:14:49 2012 +0800 d3dx9_36: Recognize A8B8G8R8 format. --- dlls/d3dx9_36/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 603f8d8..f71af32 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -190,6 +190,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10 }, { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, }; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++)

1 0