October 2012 - Wine-Commits

Alexandre Julliard : winex11: Remove some remainders of the ddraw HAL support.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 900b5f4b793daca9b8ba2934d6783bdf79a59f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=900b5f4b793daca9b8ba2934d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:36:31 2012 +0200 winex11: Remove some remainders of the ddraw HAL support. --- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/settings.c | 5 ----- include/d3dhal.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a27b052..f03dd4d 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -311,8 +311,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d { switch (*(const INT *)in_data) { - case DCICOMMAND: - return DD_HAL_VERSION; case X11DRV_ESCAPE: return TRUE; } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9512c64..035b0da 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -35,11 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); -/* - * The DDHALMODEINFO type is used to hold all the mode information. - * This is done because the array of DDHALMODEINFO structures must be - * created for use by DirectDraw anyway. - */ static struct x11drv_mode_info *dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; diff --git a/include/d3dhal.h b/include/d3dhal.h index 6c68d4a..9d43313 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,9 +47,6 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; -/* this is to allow keeping the bulk of our OpenGL code out of x11drv */ -#define D3DDD_WINE_OPENGL_DEVICE 0x00008000 - typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps;

1 0

Piotr Caban : advapi32: Don' t terminate service when its last thread has exited.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 8ebf0a72c941e07563853f9e60fdecf86dcc6a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebf0a72c941e07563853f9e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:54 2012 +0200 advapi32: Don't terminate service when its last thread has exited. --- dlls/advapi32/service.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1f585dc..07b9e4b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -547,7 +547,6 @@ static BOOL service_run_main_thread(void) { services[wait_services[ret]]->thread = 0; CloseHandle( wait_handles[ret] ); - if (n == 5) return TRUE; /* it was the last running thread */ } else return FALSE; }

1 0

Piotr Caban : services: Kill service thread after timeout so it can terminate cleanly.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 522bc15b455ffbd09bb2f594aaaa3e9b13903efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=522bc15b455ffbd09bb2f594a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:26:10 2012 +0200 services: Kill service thread after timeout so it can terminate cleanly. --- programs/services/rpc.c | 118 ++++++++++++++++++++++++++++++++++++++++-- programs/services/services.c | 4 +- programs/services/services.h | 2 +- 3 files changed, 116 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index bf8ce80..9fe81d1 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,6 +84,53 @@ struct sc_lock struct scmdatabase *db; }; +static HANDLE timeout_queue_event; +static CRITICAL_SECTION timeout_queue_cs; +static CRITICAL_SECTION_DEBUG timeout_queue_cs_debug = +{ + 0, 0, &timeout_queue_cs, + { &timeout_queue_cs_debug.ProcessLocksList, &timeout_queue_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": timeout_queue_cs") } +}; +static CRITICAL_SECTION timeout_queue_cs = { &timeout_queue_cs_debug, -1, 0, 0, 0, 0 }; +static struct list timeout_queue = LIST_INIT(timeout_queue); +struct timeout_queue_elem +{ + struct list entry; + + FILETIME time; + void (*func)(struct service_entry*); + struct service_entry *service_entry; +}; + +static void run_after_timeout(void (*func)(struct service_entry*), struct service_entry *service, DWORD timeout) +{ + struct timeout_queue_elem *elem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct timeout_queue_elem)); + ULARGE_INTEGER time; + + if(!elem) { + func(service); + return; + } + + service->ref_count++; + elem->func = func; + elem->service_entry = service; + + GetSystemTimeAsFileTime(&elem->time); + time.LowPart = elem->time.dwLowDateTime; + time.HighPart = elem->time.dwHighDateTime; + time.QuadPart += timeout*10000000; + elem->time.dwLowDateTime = time.LowPart; + elem->time.dwHighDateTime = time.HighPart; + + EnterCriticalSection(&timeout_queue_cs); + list_add_head(&timeout_queue, &elem->entry); + LeaveCriticalSection(&timeout_queue_cs); + + SetEvent(timeout_queue_event); +} + static void free_service_strings(struct service_entry *old, struct service_entry *new) { QUERY_SERVICE_CONFIGW *old_cfg = &old->config; @@ -700,7 +747,7 @@ DWORD __cdecl svcctl_SetServiceStatus( service_unlock(service->service_entry); if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - service_terminate(service->service_entry); + run_after_timeout(service_terminate, service->service_entry, service_kill_timeout); else if (service->service_entry->status_changed_event) SetEvent(service->service_entry->status_changed_event); @@ -1567,10 +1614,16 @@ DWORD RPC_Init(void) return ERROR_SUCCESS; } -DWORD RPC_MainLoop(void) +DWORD events_loop(void) { + struct timeout_queue_elem *iter, *iter_safe; DWORD err; - HANDLE hExitEvent = __wine_make_process_system(); + HANDLE wait_handles[2]; + DWORD timeout = INFINITE; + + wait_handles[0] = __wine_make_process_system(); + wait_handles[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + timeout_queue_event = wait_handles[1]; SetEvent(g_hStartedEvent); @@ -1578,12 +1631,67 @@ DWORD RPC_MainLoop(void) do { - err = WaitForSingleObjectEx(hExitEvent, INFINITE, TRUE); + err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); WINE_TRACE("Wait returned %d\n", err); + + if(err==WAIT_OBJECT_0+1 || err==WAIT_TIMEOUT) + { + FILETIME cur_time; + ULARGE_INTEGER time; + + GetSystemTimeAsFileTime(&cur_time); + time.LowPart = cur_time.dwLowDateTime; + time.HighPart = cur_time.dwHighDateTime; + + EnterCriticalSection(&timeout_queue_cs); + timeout = INFINITE; + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + if(CompareFileTime(&cur_time, &iter->time) >= 0) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + else + { + ULARGE_INTEGER time_diff; + + time_diff.LowPart = iter->time.dwLowDateTime; + time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; + + if(time_diff.QuadPart < timeout) + timeout = time_diff.QuadPart; + } + } + LeaveCriticalSection(&timeout_queue_cs); + + if(timeout != INFINITE) + timeout += 1000; + } } while (err != WAIT_OBJECT_0); WINE_TRACE("Object signaled - wine shutdown\n"); - CloseHandle(hExitEvent); + EnterCriticalSection(&timeout_queue_cs); + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + LeaveCriticalSection(&timeout_queue_cs); + + CloseHandle(wait_handles[0]); + CloseHandle(wait_handles[1]); return ERROR_SUCCESS; } diff --git a/programs/services/services.c b/programs/services/services.c index d28e47e..75abf06 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -40,7 +40,7 @@ HANDLE g_hStartedEvent; struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; -DWORD service_kill_timeout = 20000; +DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; @@ -914,7 +914,7 @@ int main(int argc, char *argv[]) if ((err = RPC_Init()) == ERROR_SUCCESS) { scmdatabase_autostart_services(active_database); - RPC_MainLoop(); + events_loop(); scmdatabase_wait_terminate(active_database); } scmdatabase_destroy(active_database); diff --git a/programs/services/services.h b/programs/services/services.h index b4b895e..3e36141 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,7 +88,7 @@ extern DWORD service_pipe_timeout; extern DWORD service_kill_timeout; DWORD RPC_Init(void); -DWORD RPC_MainLoop(void); +DWORD events_loop(void); /* from utils.c */ LPWSTR strdupW(LPCWSTR str);

1 0

Alexandre Julliard : explorer: Remove support for the old-style X11 desktop configuration key.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 78b86e34464a30d57d342b0beb3aede740b06b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b86e34464a30d57d342b0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:37:00 2012 +0200 explorer: Remove support for the old-style X11 desktop configuration key. --- programs/explorer/desktop.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 84f6fa3..c646f2d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -255,7 +255,6 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; HWND hwnd, msg_hwnd; @@ -288,27 +287,6 @@ void manage_desktop( WCHAR *arg ) { if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - else /* check for the X11 driver key for backwards compatibility (to be removed) */ - { - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; - static const WCHAR x11_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'X','1','1',' ','D','r','i','v','e','r',0}; - HKEY hkey; - WCHAR buffer[64]; - DWORD size = sizeof(buffer); - - width = height = 0; - /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, x11_keyW, &hkey )) - { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) - { - name = defaultW; - if (!parse_size( buffer, &width, &height )) width = height = 0; - } - RegCloseKey( hkey ); - } - } if (name && width && height) xwin = create_desktop( name, width, height );

1 0

Akihiro Sagawa : cmd: Properly handle multibyte characters in batch files.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 8daef1649b242e26236df9c9cb1810750113bed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daef1649b242e26236df9c9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 20 01:02:24 2012 +0900 cmd: Properly handle multibyte characters in batch files. --- programs/cmd/batch.c | 58 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index bacb6cd..02d1fcf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -234,31 +234,53 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) { DWORD charsRead; BOOL status; - LARGE_INTEGER filepos; DWORD i; /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ if (!WCMD_is_console_handle(h)) { - /* Save current file position */ - filepos.QuadPart = 0; - SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); - } + LARGE_INTEGER filepos; + char *bufA; + UINT cp; + const char *p; + + cp = GetConsoleCP(); + bufA = HeapAlloc(GetProcessHeap(), 0, noChars); + if (!bufA) return NULL; + + /* Save current file position */ + filepos.QuadPart = 0; + SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); + + status = ReadFile(h, bufA, noChars, &charsRead, NULL); + if (!status || charsRead == 0) { + HeapFree(GetProcessHeap(), 0, bufA); + return NULL; + } - status = WCMD_ReadFile(h, buf, noChars, &charsRead); - if (!status || charsRead == 0) return NULL; + /* Find first EOL */ + for (p = bufA; p < (bufA + charsRead); p = CharNextExA(cp, p, 0)) { + if (*p == '\n' || *p == '\r') + break; + } - /* Find first EOL */ - for (i = 0; i < charsRead; i++) { - if (buf[i] == '\n' || buf[i] == '\r') - break; - } + /* Sets file pointer to the start of the next line, if any */ + filepos.QuadPart += p - bufA + 1 + (*p == '\r' ? 1 : 0); + SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); - if (!WCMD_is_console_handle(h) && i != charsRead) { - /* Sets file pointer to the start of the next line, if any */ - filepos.QuadPart += i + 1 + (buf[i] == '\r' ? 1 : 0); - SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); + i = MultiByteToWideChar(cp, 0, bufA, p - bufA, buf, noChars); + HeapFree(GetProcessHeap(), 0, bufA); + } + else { + status = WCMD_ReadFile(h, buf, noChars, &charsRead); + if (!status || charsRead == 0) return NULL; + + /* Find first EOL */ + for (i = 0; i < charsRead; i++) { + if (buf[i] == '\n' || buf[i] == '\r') + break; + } } /* Truncate at EOL (or end of buffer) */

1 0

Nikolay Sivov : dwrite: Fix a stupid copy/ paste typo in Release return value.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: eb7d51b649b4061b5c674031d913025f0e9e568a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d51b649b4061b5c674031d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 21:47:22 2012 -0400 dwrite: Fix a stupid copy/paste typo in Release return value. --- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/main.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bb3e8a6..d5346c9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -211,7 +211,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) heap_free(This); - return S_OK; + return ref; } static DWRITE_FONT_FACE_TYPE WINAPI dwritefontface_GetType(IDWriteFontFace *iface) @@ -405,7 +405,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFamily **family) @@ -558,7 +558,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily *iface, IDWriteFontCollection **collection) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bac6e40..fcc14f7 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -84,7 +84,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface, diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 577a261..760ebb2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -104,7 +104,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout *iface, DWRITE_TEXT_ALIGNMENT alignment) @@ -710,7 +710,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat *iface, DWRITE_TEXT_ALIGNMENT alignment) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 29552c6..5f69723 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -99,7 +99,7 @@ static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams *iface) if (!ref) heap_free(This); - return S_OK; + return ref; } static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams *iface) @@ -236,7 +236,7 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) heap_free(This); } - return S_OK; + return ref; } static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface)

1 0

Jacek Caban : mshtml: Added more events tests.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 516731c8618d0b30e4fb0298bd6b3b89fc7c2051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516731c8618d0b30e4fb0298b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 12:00:06 2012 +0200 mshtml: Added more events tests. --- dlls/mshtml/tests/events.html | 42 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index b3b6958..131ba19 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -78,12 +78,50 @@ function test_scriptfor() { ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); } -function runTests() { +function test_handler_this() { + document.body.innerHTML = '<div id="d1"><div id="d2"></div></div>'; + + var div1 = document.getElementById("d1"); + var div2 = document.getElementById("d2"); + var calls = new Array(); + + function createHandler(name, node) { + return function() { + ok(this === node, "this !== node"); + calls.push(name); + } + } + + function registerHandler(name, target) { + var b = target.attachEvent("onclick", function() { + ok(this === window, "this !== window"); + calls.push(name+"*"); + }); + ok(b, "attachEvent failed"); + } + + registerHandler("div1", div1); + registerHandler("div2", div2); + registerHandler("body", document.body); + div1.onclick = createHandler("div1", div1); + div2.onclick = createHandler("div2", div2); + document.body.onclick = createHandler("body", document.body); + + div2.click(); + ok(calls == "div2,div2*,div1,div1*,body,body*", "calls = " + calls); +} + +function runTests(t) { try { ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); + ok(t === window, "t !== window"); + + ok(typeof(window.onload) === "function", "typeof(window.onload) = " + typeof(window.onload)); + ok(document.body.onload === window.onload, "document.body.onload !== window.onload"); test_scriptfor(); ondataavailable_test(); + test_handler_this(); }catch(e) { ok(false, "Got an exception: " + e.message); } @@ -92,7 +130,7 @@ function runTests() { } </script> </head> -<body onload="runTests()"> +<body onload="runTests(this)"> <div id="divid"></div> <div id="divid2"></div> <script event="onclick" for="divid2">

1 0

Christian Costa : d3drm: Fix normals computation and add according tests.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: cb131bf03032663fa9712bcdd83012b4eb487d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb131bf03032663fa9712bcdd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 18:11:03 2012 +0200 d3drm: Fix normals computation and add according tests. --- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/tests/d3drm.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22efb00..4ba29cc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1419,7 +1419,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) D3DVECTOR a, b; D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[2]], &This->pVertices[faces_vertex_idx_ptr[1]]); - D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[1]], &This->pVertices[faces_vertex_idx_ptr[0]]); + D3DRMVectorSubtract(&b, &This->pVertices[faces_vertex_idx_ptr[0]], &This->pVertices[faces_vertex_idx_ptr[1]]); D3DRMVectorCrossProduct(&face_normal, &a, &b); D3DRMVectorNormalize(&face_normal); } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a257aea..0d600c5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -64,6 +64,11 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static BOOL match_float(float a, float b) +{ + return (a - b) < 0.000001f; +} + static D3DRMMATRIX4D identity = { { 1.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f, 0.0f }, @@ -186,7 +191,7 @@ static void test_MeshBuilder(void) DWORD val1, val2, val3; D3DVALUE valu, valv; D3DVECTOR v[3]; - D3DVECTOR n[3]; + D3DVECTOR n[4]; DWORD f[8]; char name[10]; DWORD size; @@ -259,6 +264,22 @@ static void test_MeshBuilder(void) ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + /* Check that Load method generated default normals */ + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(match_float(U1(n[0]).x, 0.577350f), "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 0.577350f); + ok(match_float(U2(n[0]).y, 0.577350f), "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 0.577350f); + ok(match_float(U3(n[0]).z, 0.577350f), "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 0.577350f); + ok(match_float(U1(n[1]).x, -0.229416f), "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, -0.229416f); + ok(match_float(U2(n[1]).y, 0.688247f), "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 0.688247f); + ok(match_float(U3(n[1]).z, 0.688247f), "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 0.688247f); + ok(match_float(U1(n[2]).x, -0.229416f), "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, -0.229416f); + ok(match_float(U2(n[2]).y, 0.688247f), "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 0.688247f); + ok(match_float(U3(n[2]).z, 0.688247f), "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 0.688247f); + ok(match_float(U1(n[3]).x, -0.577350f), "Wrong component n[3].x = %f (expected %f)\n", U1(n[3]).x, -0.577350f); + ok(match_float(U2(n[3]).y, 0.577350f), "Wrong component n[3].y = %f (expected %f)\n", U2(n[3]).y, 0.577350f); + ok(match_float(U3(n[3]).z, 0.577350f), "Wrong component n[3].z = %f (expected %f)\n", U3(n[3]).z, 0.577350f); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ valu = 1.23f; valv = 3.21f;

1 0

Christian Costa : d3drm: Enum all materials even if only the first one is handled.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 466c244d1833f6644abae540030ef662a187984d URL: http://source.winehq.org/git/wine.git/?a=commit;h=466c244d1833f6644abae5400… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:32 2012 +0200 d3drm: Enum all materials even if only the first one is handled. --- dlls/d3drm/meshbuilder.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 180a8a9..22efb00 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1244,10 +1244,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) WARN("Returned size %u does not match expected one %u\n", size, data_size); if (nb_materials > 1) - { FIXME("Only one material per mesh supported, first one applies to all faces\n"); - nb_materials = 1; - } while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) { @@ -1256,6 +1253,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECT3DRMMATERIAL2 material; LPDIRECTXFILEOBJECT material_child; + if (i >= 1) + { + /* FIXME: Only handle first material but enum all of them */ + IDirectXFileObject_Release(child); + i++; + continue; + } + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) {

1 0

Piotr Caban : msvcp60: Copy correct number of characters in basic_string:: _Grow.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 9d6c003cd7bb059777b5c931c4843be68560218b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6c003cd7bb059777b5c931c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 17:15:49 2012 +0200 msvcp60: Copy correct number of characters in basic_string::_Grow. --- dlls/msvcp60/string.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 591ffdf..ed4391c 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -203,13 +203,16 @@ MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_siz return FALSE; } + if(len > new_res) + len = new_res; + *ptr = 0; if(this->ptr) - char_traits_char__Copy_s(ptr+1, new_size, this->ptr, this->size); + char_traits_char__Copy_s(ptr+1, new_size, this->ptr, len); basic_string_char__Tidy(this, TRUE); this->ptr = ptr+1; this->res = new_res; - basic_string_char__Eos(this, len>new_res ? new_res : len); + basic_string_char__Eos(this, len); } return new_size>0; @@ -1911,13 +1914,16 @@ MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_s return FALSE; } + if(len > new_res) + len = new_res; + *ptr = 0; if(this->ptr) - char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, this->size); + char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, len); basic_string_wchar__Tidy(this, TRUE); this->ptr = ptr+1; this->res = new_res; - basic_string_wchar__Eos(this, len>new_res ? new_res : len); + basic_string_wchar__Eos(this, len); } return new_size>0;

1 0