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

Aric Stewart : gdi32: Fix up glyph metrics for tategaki glyphs.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 72f584aef879fbabc7544d3848337b6bdf7e0787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f584aef879fbabc7544d384… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 24 11:00:41 2013 -0500 gdi32: Fix up glyph metrics for tategaki glyphs. --- dlls/gdi32/freetype.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 459f49a..bf4e4c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5918,6 +5918,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Bitmap ft_bitmap; FT_Error err; INT left, right, top = 0, bottom = 0, adv; + INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; @@ -5926,6 +5927,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Matrix transMatTategaki; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); + BOOL vertical_metrics; UINT original_index; LONG avgAdvance = 0; FT_Fixed em_scale; @@ -6084,7 +6086,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, needsTransform = TRUE; } + vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); + /* there is a freetype bug where vertical metrics are only + properly scaled and correct in 2.4.0 or greater */ + if ((vertical_metrics) && (FT_Version.major < 2 || (FT_Version.major == 2 && FT_Version.minor < 4))) + vertical_metrics = FALSE; + if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -6135,6 +6144,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = (metrics.horiBearingY - metrics.height) & -64; lpgm->gmCellIncX = adv; lpgm->gmCellIncY = 0; + origin_x = left; + origin_y = top; } else { INT xc, yc; FT_Vector vec; @@ -6163,6 +6174,43 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; + if (tategaki) + { + for(xc = 0; xc < 2; xc++) + { + for(yc = 0; yc < 2; yc++) + { + if (vertical_metrics) + { + vec.x = metrics.vertBearingY + xc * metrics.height; + vec.y = metrics.horiBearingX - yc * (metrics.vertBearingX * 2); + } + else + { + vec.x = metrics.horiBearingY - xc * metrics.height; + vec.y = metrics.horiBearingX + yc * metrics.width; + } + + TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); + pFT_Vector_Transform(&vec, &transMat); + if(xc == 0 && yc == 0) { + origin_x = vec.x; + origin_y = vec.y; + } else { + if(vec.x < origin_x) origin_x = vec.x; + if(vec.y > origin_y) origin_y = vec.y; + } + } + } + origin_x = origin_x & -64; + origin_y = (origin_y + 63) & -64; + } + else + { + origin_x = left; + origin_y = top; + } + TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); vec.x = metrics.horiAdvance; vec.y = 0; @@ -6177,7 +6225,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = metrics.horiAdvance; + if (vertical_metrics) + vec.x = metrics.vertAdvance; + else + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); if (!avgAdvance || vec.y) @@ -6192,8 +6243,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; - lpgm->gmptGlyphOrigin.x = left >> 6; - lpgm->gmptGlyphOrigin.y = top >> 6; + lpgm->gmptGlyphOrigin.x = origin_x >> 6; + lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; abc->abcB = (right - left) >> 6; abc->abcC = adv - abc->abcA - abc->abcB;

1 0

Qian Hong : atl100: Added stub for AtlIPersistPropertyBag_Load.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: af59b20c8000241ed096c0ac964dc37b2ad6c8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af59b20c8000241ed096c0ac9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 25 00:43:52 2013 +0800 atl100: Added stub for AtlIPersistPropertyBag_Load. --- dlls/atl/atl.spec | 2 +- dlls/atl100/atl.c | 12 ++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 5b31804..4737580 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -43,7 +43,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index fc7f460..a8b8208 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -275,6 +275,18 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, } /*********************************************************************** + * AtlIPersistPropertyBag_Load [atl100.@] + */ +HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog, + ATL_PROPMAP_ENTRY *pMap, void *pThis, + IUnknown *pUnk) +{ + FIXME("(%p, %p, %p, %p, %p)\n", pPropBag, pErrorLog, pMap, pThis, pUnk); + + return S_OK; +} + +/*********************************************************************** * AtlModuleAddTermFunc [atl100.@] */ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 183ab7b..1295f8c 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -35,7 +35,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index f8d409c..5a77629 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -37,7 +37,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlUnRegisterTypeLib

1 0

Qian Hong : atl100: Fixed AtlAdvise and AtlUnadvise crashing with NULL pUnkCP.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 8d18b8934618f2d1e7d1e3a009f8f04771e03a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d18b8934618f2d1e7d1e3a00… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 25 20:56:43 2013 +0800 atl100: Fixed AtlAdvise and AtlUnadvise crashing with NULL pUnkCP. --- dlls/atl100/atl.c | 6 ++++++ dlls/atl100/tests/atl.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index a8b8208..0aae80b 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -51,6 +51,9 @@ HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID *iid, DWORD TRACE("%p %p %p %p\n", pUnkCP, pUnk, iid, pdw); + if(!pUnkCP) + return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); if(FAILED(hres)) return hres; @@ -76,6 +79,9 @@ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID *iid, DWORD dw) TRACE("%p %p %d\n", pUnkCP, iid, dw); + if(!pUnkCP) + return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnkCP, &IID_IConnectionPointContainer, (void**)&container); if(FAILED(hres)) return hres; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 1304ac1..4cf4a62 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -359,6 +359,12 @@ static void test_cp(void) DWORD cookie = 0; HRESULT hres; + hres = AtlAdvise(NULL, (IUnknown*)0xdeed0000, &CLSID_Test, &cookie); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG, returned %08x\n", hres); + + hres = AtlUnadvise(NULL, &CLSID_Test, 0xdeadbeef); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG, returned %08x\n", hres); + hres = AtlAdvise((IUnknown*)&ConnectionPointContainer, (IUnknown*)0xdead0000, &CLSID_Test, &cookie); ok(hres == S_OK, "AtlAdvise failed: %08x\n", hres); ok(cookie == 0xdeadbeef, "cookie = %x\n", cookie);

1 0

Qian Hong : server: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called even when lEvent is zero .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 31b9455b7e6d29f8cc46c59c1252d6e266e86f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b9455b7e6d29f8cc46c59c1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 22 16:51:38 2013 +0800 server: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called even when lEvent is zero. --- dlls/ws2_32/tests/sock.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ server/sock.c | 3 +- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4612116..ff0d538 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3571,6 +3571,8 @@ static void test_events(int useMessages) goto end; } + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + src2 = socket(AF_INET, SOCK_STREAM, 0); if (src2 == INVALID_SOCKET) { @@ -3578,6 +3580,8 @@ static void test_events(int useMessages) goto end; } + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + len = sizeof(BOOL); if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR) { @@ -3618,12 +3622,18 @@ static void test_events(int useMessages) goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAAsyncSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } else { @@ -3650,12 +3660,18 @@ static void test_events(int useMessages) goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAEventSelect(src2, hEvent2, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAEventSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } server = socket(AF_INET, SOCK_STREAM, 0); @@ -3988,6 +4004,47 @@ static void test_events(int useMessages) ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError()); ok_event_seq(src2, hEvent2, empty_seq, NULL, 0); + if (useMessages) + { + ret = WSAAsyncSelect(src, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + } + else + { + ret = WSAEventSelect(src, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAEventSelect(src2, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + } + end: if (src != INVALID_SOCKET) { diff --git a/server/sock.c b/server/sock.c index ba18a66..5cb6d31 100644 --- a/server/sock.c +++ b/server/sock.c @@ -978,8 +978,7 @@ DECL_HANDLER(set_socket_event) sock_reselect( sock ); - if (sock->mask) - sock->state |= FD_WINE_NONBLOCKING; + sock->state |= FD_WINE_NONBLOCKING; /* if a network event is pending, signal the event object it is possible that FD_CONNECT or FD_ACCEPT network events has happened

1 0

Daniel Jelinski : wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 240172f108e7800548c9bc41872c240199c14a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240172f108e7800548c9bc418… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 25 20:12:51 2013 +0200 wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key. --- dlls/advapi32/tests/eventlog.c | 7 ++++--- tools/wine.inf.in | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 543b41c..b028354 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -637,7 +637,6 @@ static BOOL create_new_eventlog(void) /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); - /* FIXME: Wine stops here */ if (lret != ERROR_SUCCESS) { skip("Could not open the EventLog service registry key\n"); @@ -832,11 +831,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); + todo_wine ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); + todo_wine ok(oldest == 1 || (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); @@ -855,6 +856,7 @@ static void test_readwrite(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success\n"); + todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1083,6 +1085,7 @@ static void test_autocreation(void) lstrcatA(eventlogfile, ".evtx"); } + todo_wine ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); @@ -1109,14 +1112,12 @@ static void cleanup_eventlog(void) RegDeleteValueA(key, "Sources"); RegCloseKey(key); lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc); - todo_wine ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret); /* A handle to the eventlog is locked by services.exe. We can only * delete the eventlog file after reboot. */ bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT); - todo_wine ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e48d824..14fde79 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3005,8 +3005,9 @@ HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" -HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Christian Costa : d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 31ae8b6a1252dc1553b3f4e8fd6e6d9df4395140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae8b6a1252dc1553b3f4e8f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:01 2013 +0200 d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 580 ++++++++++++++++++++++++++----------------- 2 files changed, 351 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31ae8b6a1252dc1553b3f…

1 0

Christian Costa : d3dx9_36: Implement skin mesh loading.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: e558925d75eac467ea793697a299fb90cd4d4c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e558925d75eac467ea793697a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:11 2013 +0200 d3dx9_36: Implement skin mesh loading. --- dlls/d3dx9_36/mesh.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 2b7579e..82b3134 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7,6 +7,7 @@ * Copyright (C) 2010 Tony Wasserka * Copyright (C) 2011 Dylan Smith * Copyright (C) 2011 Michael Mc Donnell + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2632,6 +2633,9 @@ struct mesh_data { DWORD num_materials; D3DXMATERIAL *materials; DWORD *material_indices; + + struct ID3DXSkinInfo *skin_info; + DWORD nb_bones; }; static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) @@ -3099,6 +3103,64 @@ end: return hr; } +static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *mesh_data, DWORD index) +{ + HRESULT hr; + SIZE_T data_size; + const BYTE *data; + + TRACE("(%p, %p, %u)\n", filedata, mesh_data, index); + + hr = filedata->lpVtbl->Lock(filedata, &data_size, (const void**)&data); + if (FAILED(hr)) return hr; + + hr = E_FAIL; + + if (!mesh_data->skin_info) { + if (data_size < sizeof(WORD) * 3) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + /* Skip nMaxSkinWeightsPerVertex and nMaxSkinWeightsPerFace */ + data += 2 * sizeof(WORD); + mesh_data->nb_bones = *(WORD*)data; + hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } else { + const char *name; + DWORD nb_influences; + + /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ + name = *(const char**)data; + data += sizeof(char*); + + nb_influences = *(DWORD*)data; + data += sizeof(DWORD); + + if (data_size < (sizeof(char*) + sizeof(DWORD) + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)) + 16 * sizeof(FLOAT))) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + + hr = mesh_data->skin_info->lpVtbl->SetBoneName(mesh_data->skin_info, index, name); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneInfluence(mesh_data->skin_info, index, nb_influences, + (const DWORD*)data, (const FLOAT*)(data + nb_influences * sizeof(DWORD))); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneOffsetMatrix(mesh_data->skin_info, index, + (const D3DMATRIX*)(data + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)))); + if (FAILED(hr)) + goto end; + } + + hr = D3D_OK; + +end: + filedata->lpVtbl->Unlock(filedata); + return hr; +} + /* for provide_flags parameters */ #define PROVIDE_MATERIALS 0x1 #define PROVIDE_SKININFO 0x2 @@ -3114,6 +3176,7 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, ID3DXFileData *child; DWORD i; SIZE_T nb_children; + DWORD nb_skin_weigths_info = 0; /* * template Mesh { @@ -3236,17 +3299,37 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, hr = parse_material_list(child, mesh_data); } else if (provide_flags & PROVIDE_SKININFO) { if (IsEqualGUID(&type, &DXFILEOBJ_XSkinMeshHeader)) { - FIXME("Skin mesh loading not implemented.\n"); - hr = E_NOTIMPL; - goto end; + if (mesh_data->skin_info) { + WARN("Skin mesh header already encountered\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, 0); + if (FAILED(hr)) + goto end; } else if (IsEqualGUID(&type, &DXFILEOBJ_SkinWeights)) { - /* ignored without XSkinMeshHeader */ + if (!mesh_data->skin_info) { + WARN("Skin weigths found but skin mesh header not encountered yet\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weigths_info); + if (FAILED(hr)) + goto end; + nb_skin_weigths_info++; } } if (FAILED(hr)) goto end; } + if (mesh_data->skin_info && (nb_skin_weigths_info != mesh_data->nb_bones)) { + WARN("Mismatch between nb skin weights info %u encountered and nb bones %u from skin mesh header\n", + nb_skin_weigths_info, mesh_data->nb_bones); + hr = E_FAIL; + goto end; + } + hr = D3D_OK; end: @@ -3571,7 +3654,7 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *filedata, DWORD opt if (num_materials_out) *num_materials_out = mesh_data.num_materials; if (materials_out) *materials_out = materials; if (effects_out) *effects_out = effects; - if (skin_info_out) *skin_info_out = NULL; + if (skin_info_out) *skin_info_out = mesh_data.skin_info; hr = D3D_OK; cleanup: @@ -3580,6 +3663,8 @@ cleanup: if (adjacency) ID3DXBuffer_Release(adjacency); if (materials) ID3DXBuffer_Release(materials); if (effects) ID3DXBuffer_Release(effects); + if (mesh_data.skin_info) mesh_data.skin_info->lpVtbl->Release(mesh_data.skin_info); + if (skin_info_out) *skin_info_out = NULL; } HeapFree(GetProcessHeap(), 0, mesh_data.vertices); HeapFree(GetProcessHeap(), 0, mesh_data.num_tri_per_face);

1 0

Tatyana Fokina : oleaut32: Ignore NULL ppTLib/ pIndex in ITypeInfo2_fnGetContainingTypeLib.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 97f501bec3d97f25f24e2b099bbc83f4a813a35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f501bec3d97f25f24e2b099… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Mon May 27 14:43:38 2013 +0400 oleaut32: Ignore NULL ppTLib/pIndex in ITypeInfo2_fnGetContainingTypeLib. --- dlls/oleaut32/tests/typelib.c | 49 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 9 +++++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a20b3bf..32d8a04 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3385,6 +3385,54 @@ todo_wine { ITypeLib_Release(tl); } +static void test_TypeInfo2_GetContainingTypeLib(void) +{ + static const WCHAR test[] = {'t','e','s','t','.','t','l','b',0}; + static OLECHAR testTI[] = {'t','e','s','t','T','y','p','e','I','n','f','o',0}; + + ICreateTypeLib2 *ctl2; + ICreateTypeInfo *cti; + ITypeInfo2 *ti2; + ITypeLib *tl; + UINT Index; + HRESULT hr; + + hr = CreateTypeLib2(SYS_WIN32, test, &ctl2); + ok_ole_success(hr, CreateTypeLib2); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl2, testTI, TKIND_DISPATCH, &cti); + ok_ole_success(hr, ICreateTypeLib2_CreateTypeInfo); + + hr = ICreateTypeInfo_QueryInterface(cti, &IID_ITypeInfo2, (void**)&ti2); + ok_ole_success(hr, ICreateTypeInfo2_QueryInterface); + + tl = NULL; + Index = 888; + hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, &Index); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + ok(Index == 0, "ITypeInfo2_GetContainingTypeLib returned Index = %u, expected 0\n", Index); + if(tl) ITypeLib_Release(tl); + + tl = NULL; + hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, NULL); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + if(tl) ITypeLib_Release(tl); + + Index = 888; + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, &Index); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(Index == 0, "ITypeInfo2_GetContainingTypeLib returned Index = %u, expected 0\n", Index); + + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, NULL); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + + ITypeInfo2_Release(ti2); + ICreateTypeInfo_Release(cti); + ICreateTypeLib2_Release(ctl2); +} + START_TEST(typelib) { const char *filename; @@ -3416,4 +3464,5 @@ START_TEST(typelib) test_register_typelib(FALSE); test_create_typelibs(); test_LoadTypeLib(); + test_TypeInfo2_GetContainingTypeLib(); } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 1aeb27a..98f9d62 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3707,9 +3707,12 @@ static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib( TRACE("(%p,%p,%p)\n", iface, ppTLib, pIndex); - *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface; - ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib); - *pIndex = This->typeinfo->typekind >> 16; + if (ppTLib) + { + *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface; + ICreateTypeLib2_AddRef(&This->typelib->ICreateTypeLib2_iface); + } + if (pIndex) *pIndex = This->typeinfo->typekind >> 16; return S_OK; }

1 0

Andrew Eikum : oleaut32: Stub typelib and typeinfo creation interfaces in typelib.c.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 97a96094bb734b3794549758f2f08c0f0c7702ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a96094bb734b3794549758f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:30 2013 -0500 oleaut32: Stub typelib and typeinfo creation interfaces in typelib.c. --- dlls/oleaut32/typelib.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 547 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97a96094bb734b3794549…

1 0

Andrew Eikum : oleaut32: Implement basic ICreateTypeLib functions.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: ba5c9c7d38f6184f74bd82bed57c6bf1ebba3d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5c9c7d38f6184f74bd82bed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:35 2013 -0500 oleaut32: Implement basic ICreateTypeLib functions. --- dlls/oleaut32/typelib.c | 88 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 70 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index edc9f21..9bbd86f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8110,64 +8110,109 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface, LPOLESTR name) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(name)); + + if (!name) + return E_INVALIDARG; + + SysFreeString(This->Name); + This->Name = SysAllocString(name); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface, WORD majorVerNum, WORD minorVerNum) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum); - return E_NOTIMPL; + + TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); + + This->LibAttr.wMajorVerNum = majorVerNum; + This->LibAttr.wMinorVerNum = minorVerNum; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface, REFGUID guid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, debugstr_guid(guid)); + + memcpy(&This->LibAttr.guid, guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 *iface, LPOLESTR doc) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(doc)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(doc)); + + if (!doc) + return E_INVALIDARG; + + SysFreeString(This->DocString); + This->DocString = SysAllocString(doc); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 *iface, LPOLESTR helpFileName) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(helpFileName)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(helpFileName)); + + if (!helpFileName) + return E_INVALIDARG; + + SysFreeString(This->HelpFile); + This->HelpFile = SysAllocString(helpFileName); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface, DWORD helpContext) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d - stub\n", This, helpContext); - return E_NOTIMPL; + + TRACE("%p %d\n", This, helpContext); + + This->dwHelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, LCID lcid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, lcid); - return E_NOTIMPL; + + TRACE("%p %x\n", This, lcid); + + This->LibAttr.lcid = lcid; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface, UINT libFlags) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, libFlags); - return E_NOTIMPL; + + TRACE("%p %x\n", This, libFlags); + + This->LibAttr.wLibFlags = libFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) @@ -8205,8 +8250,15 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 *iface, LPOLESTR filename) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(filename)); - return E_NOTIMPL; + TRACE("%p %s\n", This, wine_dbgstr_w(filename)); + + if (!filename) + return E_INVALIDARG; + + SysFreeString(This->HelpStringDll); + This->HelpStringDll = SysAllocString(filename); + + return S_OK; } static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl = {

1 0