October 2013 - Wine-commits

Alexandre Julliard : Wine release 1.7.4
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: website Branch: master Commit: 2e6931b4ca81e297a17b626bebe983828fe0198c URL: http://source.winehq.org/git/website.git/?a=commit;h=2e6931b4ca81e297a17b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 11 19:29:55 2013 +0200 Wine release 1.7.4 --- news/en/2013101101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013101101.xml b/news/en/2013101101.xml new file mode 100644 index 0000000..f63292d --- /dev/null +++ b/news/en/2013101101.xml @@ -0,0 +1,15 @@ +<news> +<date>October 11, 2013</date> +<title>Wine 1.7.4 Released</title> +<body> + The Wine development release 1.7.4 is now available. + <a href="{$root}/announce/1.7.4">What's new</a> in this release: +<ul> + <li>Support for Cocoa-style full-screen mode in the Mac driver.</li> + <li>More preparation work for the Direct3D command stream.</li> + <li>A number of Winsock improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.4.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 18556fd521d27d298d22db5eb48e192a2c634e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18556fd521d27d298d22db5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 11 19:21:06 2013 +0200 Release 1.7.4. --- ANNOUNCE | 758 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 395 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18556fd521d27d298d22d…

1 0

Tag wine-1.7.4 : Alexandre Julliard : Release 1.7.4
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: refs/tags/wine-1.7.4 Tag: 3568a9250d544744636d66e78d3be793d5b3f69a URL: http://source.winehq.org/git/wine.git/?a=tag;h=3568a9250d544744636d66e78d3b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 11 19:21:07 2013 +0200 Release 1.7.4

1 0

Dmitry Timoshkov : kernel32: The return and last error values set by ReadFile on EOF depend on whether overlapped pointer was passed in .
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 49d0e64f880720024ddb4c9f13f1bcbced763deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d0e64f880720024ddb4c9f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 11 13:39:44 2013 +0900 kernel32: The return and last error values set by ReadFile on EOF depend on whether overlapped pointer was passed in. --- dlls/kernel32/file.c | 10 +++++++++- dlls/ntdll/tests/file.c | 7 +------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 7dd65cd..92c776d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -451,7 +451,15 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, if (status != STATUS_PENDING && bytesRead) *bytesRead = io_status->Information; - if (status && status != STATUS_END_OF_FILE && status != STATUS_TIMEOUT) + if (status == STATUS_END_OF_FILE) + { + if (overlapped != NULL) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + } + else if (status && status != STATUS_TIMEOUT) { SetLastError( RtlNtStatusToDosError(status) ); return FALSE; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b644d1..9d6819a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2139,9 +2139,7 @@ todo_wine bytes = -1; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); todo_wine @@ -2287,9 +2285,8 @@ todo_wine ovl.hEvent = 0; bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadFile(hfile, buf, 0, &bytes, &ovl); /* ReadFile return value depends on Windows version and testing it is not practical */ - if (!ret) ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ReadFile(hfile, buf, 0, &bytes, &ovl); ok(bytes == 0, "bytes %u\n", bytes); todo_wine ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); @@ -2372,10 +2369,8 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); -todo_wine ok(!ret, "ReadFile should fail\n"); ret = GetLastError(); -todo_wine ok(ret == ERROR_IO_PENDING || ret == ERROR_HANDLE_EOF /* before Vista */, "expected ERROR_IO_PENDING or ERROR_HANDLE_EOF, got %d\n", ret); ok(bytes == 0, "bytes %u\n", bytes);

1 0

Jacek Caban : ieframe: Pass frame_name to connection points in FireBeforeNavigate2.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 4ce0f742490e042e49aabb97876f26b61d77374a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce0f742490e042e49aabb978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 11 11:05:24 2013 +0200 ieframe: Pass frame_name to connection points in FireBeforeNavigate2. --- dlls/ieframe/shellbrowser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 55763db..216d3f4 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -693,7 +693,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+3) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+3) = &var_frame_name; V_VT(&var_frame_name) = VT_BSTR; - V_BSTR(&var_frame_name) = NULL; + V_BSTR(&var_frame_name) = lpszFrameName ? SysAllocString(lpszFrameName) : NULL; V_VT(params+4) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+4) = &var_flags; @@ -714,6 +714,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); + SysFreeString(V_BSTR(&var_frame_name)); SafeArrayDestroy(post_data); *pfCancel = !!cancel;

1 0

Jacek Caban : crypt32: Moved store functions to vtbl.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: fa0b7b7d3dfd4c3dcad1438596da9e5a7a60fff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0b7b7d3dfd4c3dcad143859… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 11 16:12:06 2013 +0200 crypt32: Moved store functions to vtbl. --- dlls/crypt32/collectionstore.c | 25 +++++++++++++------------ dlls/crypt32/crypt32_private.h | 12 +++++++++--- dlls/crypt32/provstore.c | 20 +++++++++++--------- dlls/crypt32/store.c | 37 ++++++++++++++++++++----------------- 4 files changed, 53 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa0b7b7d3dfd4c3dcad14…

1 0

Alistair Leslie-Hughes : mscoree: Partially implement ICLRMetaHost RequestRuntimeLoadedNotification.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 73ca9d2d0b543452d99ba4e12a2cc4b3749deae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ca9d2d0b543452d99ba4e12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 2 12:13:54 2013 +1000 mscoree: Partially implement ICLRMetaHost RequestRuntimeLoadedNotification. --- dlls/mscoree/metahost.c | 13 +++++++++++-- dlls/mscoree/tests/metahost.c | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f6558d9..f84e455 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -986,6 +986,8 @@ static const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { struct CLRMetaHost { ICLRMetaHost ICLRMetaHost_iface; + + RuntimeLoadedCallbackFnPtr callback; }; static struct CLRMetaHost GlobalCLRMetaHost; @@ -1168,9 +1170,16 @@ static HRESULT WINAPI CLRMetaHost_EnumerateLoadedRuntimes(ICLRMetaHost* iface, static HRESULT WINAPI CLRMetaHost_RequestRuntimeLoadedNotification(ICLRMetaHost* iface, RuntimeLoadedCallbackFnPtr pCallbackFunction) { - FIXME("%p\n", pCallbackFunction); + TRACE("%p\n", pCallbackFunction); - return E_NOTIMPL; + if(!pCallbackFunction) + return E_POINTER; + + WARN("Callback currently will not be called.\n"); + + GlobalCLRMetaHost.callback = pCallbackFunction; + + return S_OK; } static HRESULT WINAPI CLRMetaHost_QueryLegacyV2RuntimeBinding(ICLRMetaHost* iface, diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index a9872f0..7794e74 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -142,6 +142,23 @@ static void test_getruntime(void) ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); } +static void WINAPI notification_callback(ICLRRuntimeInfo *pRuntimeInfo, CallbackThreadSetFnPtr pfnCallbackThreadSet, + CallbackThreadUnsetFnPtr pfnCallbackThreadUnset) +{ + ok(0, "Unexpected call\n"); +} + +static void test_notification(void) +{ + HRESULT hr; + + hr = ICLRMetaHost_RequestRuntimeLoadedNotification(metahost, NULL); + ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + + hr = ICLRMetaHost_RequestRuntimeLoadedNotification(metahost,notification_callback); + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); +} + START_TEST(metahost) { if (!init_pointers()) @@ -150,6 +167,7 @@ START_TEST(metahost) test_enumruntimes(); test_getruntime(); + test_notification(); cleanup(); }

1 0

Jacek Caban : crypt32/tests: Added implicit empty store tests.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: da24f543f4304048a2b65cbc0deb35a27e17daf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da24f543f4304048a2b65cbc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 11 16:12:18 2013 +0200 crypt32/tests: Added implicit empty store tests. --- dlls/crypt32/tests/store.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 0a36c83..221dfd7 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -104,6 +104,15 @@ static void (WINAPI *pCertRemoveStoreFromCollection)(HCERTSTORE,HCERTSTORE); static BOOL (WINAPI *pCertSetStoreProperty)(HCERTSTORE,DWORD,DWORD,const void*); static BOOL (WINAPI *pCertAddCertificateLinkToStore)(HCERTSTORE,PCCERT_CONTEXT,DWORD,PCCERT_CONTEXT*); +#define test_store_is_empty(store) _test_store_is_empty(__LINE__,store) +static void _test_store_is_empty(unsigned line, HCERTSTORE store) +{ + const CERT_CONTEXT *cert; + + cert = CertEnumCertificatesInStore(store, NULL); + ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not epmty\n"); +} + static void testMemStore(void) { HCERTSTORE store1, store2; @@ -2498,6 +2507,60 @@ static DWORD countCRLsInStore(HCERTSTORE store) return crls; } +static void testEmptyStore(void) +{ + const CERT_CONTEXT *cert, *cert2, *cert3; + HCERTSTORE store; + BOOL res; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok(cert != NULL, "CertCreateCertificateContext failed\n"); + todo_wine ok(cert->hCertStore != NULL, "cert->hCertStore == NULL\n"); + if(!cert->hCertStore) { + CertFreeCertificateContext(cert); + return; + } + + test_store_is_empty(cert->hCertStore); + + cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert2, sizeof(bigCert2)); + ok(cert2 != NULL, "CertCreateCertificateContext failed\n"); + ok(cert2->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + + test_store_is_empty(cert2->hCertStore); + + res = CertAddCertificateContextToStore(cert->hCertStore, cert2, CERT_STORE_ADD_NEW, &cert3); + ok(res, "CertAddCertificateContextToStore failed\n"); + todo_wine + ok(cert3 && cert3 != cert2, "Unexpected cert3\n"); + ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + + test_store_is_empty(cert->hCertStore); + + res = CertDeleteCertificateFromStore(cert3); + ok(res, "CertDeleteCertificateContextFromStore failed\n"); + ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + + CertFreeCertificateContext(cert3); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed\n"); + + res = CertAddCertificateContextToStore(store, cert2, CERT_STORE_ADD_NEW, &cert3); + ok(res, "CertAddCertificateContextToStore failed\n"); + ok(cert3 && cert3 != cert2, "Unexpected cert3\n"); + ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); + + res = CertDeleteCertificateFromStore(cert3); + ok(res, "CertDeleteCertificateContextFromStore failed\n"); + ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); + + CertCloseStore(store, 0); + + CertFreeCertificateContext(cert2); + CertFreeCertificateContext(cert); +} + static void test_I_UpdateStore(void) { HMODULE lib = GetModuleHandleA("crypt32"); @@ -2604,5 +2667,7 @@ START_TEST(store) testAddSerialized(); testAddCertificateLink(); + testEmptyStore(); + test_I_UpdateStore(); }

1 0

Ken Thomases : winemac: Implement support for Cocoa-style full-screen mode.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: f4f50c9e4ae9007fcba4555d212be2146440f6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f50c9e4ae9007fcba4555d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 10 14:22:08 2013 -0500 winemac: Implement support for Cocoa-style full-screen mode. Based in large part on a patch submitted by Kevin Eaves. --- dlls/winemac.drv/cocoa_app.m | 5 + dlls/winemac.drv/cocoa_window.h | 5 + dlls/winemac.drv/cocoa_window.m | 169 ++++++++++++++++++++++++++++++++++---- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/window.c | 9 ++- 7 files changed, 171 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4f50c9e4ae9007fcba45…

1 0

Andrew Eikum : user32: Don' t try to paint during WM_SETFOCUS if the edit control is not visible.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 3ff27f3544b9954a98e2801201f439aca159cec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff27f3544b9954a98e280120… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 10 12:06:21 2013 -0500 user32: Don't try to paint during WM_SETFOCUS if the edit control is not visible. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/msg.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3634710..dbf1dcc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3791,7 +3791,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_InvalidateText(es, es->selection_start, es->selection_end); /* single line edit updates itself */ - if (!(es->style & ES_MULTILINE)) + if (IsWindowVisible(es->hwndSelf) && !(es->style & ES_MULTILINE)) { HDC hdc = GetDC(es->hwndSelf); EDIT_WM_Paint(es, hdc); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index aab3d12..a23dd7f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9453,6 +9453,17 @@ static const struct message sl_edit_setfocus[] = { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; +static const struct message sl_edit_invisible[] = +{ + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, + { 0 } +}; static const struct message ml_edit_setfocus[] = { { HCBT_SETFOCUS, hook }, @@ -9602,6 +9613,10 @@ static void test_edit_messages(void) dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); ok(dlg_code == (DLGC_WANTCHARS|DLGC_HASSETSEL|DLGC_WANTARROWS), "wrong dlg_code %08x\n", dlg_code); + flush_sequence(); + SetFocus(hwnd); + ok_sequence(sl_edit_invisible, "SetFocus(hwnd) on an invisible edit", FALSE); + ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); SetFocus(0);

1 0