wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Marcus Meissner : SLE is "SUSE Linux Enterprise"
by Jeremy Newman 01 Aug '11

01 Aug '11

Module: website Branch: master Commit: afae4fd561633ed43381f840a4abbcafc9c9f405 URL: http://source.winehq.org/git/website.git/?a=commit;h=afae4fd561633ed43381f8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 31 11:58:05 2011 +0200 SLE is "SUSE Linux Enterprise" --- templates/de/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index ebeca64..31fb089 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -94,7 +94,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.1, 11.2, 11.3, 11.4 sowie SLES 10 und SLE11 bereit. + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.1, 11.2, 11.3, 11.4 sowie SUSE Linux Enterprise 10 und 11 bereit. Alte Versionen sind auf <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> verfügbar. </td>

1 0

Marcus Meissner : WEBSITE: added openSUSE 11.4
by Jeremy Newman 01 Aug '11

01 Aug '11

Module: website Branch: master Commit: 05c09831746dc0265cfcc1f3da8ab78f164afc5c URL: http://source.winehq.org/git/website.git/?a=commit;h=05c09831746dc0265cfcc1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 31 09:20:38 2011 +0200 WEBSITE: added openSUSE 11.4 --- templates/de/download.template | 3 +-- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 2df89f6..ebeca64 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -94,8 +94,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.0, - 11.1, 11.2 sowie SLES 9, SLES 10 und SLE11 bereit. + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.1, 11.2, 11.3, 11.4 sowie SLES 10 und SLE11 bereit. Alte Versionen sind auf <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> verfügbar. </td> diff --git a/templates/en/download.template b/templates/en/download.template index 50b1a9e..449c63d 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -93,7 +93,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a> - - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3 and SUSE Linux Enterprise 10 and 11. + - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3, 11.4 and SUSE Linux Enterprise 10 and 11. Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> diff --git a/templates/fr/download.template b/templates/fr/download.template index b09418e..4b1eded 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -99,7 +99,7 @@ center;">Voyez la </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a> - .rpm binaires et sources et instantanés quotidiens pour openSUSE - 11.1, 11.2, 11.3 ainsi que SUSE Linux Enterprise 10 et 11. + 11.1, 11.2, 11.3, 11.4 ainsi que SUSE Linux Enterprise 10 et 11. Les anciens paquets sont disponibles sur <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a>. </td> diff --git a/templates/he/download.template b/templates/he/download.template index 05f0a4e..38db84a 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -93,7 +93,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">הורדת חבילות SUSE</a> - - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3 and SUSE Linux Enterprise 10 and 11. + - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3, 11.4 and SUSE Linux Enterprise 10 and 11. Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> diff --git a/templates/pl/download.template b/templates/pl/download.template index e2433ec..c8849c9 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -92,7 +92,7 @@ <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Pobierz paczki dla SUSE</a> - - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.1, 11.2, 11.3 i SUSE Linux Enterprise 10 i 11. + - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.1, 11.2, 11.3, 11.4 i SUSE Linux Enterprise 10 i 11. Stare wersje paczek dostępne na <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td>

1 0

Frédéric Delanoy : dlls: Assorted spelling fixes.
by Alexandre Julliard 01 Aug '11

01 Aug '11

1 0

Alexandre Julliard : configure: Don't reserve page zero on Mac OS, it won' t run DOS apps anyway.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 65d1760452901b7ccdcac46bfdc539a3844200ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d1760452901b7ccdcac46bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 17:03:07 2011 +0200 configure: Don't reserve page zero on Mac OS, it won't run DOS apps anyway. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 130b4b3..0fbfd51 100755 --- a/configure +++ b/configure @@ -6417,7 +6417,7 @@ fi APPLICATIONSERVICESLIB="-framework ApplicationServices" - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then diff --git a/configure.ac b/configure.ac index cb68b3b..8104f7f 100644 --- a/configure.ac +++ b/configure.ac @@ -697,7 +697,7 @@ case $host_os in AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found

1 0

Piotr Caban : shdocvw/tests: Added OleObject_Close tests.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 40b426b4666bf9168095f37d24ccdfd593a1265b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b426b4666bf9168095f37d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 1 12:28:49 2011 +0200 shdocvw/tests: Added OleObject_Close tests. --- dlls/shdocvw/tests/webbrowser.c | 89 +++++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 06d0ded..eeb0a49 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -135,6 +135,8 @@ DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(ShowUI); DEFINE_EXPECT(HideUI); +DEFINE_EXPECT(OnUIDeactivate); +DEFINE_EXPECT(OnInPlaceDeactivate); DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(ControlSite_TranslateAccelerator); DEFINE_EXPECT(OnFocus); @@ -147,7 +149,7 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, is_first_load, use_container_olecmd; +static BOOL is_downloading, is_first_load, use_container_olecmd, test_close; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; @@ -1106,8 +1108,13 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(UIWindow_SetActiveObject); - ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + if(!test_close) { + ok(pActiveObject != NULL, "pActiveObject = NULL\n"); + ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + } else { + ok(!pActiveObject, "pActiveObject != NULL\n"); + ok(!pszObjName, "pszObjName != NULL\n"); + } return S_OK; } @@ -1115,8 +1122,13 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { CHECK_EXPECT(Frame_SetActiveObject); - ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + if(!test_close) { + ok(pActiveObject != NULL, "pActiveObject = NULL\n"); + ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + } else { + ok(!pActiveObject, "pActiveObject != NULL\n"); + ok(!pszObjName, "pszObjName != NULL\n"); + } return S_OK; } @@ -1293,14 +1305,15 @@ static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSiteEx *iface, SIZE scrollEx static HRESULT WINAPI InPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOOL fUndoable) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(OnUIDeactivate); + ok(!fUndoable, "fUndoable should be FALSE\n"); + return S_OK; } static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(OnInPlaceDeactivate); + return S_OK; } static HRESULT WINAPI InPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface) @@ -2979,7 +2992,52 @@ static void test_dochost_qs(IUnknown *unk) IServiceProvider_Release(serv_prov); } -static void test_WebBrowser(BOOL do_download) +static void test_Close(IWebBrowser2 *wb, BOOL do_download) +{ + IOleObject *oo; + IOleClientSite *ocs; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void**)&oo); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + if(hres != S_OK) + return; + + test_close = TRUE; + + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(OnUIDeactivate); + SET_EXPECT(OnFocus); + SET_EXPECT(OnInPlaceDeactivate); + if(!do_download) { + SET_EXPECT(Invoke_COMMANDSTATECHANGE); + SET_EXPECT(Invoke_DOWNLOADCOMPLETE); + } + hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); + ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(OnUIDeactivate); + todo_wine CHECK_CALLED(OnFocus); + CHECK_CALLED(OnInPlaceDeactivate); + if(!do_download) { + todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); + todo_wine CHECK_CALLED(Invoke_DOWNLOADCOMPLETE); + } + + hres = IOleObject_GetClientSite(oo, &ocs); + ok(hres == S_OK, "hres = %x\n", hres); + ok(!ocs, "ocs != NULL\n"); + + hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); + ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); + + test_close = FALSE; + IOleObject_Release(oo); +} + +static void test_WebBrowser(BOOL do_download, BOOL do_close) { IUnknown *unk = NULL; ULONG ref; @@ -3035,7 +3093,10 @@ static void test_WebBrowser(BOOL do_download) test_dochost_qs(unk); } - test_ClientSite(unk, NULL, !do_download); + if(do_close) + test_Close(wb, do_download); + else + test_ClientSite(unk, NULL, !do_download); test_ie_funcs(unk); test_GetControlInfo(unk); test_wb_funcs(unk, FALSE); @@ -3103,9 +3164,11 @@ START_TEST(webbrowser) container_hwnd = create_container_window(); trace("Testing WebBrowser (no download)...\n"); - test_WebBrowser(FALSE); + test_WebBrowser(FALSE, FALSE); + test_WebBrowser(FALSE, TRUE); trace("Testing WebBrowser...\n"); - test_WebBrowser(TRUE); + test_WebBrowser(TRUE, FALSE); + test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); test_WebBrowser_NoContainerOlecmd(); }else {

1 0

Piotr Caban : ieframe: Added OleObject_Close implementation.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 1cf571eb5faa8960635cc34c86460bfeaa6171f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf571eb5faa8960635cc34c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 1 12:28:34 2011 +0200 ieframe: Added OleObject_Close implementation. --- dlls/ieframe/oleobject.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index d227bcc..3906f85 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -135,6 +135,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) if(hres != S_OK) { WARN("CanInPlaceActivate returned: %08x\n", hres); IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; return E_FAIL; } @@ -402,8 +403,26 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwSaveOption); + + if(dwSaveOption != OLECLOSE_NOSAVE) { + FIXME("unimplemnted flag: %x\n", dwSaveOption); + return E_NOTIMPL; + } + + if(This->doc_host.frame) + IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, NULL, NULL); + + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); + + if(This->inplace) { + IOleInPlaceSite_OnUIDeactivate(This->inplace, FALSE); + IOleInPlaceSite_OnInPlaceDeactivate(This->inplace); + } + + return IOleObject_SetClientSite(iface, NULL); } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker* pmk)

1 0

Frédéric Delanoy : cmd/tests: Add tests for variable delayed expansion.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 3c8674a721fd2f3437f021e1780056aa6f7a732c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8674a721fd2f3437f021e17… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 1 11:46:53 2011 +0200 cmd/tests: Add tests for variable delayed expansion. --- programs/cmd/tests/test_builtins.cmd | 40 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 04d8fdd..3f8c72e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -168,6 +168,46 @@ echo P%ERRORLEVEL% echo %ERRORLEVEL%S echo P%ERRORLEVEL%S +echo ------------ Testing variable delayed expansion -------------- +rem NT4 doesn't support this +echo ...default mode (load-time expansion) +set FOO=foo +echo %FOO% +echo !FOO! +if %FOO% == foo ( + set FOO=bar + if %FOO% == bar (echo bar) else echo foo +) + +set FOO=foo +if %FOO% == foo ( + set FOO=bar + if !FOO! == bar (echo bar) else echo foo +) + +echo ...runtime (delayed) expansion mode +setlocal EnableDelayedExpansion +set FOO=foo +echo %FOO% +echo !FOO! +if %FOO% == foo ( + set FOO=bar + if %FOO% == bar (echo bar) else echo foo +) + +set FOO=foo +if %FOO% == foo ( + set FOO=bar + if !FOO! == bar (echo bar) else echo foo +) +echo %ErrorLevel% +setlocal DisableDelayedExpansion +echo %ErrorLevel% +set FOO=foo +echo %FOO% +echo !FOO! +set FOO= + echo ------------ Testing conditional execution -------------- echo ...unconditional ^& call :setError 123 & echo foo1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d7ac58a..b754faf 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -146,6 +146,21 @@ ERRORLEVEL P0 0S P0S +------------ Testing variable delayed expansion -------------- +...default mode (load-time expansion) +foo +!FOO! +foo +foo +...runtime (delayed) expansion mode +foo +@todo_wine@foo@or_broken@!FOO! +foo +@todo_wine@bar@or_broken@foo +0 +0@or_broken@1 +foo +!FOO! ------------ Testing conditional execution -------------- @todo_wine@...unconditional & foo1

1 0

André Hentschel : c2man: We don' t have multiple dlls in one directory anymore.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: bb44fe5698f2e2d3dc49dc53c63e160415f78147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44fe5698f2e2d3dc49dc53c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 29 19:34:23 2011 +0200 c2man: We don't have multiple dlls in one directory anymore. --- tools/c2man.pl | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 9c67488..ce8a444 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1133,13 +1133,12 @@ sub output_spec($) $percent_documented = int($percent_documented); } - # Make a list of the contributors to this DLL. Do this only for the source - # files that make up the DLL, because some directories specify multiple dlls. + # Make a list of the contributors to this DLL. my @contributors; - for (@{$spec_details->{SOURCES}}) + foreach my $source_file (keys %source_files) { - my $source_details = $source_files{$_}[0]; + my $source_details = $source_files{$source_file}[0]; for (@{$source_details->{CONTRIBUTORS}}) { push (@contributors, $_);

1 0

André Hentschel : dbghelp: One line only for the copyright.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: e6390a5c7fded6bc3b7bda6a3ba490de112d527f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6390a5c7fded6bc3b7bda6a3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 29 19:33:09 2011 +0200 dbghelp: One line only for the copyright. --- dlls/dbghelp/crc32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/crc32.c b/dlls/dbghelp/crc32.c index f07bf42..e1f604e 100644 --- a/dlls/dbghelp/crc32.c +++ b/dlls/dbghelp/crc32.c @@ -26,9 +26,9 @@ #include "dbghelp_private.h" -/* Copyright (C) 1986 Gary S. Brown. Modified by Robert Shearman. You may use - the following calc_crc32 code or tables extracted from it, as desired without - restriction. */ +/* Copyright (C) 1986 Gary S. Brown + * Modified by Robert Shearman. You may use the following calc_crc32 code or + * tables extracted from it, as desired without restriction. */ /**********************************************************************\ |* Demonstration program to compute the 32-bit CRC used as the frame *|

1 0

Piotr Caban : msvcrt: Added vscwprintf_{l, p_l} functions implementation.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 0c14dc53302eb0bd661547525598ff782aaf09b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c14dc53302eb0bd661547525… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 1 16:08:06 2011 +0200 msvcrt: Added vscwprintf_{l,p_l} functions implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/wcs.c | 74 ++++++++++++++++++++++++++----------------- 5 files changed, 53 insertions(+), 37 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1a2fa4b..e25af8f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1246,9 +1246,9 @@ @ stub _vscprintf_p @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf -@ stub _vscwprintf_l +@ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l @ stub _vscwprintf_p -@ stub _vscwprintf_p_l +@ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_c_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1e14bfc..6eddfd7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1099,9 +1099,9 @@ @ stub _vscprintf_p @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf -@ stub _vscwprintf_l +@ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l @ stub _vscwprintf_p -@ stub _vscwprintf_p_l +@ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_c_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 02cb845..74d5cdc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1086,9 +1086,9 @@ @ stub _vscprintf_p @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf -@ stub _vscwprintf_l +@ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l @ stub _vscwprintf_p -@ stub _vscwprintf_p_l +@ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_c_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 289ea46..2186904 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1031,8 +1031,8 @@ # stub _vscprintf_l(str ptr ptr) # stub _vscprintf_p_l(str ptr ptr) @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf -# stub _vscwprintf_l(wstr ptr ptr) -# stub _vscwprintf_p_l(wstr ptr ptr) +@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l +@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dbcee85..d771d4f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -691,6 +691,35 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* + * _vswprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) +{ + static const MSVCRT_wchar_t nullbyte = '\0'; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_w puts_ctx = {length, buffer}; + int ret; + + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_w(args_ctx, format, args); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(ret == 0) + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, + arg_clbk_valist, NULL, &args); + else + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, + arg_clbk_positional, args_ctx, NULL); + + puts_clbk_str_w(&puts_ctx, 1, &nullbyte); + return ret; +} + +/********************************************************************* * _vsnwprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, @@ -860,6 +889,22 @@ int CDECL MSVCRT__vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) } /********************************************************************* + * _vscwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscwprintf_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) +{ + return MSVCRT_vsnwprintf_l( NULL, INT_MAX, format, locale, args ); +} + +/********************************************************************* + * _vscwprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) +{ + return MSVCRT_vswprintf_p_l( NULL, INT_MAX, format, locale, args ); +} + +/********************************************************************* * vswprintf_s (MSVCRT.@) */ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, @@ -933,35 +978,6 @@ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, } /********************************************************************* - * _vswprintf_p_l (MSVCRT.@) - */ -int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, - const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const MSVCRT_wchar_t nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_w puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_w(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, - arg_clbk_valist, NULL, &args); - else - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, TRUE, TRUE, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - return ret; -} - -/********************************************************************* * _swprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length,

1 0

← Newer
1
...
69
70
71
72
73
74
75
76
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011