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

Alexandre Julliard : libwine: Update the codepage tables to Unicode 6.2.0.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 6cb5cf183ae6b7842692bb971632659ad6f55ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb5cf183ae6b7842692bb971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 11:26:45 2013 +0200 libwine: Update the codepage tables to Unicode 6.2.0. --- dlls/kernel32/tests/locale.c | 2 +- libs/wine/c_037.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10000.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10002.c | 79 ++++++++++++++++++++++++---------- libs/wine/c_10003.c | 79 ++++++++++++++++++++++++---------- libs/wine/c_10006.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10007.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10008.c | 81 ++++++++++++++++++++++++---------- libs/wine/c_10010.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10017.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10021.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10029.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_1006.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10079.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10081.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10082.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_1026.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20127.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20932.c | 81 ++++++++++++++++++++++++---------- libs/wine/c_21866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28591.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28592.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28593.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28594.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28595.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28596.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28597.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28598.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28599.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28600.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28603.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28604.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28605.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28606.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_424.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_437.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_500.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_737.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_775.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_850.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_852.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_855.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_856.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_857.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_860.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_861.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_862.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_863.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_864.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_865.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_869.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_875.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_878.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/casemap.c | 53 +++++++++++----------- libs/wine/wctype.c | 92 +++++++++++++++++++------------------- tools/l_intl.nls | Bin 6022 -> 6086 bytes 58 files changed, 3600 insertions(+), 1817 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cb5cf183ae6b7842692b…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6
by Jeremy Newman 22 Jul '13

22 Jul '13

Module: website Branch: master Commit: e89ad557d2ad1894326235a9849ec17c77458880 URL: http://source.winehq.org/git/website.git/?a=commit;h=e89ad557d2ad1894326235… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 19 15:51:36 2013 +0200 Polish translation for release 1.6 --- news/pl/2013071801.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/news/pl/2013071801.xml b/news/pl/2013071801.xml new file mode 100644 index 0000000..6bee54c --- /dev/null +++ b/news/pl/2013071801.xml @@ -0,0 +1,10 @@ +<news> +<date>Lipiec 18, 2013</date> +<title>Wydano Wine 1.6</title> +<body> + Zespół Wine z dumą ogłasza, że stabilne wydanie Wine 1.6 jest już dostępne. + Wydanie to stanowi 16 miesięcy pracy programistów, która przyniosła ponad 10,000 indywidualnych zmian w kodzie. Głównymi nowościami jest nowy sterownik Mac, pełne wsparcie dla przezroczystości okien i nowy pakiet Mono do wspierania aplikacji .NET. + Wydanie zostało ulepszone wzdłuż i wszerz, przez co pozwala na uruchomienie wielu nowych gier i programów. Obejrzyj poniższe <a href="{$root}/announce/1.6">uwagi o wydaniu</a> , aby zapoznać się z głównymi zmianami. +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.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

Frédéric Delanoy : Link to translated wiki homepage in French main help page (try 2)
by Jeremy Newman 22 Jul '13

22 Jul '13

Module: website Branch: master Commit: e56f002fdd299b4eac31a13a25338a19c48413af URL: http://source.winehq.org/git/website.git/?a=commit;h=e56f002fdd299b4eac31a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:13:43 2013 +0200 Link to translated wiki homepage in French main help page (try 2) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index aa18446..493213e 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -50,7 +50,7 @@ payant pour Wine. <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> </td> <td valign="top"> - Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + Notre <a href="http://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. </td> </tr> @@ -93,7 +93,7 @@ intéressante. <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> - Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bugs</a> présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. </td> </tr>

1 0

Dmitry Timoshkov : gdiplus: Store graphics clipping region in device coordinates.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 14f34c15d1ed5ff3a58b9505637574ade6eaef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f34c15d1ed5ff3a58b95056… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 11:34:42 2013 +0900 gdiplus: Store graphics clipping region in device coordinates. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 88 ++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 26 ++---------- 3 files changed, 85 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f34c15d1ed5ff3a58b9…

1 0

Alexandre Julliard : ntdll: Simplify detach sequence now that there is no possible race on process exit .
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 1c11770159c464ab0cfb65c81ab8262db6ffb3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c11770159c464ab0cfb65c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 19 12:13:09 2013 +0200 ntdll: Simplify detach sequence now that there is no possible race on process exit. --- dlls/ntdll/loader.c | 59 ++++++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9642f62..c4d7487 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1163,16 +1163,13 @@ static void attach_implicitly_loaded_dlls( LPVOID reserved ) * process_detach * * Send DLL process detach notifications. See the comment about calling - * sequence at process_attach. Unless the bForceDetach flag - * is set, only DLLs with zero refcount are notified. + * sequence at process_attach. */ -static void process_detach( BOOL bForceDetach, LPVOID lpReserved ) +static void process_detach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; - RtlEnterCriticalSection( &loader_section ); - if (bForceDetach) process_detaching = 1; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; do { @@ -1183,21 +1180,19 @@ static void process_detach( BOOL bForceDetach, LPVOID lpReserved ) /* Check whether to detach this DLL */ if ( !(mod->Flags & LDR_PROCESS_ATTACHED) ) continue; - if ( mod->LoadCount && !bForceDetach ) + if ( mod->LoadCount && !process_detaching ) continue; /* Call detach notification */ mod->Flags &= ~LDR_PROCESS_ATTACHED; MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), - DLL_PROCESS_DETACH, lpReserved ); + DLL_PROCESS_DETACH, ULongToPtr(process_detaching) ); /* Restart at head of WINE_MODREF list, as entries might have been added and/or removed while performing the call ... */ break; } } while (entry != mark); - - RtlLeaveCriticalSection( &loader_section ); } /************************************************************************* @@ -1215,7 +1210,6 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) /* don't do any attach calls if process is exiting */ if (process_detaching) return STATUS_SUCCESS; - /* FIXME: there is still a race here */ RtlEnterCriticalSection( &loader_section ); @@ -2394,7 +2388,8 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) void WINAPI LdrShutdownProcess(void) { TRACE("()\n"); - process_detach( TRUE, (LPVOID)1 ); + process_detaching = 1; + process_detach(); } /****************************************************************** @@ -2410,7 +2405,6 @@ void WINAPI LdrShutdownThread(void) /* don't do any detach calls if process is exiting */ if (process_detaching) return; - /* FIXME: there is still a race here */ RtlEnterCriticalSection( &loader_section ); @@ -2537,41 +2531,36 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) */ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) { + WINE_MODREF *wm; NTSTATUS retv = STATUS_SUCCESS; + if (process_detaching) return retv; + TRACE("(%p)\n", hModule); RtlEnterCriticalSection( &loader_section ); - /* if we're stopping the whole process (and forcing the removal of all - * DLLs) the library will be freed anyway - */ - if (!process_detaching) + free_lib_count++; + if ((wm = get_modref( hModule )) != NULL) { - WINE_MODREF *wm; - - free_lib_count++; - if ((wm = get_modref( hModule )) != NULL) - { - TRACE("(%s) - START\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); + TRACE("(%s) - START\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); - /* Recursively decrement reference counts */ - MODULE_DecRefCount( wm ); + /* Recursively decrement reference counts */ + MODULE_DecRefCount( wm ); - /* Call process detach notifications */ - if ( free_lib_count <= 1 ) - { - process_detach( FALSE, NULL ); - MODULE_FlushModrefs(); - } - - TRACE("END\n"); + /* Call process detach notifications */ + if ( free_lib_count <= 1 ) + { + process_detach(); + MODULE_FlushModrefs(); } - else - retv = STATUS_DLL_NOT_FOUND; - free_lib_count--; + TRACE("END\n"); } + else + retv = STATUS_DLL_NOT_FOUND; + + free_lib_count--; RtlLeaveCriticalSection( &loader_section );

1 0

Alexandre Julliard : ntdll: Implement RtlExitUserProcess.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 3799d55d9b629d4733815d73a350e2ee868b98e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799d55d9b629d4733815d73a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 19 12:15:15 2013 +0200 ntdll: Implement RtlExitUserProcess. --- dlls/kernel32/process.c | 20 ++------------------ dlls/ntdll/loader.c | 14 ++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6d2f80d..6ce43d8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2624,30 +2624,14 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr ".byte 0x6A, 0x00\n\t" /* pushl $0 */ ".byte 0x68, 0x00, 0x00, 0x00, 0x00\n\t" /* pushl $0 - 4 bytes immediate */ "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("process_ExitProcess") __ASM_STDCALL(4) "\n\t" + "call " __ASM_NAME("RtlExitUserProcess") __ASM_STDCALL(4) "\n\t" "leave\n\t" "ret $4" ) - -void WINAPI process_ExitProcess( DWORD status ) -{ - ULONG magic; - LdrLockLoaderLock( 0, 0, &magic ); - RtlAcquirePebLock(); - NtTerminateProcess(0, status); - LdrShutdownProcess(); - NtTerminateProcess(GetCurrentProcess(), status); - exit(status); -} - #else void WINAPI ExitProcess( DWORD status ) { - RtlAcquirePebLock(); - NtTerminateProcess(0, status); - LdrShutdownProcess(); - NtTerminateProcess(GetCurrentProcess(), status); - exit(status); + RtlExitUserProcess( status ); } #endif diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c4d7487..b3abad0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2392,6 +2392,20 @@ void WINAPI LdrShutdownProcess(void) process_detach(); } + +/****************************************************************** + * RtlExitUserProcess (NTDLL.@) + */ +void WINAPI RtlExitUserProcess( DWORD status ) +{ + RtlEnterCriticalSection( &loader_section ); + RtlAcquirePebLock(); + NtTerminateProcess( 0, status ); + LdrShutdownProcess(); + NtTerminateProcess( GetCurrentProcess(), status ); + exit( status ); +} + /****************************************************************** * LdrShutdownThread (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3d4fa2e..0d4d62d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -568,6 +568,7 @@ @ stdcall RtlEqualString(ptr ptr long) @ stdcall RtlEqualUnicodeString(ptr ptr long) @ stdcall RtlEraseUnicodeString(ptr) +@ stdcall RtlExitUserProcess(long) @ stdcall RtlExitUserThread(long) @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) @ stub RtlExtendHeap diff --git a/include/winternl.h b/include/winternl.h index b45a56c..955228a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2347,6 +2347,7 @@ NTSYSAPI BOOL WINAPI RtlEqualPrefixSid(PSID,PSID); NTSYSAPI BOOL WINAPI RtlEqualSid(PSID,PSID); NTSYSAPI BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserProcess(ULONG); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); NTSYSAPI NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionString(ULONG,const GUID*,ULONG,const UNICODE_STRING*,PVOID);

1 0

Thomas Faber : ieframe: Use SHANDLE_PTR in IWebBrowserApp::get_HWND.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 186d8553c10e21694b9dddfd93e82eb0639ffdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186d8553c10e21694b9dddfd9… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jul 14 12:30:38 2013 +0200 ieframe: Use SHANDLE_PTR in IWebBrowserApp::get_HWND. --- dlls/ieframe/ie.c | 2 +- dlls/ieframe/tests/webbrowser.c | 4 ++-- dlls/ieframe/webbrowser.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- include/exdisp.idl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 833cf03..454eb0f 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -355,7 +355,7 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) return E_NOTIMPL; } -static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); FIXME("(%p)->(%p)\n", This, pHWND); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1eb6119..217ff28 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2052,7 +2052,7 @@ static void test_ie_funcs(IWebBrowser2 *wb) IDispatch *disp; VARIANT_BOOL b; int i; - LONG hwnd; + SHANDLE_PTR hwnd; HRESULT hres; BSTR sName; @@ -2061,7 +2061,7 @@ static void test_ie_funcs(IWebBrowser2 *wb) hwnd = 0xdeadbeef; hres = IWebBrowser2_get_HWND(wb, &hwnd); ok(hres == E_FAIL, "get_HWND failed: %08x, expected E_FAIL\n", hres); - ok(hwnd == 0, "unexpected hwnd %x\n", hwnd); + ok(hwnd == 0, "unexpected hwnd %p\n", (PVOID)hwnd); /* MenuBar */ diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 02edfd7..55f757f 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -565,7 +565,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name) return S_OK; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { WebBrowser *This = impl_from_IWebBrowser2(iface); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 535f6cb..079b564 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4455,7 +4455,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name) return E_NOTIMPL; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { ok(0, "unexpected call\n"); return E_NOTIMPL; diff --git a/include/exdisp.idl b/include/exdisp.idl index 3e21701..3791acb 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -230,7 +230,7 @@ interface IWebBrowserApp : IWebBrowser [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); [id(0), propget] HRESULT Name([out, retval] BSTR* Name); - [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); + [id(DISPID_HWND), propget] HRESULT HWND([out, retval] SHANDLE_PTR *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); [id(401), propget] HRESULT Path([out, retval] BSTR* Path); [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool);

1 0

Nikolay Sivov : msxml3/tests: Fix test failures with IObjectWithSite.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 47159b6a66533f145ef49b94c560d3909742084e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47159b6a66533f145ef49b94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 08:16:21 2013 +0400 msxml3/tests: Fix test failures with IObjectWithSite. This fixes test failure on Win8 that apparently implements it same way as wine does. Refcount tests are removed, added corresponding broken condition. >From 77c26c7a1a7a0fc63a89f3515f748752b679c891 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri, 19 Jul 2013 08:16:21 +0400 Subject: [PATCH 26/26] Fix test failures with IObjectWithSite --- dlls/msxml3/tests/httpreq.c | 38 ++++---------------------------------- 1 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5c62772..0aaf7d4 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1687,58 +1687,28 @@ static void test_XMLHTTP(void) IDispatch_Release(event); /* interaction with object site */ - EXPECT_REF(xhr, 1); hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); -} hr = IObjectWithSite_SetSite(obj_site, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - IObjectWithSite_AddRef(obj_site); -todo_wine { - EXPECT_REF(obj_site, 2); - EXPECT_REF(xhr, 1); -} - IObjectWithSite_Release(obj_site); - hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectWithSite, (void**)&obj_site2); EXPECT_HR(hr, S_OK); -todo_wine { - EXPECT_REF(xhr, 1); - EXPECT_REF(obj_site, 1); - EXPECT_REF(obj_site2, 1); - ok(obj_site != obj_site2, "expected new instance\n"); -} - IObjectWithSite_Release(obj_site); + ok(obj_site == obj_site2 || broken(obj_site != obj_site2), "got new instance\n"); + IObjectWithSite_Release(obj_site2); set_xhr_site(xhr); /* try to set site another time */ - - /* to be removed once IObjectWithSite is properly separated */ SET_EXPECT(site_qi_IServiceProvider); SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - hr = IObjectWithSite_SetSite(obj_site2, &testsite); + hr = IObjectWithSite_SetSite(obj_site, &testsite); EXPECT_HR(hr, S_OK); - todo_wine EXPECT_REF(xhr, 1); + IObjectWithSite_Release(obj_site); IXMLHttpRequest_Release(xhr); - - /* still works after request is released */ - - /* to be removed once IObjectWithSite is properly separated */ - SET_EXPECT(site_qi_IServiceProvider); - SET_EXPECT(sp_queryservice_SID_SContainerDispatch_htmldoc2); - - hr = IObjectWithSite_SetSite(obj_site2, &testsite); - EXPECT_HR(hr, S_OK); - IObjectWithSite_Release(obj_site2); - free_bstrs(); }

1 0

Dmitry Timoshkov : ntdll: NtAllocateVirtualMemory should fail to commit if an address range is already committed for a memory mapped file .
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 3d759a0c69732721fab2881e484bf716c196dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d759a0c69732721fab2881e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 14:01:16 2013 +0900 ntdll: NtAllocateVirtualMemory should fail to commit if an address range is already committed for a memory mapped file. --- dlls/kernel32/tests/loader.c | 16 +++++++++------- dlls/kernel32/tests/virtual.c | 14 ++++++-------- dlls/ntdll/virtual.c | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ef1cde4..0018d67 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -396,12 +396,13 @@ static void test_Loader(void) SetLastError(0xdeadbeef); ptr = VirtualAlloc(hlib, si.dwPageSize, MEM_COMMIT, info.Protect); - /* FIXME: Remove once Wine is fixed */ - if (ptr) todo_wine ok(!ptr, "%d: VirtualAlloc should fail\n", i); - else ok(!ptr, "%d: VirtualAlloc should fail\n", i); + /* FIXME: Remove once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + info.RegionSize, &info, sizeof(info)); @@ -484,14 +485,15 @@ todo_wine SetLastError(0xdeadbeef); ptr = VirtualAlloc((char *)hlib + section.VirtualAddress, si.dwPageSize, MEM_COMMIT, info.Protect); - /* FIXME: Remove once Wine is fixed */ - if (ptr) todo_wine ok(!ptr, "%d: VirtualAlloc should fail\n", i); - else ok(!ptr, "%d: VirtualAlloc should fail\n", i); + /* FIXME: Remove once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - + else + ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, + "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e605242..99d3286 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1923,14 +1923,13 @@ static void test_CreateFileMapping_protection(void) SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); /* FIXME: remove once Wine is fixed */ if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); - else -todo_wine - ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); @@ -2427,14 +2426,13 @@ static void test_mapping(void) /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); /* FIXME: remove once Wine is fixed */ if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); - else -todo_wine - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); } UnmapViewOfFile(base); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 121071f..3ae1f48 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1974,6 +1974,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; + else if (view->mapping && (view->protect & VPROT_COMMITTED)) status = STATUS_ALREADY_COMMITTED; else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; else if (view->mapping && !(view->protect & VPROT_COMMITTED)) {

1 0

Jacek Caban : wininet: Ignore missing status text in response headers.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 10389b272d427114e613baee98ec9ed68c0e1ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10389b272d427114e613baee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 12:02:18 2013 +0200 wininet: Ignore missing status text in response headers. --- dlls/wininet/http.c | 14 +++++++++----- dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a0e4973..03fbf10 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -141,6 +141,8 @@ static const WCHAR szVia[] = { 'V','i','a',0 }; static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; +static const WCHAR emptyW[] = {0}; + #define HTTP_REFERER szReferer #define HTTP_ACCEPT szAccept #define HTTP_USERAGENT szUser_Agent @@ -3874,6 +3876,8 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, DWORD len; WCHAR* bufferW; + TRACE("%p %x\n", hHttpRequest, dwInfoLevel); + if((dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) || (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME)) { @@ -5857,9 +5861,8 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* split the status code from the status text */ status_text = strchrW( status_code, ' ' ); - if( !status_text ) - goto lend; - *status_text++=0; + if( status_text ) + *status_text++=0; request->status_code = atoiW(status_code); @@ -5891,11 +5894,12 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) heap_free(request->statusText); request->version = heap_strdupW(buffer); - request->statusText = heap_strdupW(status_text); + request->statusText = heap_strdupW(status_text ? status_text : emptyW); /* Restore the spaces */ *(status_code-1) = ' '; - *(status_text-1) = ' '; + if (status_text) + *(status_text-1) = ' '; /* Parse each response line */ do diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c3dd7dd..6022955 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3590,6 +3590,20 @@ static const http_status_test_t http_status_tests[] = { "\r\nx", 404, "Fail" + }, + { + "HTTP/1.1 200\r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, + { + "HTTP/1.1 410 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 410, + "" } };

1 0