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

Sebastian Lackner : wbemprox/tests: Fix memory leak when tests are skipped.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a248418325bb4a4405a8a3c357052e7f5991af5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a248418325bb4a4405a8a3c35… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 07:58:06 2015 +0200 wbemprox/tests: Fix memory leak when tests are skipped. --- dlls/wbemprox/tests/query.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8fd027e..56c97ff 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -158,7 +158,7 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - return; + goto out; } type = 0xdeadbeef; VariantInit( &state ); @@ -232,6 +232,7 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); +out: SysFreeString( empty ); SysFreeString( class ); } @@ -373,14 +374,14 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) if (!compname[0] || !username[0]) { skip( "Failed to get user or computer name\n" ); - return; + goto out; } hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) { win_skip( "Win32_ComputerSystem not available\n" ); - return; + goto out; } hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); @@ -406,6 +407,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) IWbemClassObject_Release( service ); IEnumWbemClassObject_Release( result ); +out: SysFreeString( query ); SysFreeString( wql ); }

1 0

Sebastian Lackner : ws2_32: Properly handle closing sockets during a select call.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0d2817b161e7c363c1fab523b6645002e980597a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2817b161e7c363c1fab523b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 30 05:43:26 2015 +0200 ws2_32: Properly handle closing sockets during a select call. Based on a patch by Bruno Jesus. --- dlls/ws2_32/socket.c | 13 ++++++++++++- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ef43186..10bfd9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4773,7 +4773,18 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd if (exceptfds) { for (i = 0; i < exceptfds->fd_count; i++, j++) - if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + { + if (fds[j].fd == -1) continue; + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + if (fds[j].revents & POLLHUP) + { + int fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); + if (fd != -1) + release_sock_fd( exceptfds->fd_array[i], fd ); + else + fds[j].revents = 0; + } + } } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f31539f..d67a47d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3834,7 +3834,6 @@ todo_wine FD_ZERO_ALL(); FD_SET_ALL(fdWrite); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); WaitForSingleObject (thread_handle, 1000);

1 0

Julian Rüger : German translation for release 1.7.42
by Jeremy Newman 04 May '15

04 May '15

Module: website Branch: master Commit: eae33ce2acace70c542b888b6734f591d97cbf0a URL: http://source.winehq.org/git/website.git/?a=commit;h=eae33ce2acace70c542b88… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 4 16:54:01 2015 +0200 German translation for release 1.7.42 --- news/de/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2015050101.xml b/news/de/2015050101.xml new file mode 100644 index 0000000..5dd24e2 --- /dev/null +++ b/news/de/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. Mai 2015</date> +<title>Wine 1.7.42 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.42 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.42">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von dynamischen Zeitzonen-Informationen.</li> + <li>Anfängliche Unterstützung des Desktopshell-Fensters.</li> + <li>Ein wenig mehr Direct2D-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.42
by Jeremy Newman 04 May '15

04 May '15

Module: website Branch: master Commit: b972bc573f5a0f00c469e008a476fe9e1a3c2a71 URL: http://source.winehq.org/git/website.git/?a=commit;h=b972bc573f5a0f00c469e0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 1 15:20:58 2015 +0200 Polish translation for release 1.7.42 --- news/pl/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2015050101.xml b/news/pl/2015050101.xml new file mode 100644 index 0000000..82ba472 --- /dev/null +++ b/news/pl/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>Maj 1, 2015</date> +<title>Wydano Wine 1.7.42</title> +<body> + Wydanie rozwojowe Wine 1.7.42 jest już dostępne. + <a href="{$root}/announce/1.7.42">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa informacji o dynamicznej strefie czasowej.</li> + <li>Wstępna obsługa okna powłoki pulpitu.</li> + <li>Poszerzono obsługę Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Aaryaman Vasishta : d3drm: Fix refcounting for IDirect3DRM{1-3}.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 844ce497171c9e82174a1e0da53809ca1833324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=844ce497171c9e82174a1e0da… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:39 2015 +0530 d3drm: Fix refcounting for IDirect3DRM{1-3}. --- dlls/d3drm/d3drm.c | 54 +++++++++++++++++++++++++++++++++++++++--------- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7b74cfb..9be9607 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -55,7 +55,7 @@ struct d3drm IDirect3DRM IDirect3DRM_iface; IDirect3DRM2 IDirect3DRM2_iface; IDirect3DRM3 IDirect3DRM3_iface; - LONG ref; + LONG ref1, ref2, ref3, iface_count; }; static inline struct d3drm *impl_from_IDirect3DRM(IDirect3DRM *iface) @@ -73,6 +73,12 @@ static inline struct d3drm *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) return CONTAINING_RECORD(iface, struct d3drm, IDirect3DRM3_iface); } +static void d3drm_destroy(struct d3drm *d3drm) +{ + HeapFree(GetProcessHeap(), 0, d3drm); + TRACE("d3drm object %p is being destroyed.\n", d3drm); +} + static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, void **out) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); @@ -106,22 +112,25 @@ static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, voi static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedIncrement(&d3drm->ref); + ULONG refcount = InterlockedIncrement(&d3drm->ref1); TRACE("%p increasing refcount to %u.\n", iface, refcount); + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); + return refcount; } static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedDecrement(&d3drm->ref); + ULONG refcount = InterlockedDecrement(&d3drm->ref1); TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, d3drm); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); return refcount; } @@ -455,15 +464,27 @@ static HRESULT WINAPI d3drm2_QueryInterface(IDirect3DRM2 *iface, REFIID riid, vo static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref2); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref2); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, @@ -804,15 +825,27 @@ static HRESULT WINAPI d3drm3_QueryInterface(IDirect3DRM3 *iface, REFIID riid, vo static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref3); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref3); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, @@ -1488,7 +1521,8 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl; object->IDirect3DRM2_iface.lpVtbl = &d3drm2_vtbl; object->IDirect3DRM3_iface.lpVtbl = &d3drm3_vtbl; - object->ref = 1; + object->ref1 = 1; + object->iface_count = 1; *d3drm = &object->IDirect3DRM_iface; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 977c9c0..61f2cab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1761,8 +1761,8 @@ static void test_d3drm_qi(void) { static const struct qi_test tests[] = { - { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, - { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, FALSE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, FALSE }, { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, { &IID_IDirect3DRMObject, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE },

1 0

Aaryaman Vasishta : d3drm/tests: Remove TODO' s from test_qi and TODO field from test tables.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 33160f5221ad7796bbb0612b3341d6498afcd7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33160f5221ad7796bbb0612b3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:40 2015 +0530 d3drm/tests: Remove TODO's from test_qi and TODO field from test tables. --- dlls/d3drm/tests/d3drm.c | 287 +++++++++++++++++++++++------------------------ 1 file changed, 139 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33160f5221ad7796bbb06…

1 0

Nikolay Sivov : dwrite/tests: Test character spacing applied to cluster metrics.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 47224510b466f8e9479ecacc50b3f0a5e4815d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47224510b466f8e9479ecacc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 12:52:50 2015 +0300 dwrite/tests: Test character spacing applied to cluster metrics. --- dlls/dwrite/tests/layout.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 57ae458..73296ba 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -994,6 +994,7 @@ static void test_GetClusterMetrics(void) static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[4]; + IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -1026,6 +1027,49 @@ static void test_GetClusterMetrics(void) ok(metrics[i].length == 1, "%u: got length %u\n", i, metrics[i].length); } + /* apply spacing and check widths again */ + if (IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void**)&layout1) == S_OK) { + DWRITE_CLUSTER_METRICS metrics2[4]; + FLOAT leading, trailing, min_advance; + DWRITE_TEXT_RANGE r; + + leading = trailing = min_advance = 2.0; + hr = IDWriteTextLayout1_GetCharacterSpacing(layout1, 0, &leading, &trailing, + &min_advance, NULL); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(leading == 0.0 && trailing == 0.0 && min_advance == 0.0, + "got %.2f, %.2f, %.2f\n", leading, trailing, min_advance); +} + r.startPosition = 0; + r.length = 4; + hr = IDWriteTextLayout1_SetCharacterSpacing(layout1, 10.0, 15.0, 0.0, r); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics2, sizeof(metrics2)/sizeof(metrics2[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + for (i = 0; i < count; i++) { +todo_wine + ok(metrics2[i].width > metrics[i].width, "%u: got width %.2f, was %.2f\n", i, metrics2[i].width, + metrics[i].width); + ok(metrics2[i].length == 1, "%u: got length %u\n", i, metrics2[i].length); + } + + /* back to defaults */ + r.startPosition = 0; + r.length = 4; + hr = IDWriteTextLayout1_SetCharacterSpacing(layout1, 0.0, 0.0, 0.0, r); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteTextLayout1_Release(layout1); + } + else + win_skip("IDWriteTextLayout1 is not supported, cluster spacing test skipped.\n"); + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &trimm); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : shell32/tests: Fix test crashes when running with wine.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 478d695ec8cb773f9e868dba01b9f707afe1f7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478d695ec8cb773f9e868dba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 13:00:37 2015 +0300 shell32/tests: Fix test crashes when running with wine. --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ba246f1..b7773ad 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -444,6 +444,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); ok(hr == S_OK, "got 0x%08x\n", hr); + /* TODO: remove when explorer startup with clean prefix is fixed */ + if (hr != S_OK) + return; if (0) /* NULL out argument - currently crashes on Wine */ { hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL);

1 0

Nikolay Sivov : msdmo: Reg* API does not use HRESULT return codes.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 49958f83f1caf983ca6ad7ce5a43b6c24bafffa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49958f83f1caf983ca6ad7ce5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 3 21:41:00 2015 +0300 msdmo: Reg* API does not use HRESULT return codes. --- dlls/msdmo/dmoreg.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index dea079a..67ba498 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -189,25 +189,26 @@ HRESULT WINAPI DMORegister( HKEY hkey = 0; HKEY hckey = 0; HKEY hclskey = 0; + LONG ret; TRACE("%s %s %s\n", debugstr_w(szName), debugstr_guid(clsidDMO), debugstr_guid(guidCategory)); if (IsEqualGUID(guidCategory, &GUID_NULL)) return E_INVALIDARG; - hres = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL); - if (ERROR_SUCCESS != hres) - goto lend; + if (ret) + return HRESULT_FROM_WIN32(ret); /* Create clsidDMO key under MediaObjects */ - hres = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, + ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; /* Set default Name value */ - hres = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, + ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, (strlenW(szName) + 1) * sizeof(WCHAR)); /* Set InputTypes */ @@ -219,28 +220,28 @@ HRESULT WINAPI DMORegister( if (dwFlags & DMO_REGISTERF_IS_KEYED) { /* Create Keyed key */ - hres = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, + ret = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; RegCloseKey(hckey); } /* Register the category */ - hres = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, + ret = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; RegCloseKey(hkey); - hres = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, + ret = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; - hres = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, + ret = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hclskey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; lend: @@ -253,6 +254,7 @@ lend: if (hrkey) RegCloseKey(hrkey); + hres = HRESULT_FROM_WIN32(ret); TRACE(" hresult=0x%08x\n", hres); return hres; }

1 0

Thomas Faller : jscript: Date.parse: long date with '/' or '-'.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: fdd22f197ace226ceae8531c12651feb192b7619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd22f197ace226ceae8531c1… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun May 3 21:40:27 2015 +0200 jscript: Date.parse: long date with '/' or '-'. --- dlls/jscript/date.c | 9 ++++++++- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5e5ef1c..6d98fcd 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2132,7 +2132,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { } } else if(parse[i]=='-' || parse[i]=='/') { - /* Short date */ + /* Short or long date */ if(set_day || set_month || set_year) break; set_day = TRUE; set_month = TRUE; @@ -2152,6 +2152,13 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { if(parse[i]<'0' || parse[i]>'9') break; year = atoiW(&parse[i]); while(parse[i]>='0' && parse[i]<='9') i++; + + if(tmp >= 70){ + /* long date */ + month = day - 1; + day = year; + year = tmp; + } } else if(tmp<0) break; else if(tmp<70) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e1f91c0..f4f42b0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2013,6 +2013,8 @@ ok(Date.parse("February 31 UTC, 2000 12:31:17 PM") === 952000277000, "Date.parse(\"February 31 UTC, 2000 12:31:17 PM\") = " + Date.parse("February 31 UTC, 2000 12:31:17 PM")); ok(Date.parse("71 11:32AM Dec 12 UTC BC ") === -64346358480000, "Date.parse(\"71 11:32AM Dec 12 UTC BC \") = " + Date.parse("71 11:32AM Dec 12 UTC BC ")); ok(Date.parse("23/71/2000 11::32::UTC") === 1010662320000, "Date.parse(\"23/71/2000 11::32::UTC\") = " + Date.parse("23/71/2000 11::32::UTC")); +ok(Date.parse("1970/01/01") === Date.parse("01/01/1970"), "Date.parse(\"1970/01/01\") = " + Date.parse("1970/01/01")); +ok(Date.parse("71/12/14") === Date.parse("12/14/1971"), "Date.parse(\"71/12/14\") = " + Date.parse("71/12/14")); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0