January 2006 - Wine-commits

Mike McCormack : oleaut32: Output a FIXME message only once.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 98ed3fa5537c89ea5810e4f2734ae7a1e6d51f64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98ed3fa5537c89ea5810e4f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 6 12:16:58 2006 +0100 oleaut32: Output a FIXME message only once. --- dlls/oleaut32/typelib.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4ef590e..765b6ac 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4287,7 +4287,12 @@ static ULONG WINAPI ITypeInfo_fnRelease( it means that function is called by ITypeLib2_Release */ ITypeLib2_Release((ITypeLib2*)This->pTypeLib); } else { - FIXME("destroy child objects\n"); + static int once = 0; + if (!once) + { + once = 1; + FIXME("destroy child objects\n"); + } TRACE("destroying ITypeInfo(%p)\n",This); if (This->Name)

1 0

Robert Reif : dsound: Fix double free bug in tests.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: b2d604a9da32e14bae440253c31e6a7baf44a59c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2d604a9da32e14bae44025… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Jan 6 12:16:41 2006 +0100 dsound: Fix double free bug in tests. Fix double free in tests. Only happens in interactive mode when testing duplicated 3D buffers. --- dlls/dsound/tests/ds3d.c | 78 ++++++++++++++++++++------------------- dlls/dsound/tests/ds3d8.c | 76 +++++++++++++++++++------------------- dlls/dsound/tests/dsound.c | 8 ++-- dlls/dsound/tests/dsound8.c | 6 ++- dlls/dsound/tests/dsound_test.h | 4 +- 5 files changed, 86 insertions(+), 86 deletions(-)

1 0

Anssi Hannula : shell32: Spelling fixes for the Finnish resource.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 17f0fcc776e2a0308f9c750d0362c3e29d8d70c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17f0fcc776e2a0308f9c750… Author: Anssi Hannula <anssi.hannula(a)gmail.com> Date: Fri Jan 6 12:16:22 2006 +0100 shell32: Spelling fixes for the Finnish resource. --- dlls/shell32/shell32_Fi.rc | 62 ++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index 26987f2..b51e357 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -20,8 +20,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_BIGICON - MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Suuret kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pienet kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW END @@ -35,32 +35,32 @@ BEGIN BEGIN POPUP "&N�kym�" BEGIN - MENUITEM "&Pienet Kuvakkeet", FCIDM_SHVIEW_BIGICON - MENUITEM "&Suuret Kuvakkeet", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Pienet kuvakkeet", FCIDM_SHVIEW_BIGICON + MENUITEM "&Suuret kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "&J�rjest� Kuvakkeet" + POPUP "&J�rjest� kuvakkeet" BEGIN MENUITEM "&Nimen mukaan", 0x30 /* column 0 */ MENUITEM "&Tyypin mukaan", 0x32 /* column 2 */ MENUITEM "&Koon mukaan", 0x31 /* ... */ MENUITEM "&P�iv�m��r�n mukaan", 0x33 MENUITEM SEPARATOR - MENUITEM "J�rjest� &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "J�rjest� &automaattisesti", FCIDM_SHVIEW_AUTOARRANGE END MENUITEM "J�rjest� kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "P�ivit�", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Liit�", FCIDM_SHVIEW_INSERT - MENUITEM "Liit� Linkiksi", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Liit� linkiksi", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Uusi" BEGIN - MENUITEM "Uusi &Kansio", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Uusi &Linkki", FCIDM_SHVIEW_NEWLINK + MENUITEM "Uusi &kansio", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Uusi &linkki", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -81,9 +81,9 @@ BEGIN MENUITEM "&Leikkaa", FCIDM_SHVIEW_CUT MENUITEM "&Kopioi", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Lu&o Linkki", FCIDM_SHVIEW_CREATELINK + MENUITEM "Lu&o linkki", FCIDM_SHVIEW_CREATELINK MENUITEM "&Poista", FCIDM_SHVIEW_DELETE - MENUITEM "&Nime� Uudelleen", FCIDM_SHVIEW_RENAME + MENUITEM "&Nime� uudelleen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "&Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END @@ -91,7 +91,7 @@ END SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Valitse Kansio" +CAPTION "Valitse kansio" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -123,7 +123,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja Wine avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "Anna ohjelma, dokumentti, tai Internet -resurssi, ja Wine avaa sen Sinulle.", 12289, 36, 11, 182, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -148,11 +148,11 @@ STRINGTABLE DISCARDABLE /* special folders */ IDS_DESKTOP "Ty�p�yt�" - IDS_MYCOMPUTER "Oma Tietokone" + IDS_MYCOMPUTER "Oma tietokone" /* context menus */ - IDS_VIEW_LARGE "&Suuret Kuvakkeet" - IDS_VIEW_SMALL "&Pienet Kuvakkeet" + IDS_VIEW_LARGE "&Suuret kuvakkeet" + IDS_VIEW_SMALL "&Pienet kuvakkeet" IDS_VIEW_LIST "&Lista" IDS_VIEW_DETAILS "&Tiedot" IDS_SELECT "Valitse" @@ -165,40 +165,40 @@ STRINGTABLE DISCARDABLE IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota n�m� %1?" IDS_OVERWRITEFILE_TEXT "Ylikirjoita tiedosto %1?" - IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" + IDS_OVERWRITEFILE_CAPTION "Vahvista tiedoston ylikirjoitus" /* message box strings */ - IDS_RESTART_TITLE "K�ynnist� uudestaan" - IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenk�ynnist�mist�?" + IDS_RESTART_TITLE "K�ynnist� uudelleen" + IDS_RESTART_PROMPT "Haluatko simuloida Windowsin uudelleenk�ynnist�mist�?" IDS_SHUTDOWN_TITLE "Sammuta" - IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" + IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine-istunnon?" /* shell folder path default values */ - IDS_PROGRAMS "K�ynnist�\\Ohjelmat" + IDS_PROGRAMS "K�ynnist�-valikko\\Ohjelmat" IDS_PERSONAL "Omat tiedostot" IDS_FAVORITES "Suosikit" - IDS_STARTUP "K�ynnist�\\Ohjelmat\\K�ynnistys" + IDS_STARTUP "K�ynnist�-valikko\\Ohjelmat\\K�ynnistys" IDS_RECENT "�skett�in k�ytetyt" IDS_SENDTO "L�het�" - IDS_STARTMENU "K�ynnist�" + IDS_STARTMENU "K�ynnist�-valikko" IDS_MYMUSIC "Omat tiedostot\\Omat musiikkitiedostot" IDS_MYVIDEO "Omat tiedostot\\Omat videotiedostot" IDS_DESKTOPDIRECTORY "Ty�p�yt�" IDS_NETHOOD "Verkkoymp�rist�" IDS_TEMPLATES "Mallit" - IDS_APPDATA "Ohjelmien Tiedot" + IDS_APPDATA "Ohjelmien tiedot" IDS_PRINTHOOD "Tulostinymp�rist�" - IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" - IDS_INTERNET_CACHE "Paikalliset Asetukset\\V�liaikaiset Internet-tiedostot" + IDS_LOCAL_APPDATA "Paikalliset asetukset\\Ohjelmien tiedot" + IDS_INTERNET_CACHE "Paikalliset asetukset\\V�liaikaiset Internet-tiedostot" IDS_COOKIES "Ev�steet" - IDS_HISTORY "Paikalliset Asetukset\\Historia" - IDS_PROGRAM_FILES "Ohjelmat" + IDS_HISTORY "Paikalliset asetukset\\Historia" + IDS_PROGRAM_FILES "Ohjelmatiedostot" IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" - IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" + IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset tiedostot" IDS_COMMON_DOCUMENTS "Dokumentit" - IDS_ADMINTOOLS "K�ynnistys\\Ohjauspaneeli\\Administrative Tools" + IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Administrative Tools" IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" - IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" }

1 0

Ulrich Czekalla : ole: Fix SmallBlocksToBigBlocks loop.
by Alexandre Julliard 06 Jan '06

06 Jan '06

Module: wine Branch: refs/heads/master Commit: 427920f8a26d999077225941f8e09899fa459a6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=427920f8a26d99907722594… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Fri Jan 6 12:16:04 2006 +0100 ole: Fix SmallBlocksToBigBlocks loop. Stop copying data when read returns 0 bytes --- dlls/ole32/storage32.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c9d696e..cde6526 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3453,18 +3453,26 @@ BlockChainStream* Storage32Impl_SmallBlo DEF_SMALL_BLOCK_SIZE, buffer, &cbRead); - cbTotalRead += cbRead; + if (FAILED(successRead)) + break; + + if (cbRead > 0) + { + cbTotalRead += cbRead; - successWrite = BlockChainStream_WriteAt(bbTempChain, + successWrite = BlockChainStream_WriteAt(bbTempChain, offset, cbRead, buffer, &cbWritten); - cbTotalWritten += cbWritten; - offset.u.LowPart += This->smallBlockSize; + if (!successWrite) + break; - } while (SUCCEEDED(successRead) && successWrite); + cbTotalWritten += cbWritten; + offset.u.LowPart += This->smallBlockSize; + } + } while (cbRead > 0); HeapFree(GetProcessHeap(),0,buffer); assert(cbTotalRead == cbTotalWritten);

1 0

lostwages/ include/winehq.conf news/2006010501.xml
by WineHQ 06 Jan '06

06 Jan '06

ChangeSet ID: 22112 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/01/05 23:41:24 Modified files: include : winehq.conf Added files: news : 2006010501.xml Log message: News about wine-0.9.5 Patch: http://cvs.winehq.org/patch.py?id=22112 Old revision New revision Changes Path 1.28 1.29 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006010501.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.28 lostwages/include/winehq.conf:1.29 --- lostwages/include/winehq.conf:1.28 6 Jan 2006 5:41:24 -0000 +++ lostwages/include/winehq.conf 6 Jan 2006 5:41:24 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.4 +snapshot_date: 0.9.5 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006010501.xml diff -u -p /dev/null lostwages/news/2006010501.xml:1.1 --- /dev/null 6 Jan 2006 5:41:24 -0000 +++ lostwages/news/2006010501.xml 6 Jan 2006 5:41:24 -0000 @@ -0,0 +1,24 @@ +<news> + <date>January 5, 2006</date> + <title>Wine 0.9.5 Released</title> + <body> + +Wine 0.9.5 is out. + + +The following changes were noted in the announcement: +<ul> +<li>A number of MSI fixes.</li> +<li>More improvements to the IDL compiler.</li> + +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.5.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.109">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

Robert Shearman : Added implementation of security.dll.
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 3dea0973d262082ca03c88760d82df00debdd30f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dea0973d262082ca03c887… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 5 14:39:41 2006 +0100 Added implementation of security.dll. --- configure | 3 ++- configure.ac | 1 + dlls/Makefile.in | 6 ++++++ dlls/security/.gitignore | 1 + dlls/security/Makefile.in | 10 ++++++++++ dlls/security/security.spec | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 56 insertions(+), 1 deletions(-) create mode 100644 dlls/security/.gitignore create mode 100644 dlls/security/Makefile.in create mode 100644 dlls/security/security.spec

1 0

Jacek Caban : wininet: lpvStatusInfo in INTERNET_STATUS_NAME_RESOLVED,
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: ad02317248dc4ef621efa0e2f665c9406eacda04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad02317248dc4ef621efa0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 14:37:06 2006 +0100 wininet: lpvStatusInfo in INTERNET_STATUS_NAME_RESOLVED, INTERNET_STATUS_CONNECTING_TO_SERVER and INTERNET_STATUS_CONNECTED_TO_SERVER should be strings, not sockaddr_in. --- dlls/wininet/http.c | 25 +++++++++++++++++-------- dlls/wininet/utility.c | 9 ++++++++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aa0b83f..ee78f24 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -32,6 +32,9 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -985,6 +988,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; DWORD len; LPHTTPHEADERW Host; + char szaddr[32]; TRACE("-->\n"); @@ -1140,10 +1144,11 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L goto lend; } + inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, + szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, - &(lpwhs->socketAddress), - sizeof(struct sockaddr_in)); + szaddr, strlen(szaddr)+1); lend: if( lpwhr ) @@ -1932,6 +1937,7 @@ static BOOL HTTP_HandleRedirect(LPWININE LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent; LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; WCHAR path[2048]; + char szaddr[32]; if(lpszUrl[0]=='/') { @@ -2044,10 +2050,11 @@ static BOOL HTTP_HandleRedirect(LPWININE return FALSE; } + inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, + szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, - &(lpwhs->socketAddress), - sizeof(struct sockaddr_in)); + szaddr, strlen(szaddr)+1); NETCON_close(&lpwhr->netConnection); NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE); @@ -2407,6 +2414,7 @@ static BOOL HTTP_OpenConnection(LPWININE BOOL bSuccess = FALSE; LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC = NULL; + char szaddr[32]; TRACE("-->\n"); @@ -2420,10 +2428,12 @@ static BOOL HTTP_OpenConnection(LPWININE lpwhs = (LPWININETHTTPSESSIONW)lpwhr->hdr.lpwhparent; hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; + inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, + szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - &(lpwhs->socketAddress), - sizeof(struct sockaddr_in)); + szaddr, + strlen(szaddr)+1); if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, SOCK_STREAM, 0)) @@ -2456,8 +2466,7 @@ static BOOL HTTP_OpenConnection(LPWININE INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - &(lpwhs->socketAddress), - sizeof(struct sockaddr_in)); + szaddr, strlen(szaddr)+1); bSuccess = TRUE; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 490ea80..e6501b0 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -232,7 +232,14 @@ VOID INTERNET_SendCallback(LPWININETHAND } lpvNewInfo = lpvStatusInfo; - if(!(hdr->dwInternalFlags & INET_CALLBACKW)) { + if(hdr->dwInternalFlags & INET_CALLBACKW) { + switch(dwInternetStatus) { + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: + lpvNewInfo = WININET_strdup_AtoW(lpvStatusInfo); + } + }else { switch(dwInternetStatus) { case INTERNET_STATUS_RESOLVING_NAME:

1 0

Alexandre Julliard : msvcrt: Added some assembly glue for the asm bits of __CxxFrameHandler
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: abb170fac3c80c384147138dfb55324ec3ed92a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abb170fac3c80c384147138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 5 13:56:11 2006 +0100 msvcrt: Added some assembly glue for the asm bits of __CxxFrameHandler to avoid having to save/restore the whole context on every call. --- dlls/msvcrt/cppexcept.c | 74 +++++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.spec | 2 + 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 339bb7b..425a384 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -43,10 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ -static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, - PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, - cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ); +DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, + cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, + int nested_trylevel ); /* call a function with a given ebp */ inline static void *call_ebp_func( void *func, void *ebp ) @@ -76,6 +76,14 @@ inline static void call_dtor( void *func __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); } +/* continue execution to the specified address after exception is caught */ +inline static void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) +{ + __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" + : : "r" (frame), "a" (addr) ); + for (;;) ; /* unreached */ +} + static inline void dump_type( const cxx_type_info *type ) { TRACE( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", @@ -232,19 +240,19 @@ static DWORD catch_function_nested_handl TRACE( "got nested exception in catch function\n" ); return cxx_frame_handler( rec, nested_frame->cxx_frame, context, NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel, context ); + nested_frame->trylevel ); } } /* find and call the appropriate catch block for an exception */ /* returns the address to continue execution to after the catch block was called */ -inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, - cxx_function_descr *descr, int nested_trylevel, - cxx_exception_type *info ) +inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, + cxx_function_descr *descr, int nested_trylevel, + cxx_exception_type *info ) { UINT i; int j; - void *addr, *object = (void *)rec->ExceptionInformation[1]; + void *addr, *prev_frame, *object = (void *)rec->ExceptionInformation[1]; struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; thread_data_t *thread_data = msvcrt_get_thread_data(); @@ -303,10 +311,11 @@ inline static void *call_catch_block( PE if (info && info->destructor) call_dtor( info->destructor, object ); TRACE( "done, continuing at %p\n", addr ); - return addr; + prev_frame = NtCurrentTeb()->Tib.ExceptionList; + __wine_pop_frame( prev_frame ); + continue_after_catch( frame, addr ); } } - return NULL; } @@ -315,13 +324,12 @@ inline static void *call_catch_block( PE * * Implementation of __CxxFrameHandler. */ -static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, - PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, - cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ) +DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, + cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, + int nested_trylevel ) { cxx_exception_type *exc_type; - void *next_ip; if (descr->magic != CXX_FRAME_MAGIC) { @@ -342,7 +350,7 @@ static DWORD cxx_frame_handler( PEXCEPTI if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC && exc_type->custom_handler) { - return exc_type->custom_handler( rec, frame, exc_context, dispatch, + return exc_type->custom_handler( rec, frame, context, dispatch, descr, nested_trylevel, nested_frame, 0 ); } if (!exc_type) /* nested exception, fetch info from original exception */ @@ -365,29 +373,27 @@ static DWORD cxx_frame_handler( PEXCEPTI rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); } - next_ip = call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); - - if (!next_ip) return ExceptionContinueSearch; - rec->ExceptionFlags &= ~EH_NONCONTINUABLE; - context->Eip = (DWORD)next_ip; - context->Ebp = (DWORD)&frame->ebp; - context->Esp = ((DWORD*)frame)[-1]; - return ExceptionContinueExecution; + call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); + return ExceptionContinueSearch; } /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ -void WINAPI __regs___CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, - CONTEXT86 *context ) -{ - cxx_function_descr *descr = (cxx_function_descr *)context->Eax; - context->Eax = cxx_frame_handler( rec, (cxx_exception_frame *)frame, - exc_context, dispatch, descr, NULL, 0, context ); -} -DEFINE_REGS_ENTRYPOINT( __CxxFrameHandler, 16, 0 ); +extern DWORD __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); +__ASM_GLOBAL_FUNC( __CxxFrameHandler, + "pushl $0\n\t" /* nested_trylevel */ + "pushl $0\n\t" /* nested_frame */ + "pushl %eax\n\t" /* descr */ + "pushl 28(%esp)\n\t" /* dispatch */ + "pushl 28(%esp)\n\t" /* context */ + "pushl 28(%esp)\n\t" /* frame */ + "pushl 28(%esp)\n\t" /* rec */ + "call " __ASM_NAME("cxx_frame_handler") "\n\t" + "add $28,%esp\n\t" + "ret" ); #endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a4d3ade..8e4a994 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -75,7 +75,7 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ cdecl -i386 -register __CxxFrameHandler(ptr ptr ptr ptr) +@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ stub __CxxLongjmpUnwind #(ptr) stdcall @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast

1 0

Alexandre Julliard : msvcrt: Added assembly routines to save/restore registers for setjmp/longjmp
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: 545c4b7e7c002a04e289d57384b06a72a6738e05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=545c4b7e7c002a04e289d57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 5 14:36:37 2006 +0100 msvcrt: Added assembly routines to save/restore registers for setjmp/longjmp to avoid the overhead of a full-blown register function. Some tracing improvements. --- dlls/msvcrt/except.c | 80 ++++++++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.spec | 8 ++--- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b17a04f..d0ea060 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -42,7 +42,7 @@ #include "msvcrt/float.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +WINE_DEFAULT_DEBUG_CHANNEL(seh); /* VC++ extensions to Win32 SEH */ typedef struct _SCOPETABLE @@ -261,6 +261,33 @@ int _abnormal_termination(void) #define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */ typedef void (*MSVCRT_unwind_function)(const void*); +/* define an entrypoint for setjmp/setjmp3 that stores the registers in the jmp buf */ +/* and then jumps to the C backend function */ +#define DEFINE_SETJMP_ENTRYPOINT(name) \ + __ASM_GLOBAL_FUNC( name, \ + "movl 4(%esp),%ecx\n\t" /* jmp_buf */ \ + "movl %ebp,0(%ecx)\n\t" /* jmp_buf.Ebp */ \ + "movl %ebx,4(%ecx)\n\t" /* jmp_buf.Ebx */ \ + "movl %edi,8(%ecx)\n\t" /* jmp_buf.Edi */ \ + "movl %esi,12(%ecx)\n\t" /* jmp_buf.Esi */ \ + "movl %esp,16(%ecx)\n\t" /* jmp_buf.Esp */ \ + "movl 0(%esp),%eax\n\t" \ + "movl %eax,20(%ecx)\n\t" /* jmp_buf.Eip */ \ + "jmp " __ASM_NAME("__regs_") # name ) + +/* restore the registers from the jmp buf upon longjmp */ +extern void DECLSPEC_NORETURN longjmp_set_regs( struct MSVCRT___JUMP_BUFFER *jmp, int retval ); +__ASM_GLOBAL_FUNC( longjmp_set_regs, + "movl 4(%esp),%ecx\n\t" /* jmp_buf */ + "movl 8(%esp),%eax\n\t" /* retval */ + "movl 0(%ecx),%ebp\n\t" /* jmp_buf.Ebp */ + "movl 4(%ecx),%ebx\n\t" /* jmp_buf.Ebx */ + "movl 8(%ecx),%edi\n\t" /* jmp_buf.Edi */ + "movl 12(%ecx),%esi\n\t" /* jmp_buf.Esi */ + "movl 16(%ecx),%esp\n\t" /* jmp_buf.Esp */ + "addl $4,%esp\n\t" /* get rid of return address */ + "jmp *20(%ecx)\n\t" /* jmp_buf.Eip */ ); + /* * The signatures of the setjmp/longjmp functions do not match that * declared in the setjmp header so they don't follow the regular naming @@ -270,38 +297,26 @@ typedef void (*MSVCRT_unwind_function)(c /******************************************************************* * _setjmp (MSVCRT.@) */ -DEFINE_REGS_ENTRYPOINT( MSVCRT__setjmp, 4, 0 ); -void WINAPI __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp, CONTEXT86* context) +DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp); +int __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) { - TRACE("(%p)\n",jmp); - jmp->Ebp = context->Ebp; - jmp->Ebx = context->Ebx; - jmp->Edi = context->Edi; - jmp->Esi = context->Esi; - jmp->Esp = context->Esp; - jmp->Eip = context->Eip; jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; if (jmp->Registration == TRYLEVEL_END) jmp->TryLevel = TRYLEVEL_END; else jmp->TryLevel = ((MSVCRT_EXCEPTION_FRAME*)jmp->Registration)->trylevel; - TRACE("returning 0\n"); - context->Eax=0; + + TRACE("buf=%p ebx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx eip=%08lx frame=%08lx\n", + jmp, jmp->Ebx, jmp->Esi, jmp->Edi, jmp->Ebp, jmp->Esp, jmp->Eip, jmp->Registration ); + return 0; } /******************************************************************* * _setjmp3 (MSVCRT.@) */ -DEFINE_REGS_ENTRYPOINT( MSVCRT__setjmp3, 8, 0 ); -void WINAPI __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, CONTEXT86* context) +DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ); +int __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args) { - TRACE("(%p,%d)\n",jmp,nb_args); - jmp->Ebp = context->Ebp; - jmp->Ebx = context->Ebx; - jmp->Edi = context->Edi; - jmp->Esi = context->Esi; - jmp->Esp = context->Esp; - jmp->Eip = context->Eip; jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; @@ -311,7 +326,7 @@ void WINAPI __regs_MSVCRT__setjmp3(struc } else { - void **args = ((void**)context->Esp)+2; + void **args = ((void**)jmp->Esp)+2; if (nb_args > 0) jmp->UnwindFunc = (unsigned long)*args++; if (nb_args > 1) jmp->TryLevel = (unsigned long)*args++; @@ -322,19 +337,21 @@ void WINAPI __regs_MSVCRT__setjmp3(struc memcpy( jmp->UnwindData, args, min( size, sizeof(jmp->UnwindData) )); } } - TRACE("returning 0\n"); - context->Eax = 0; + + TRACE("buf=%p ebx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx eip=%08lx frame=%08lx\n", + jmp, jmp->Ebx, jmp->Esi, jmp->Edi, jmp->Ebp, jmp->Esp, jmp->Eip, jmp->Registration ); + return 0; } /********************************************************************* * longjmp (MSVCRT.@) */ -DEFINE_REGS_ENTRYPOINT( MSVCRT_longjmp, 8, 0 ); -void WINAPI __regs_MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval, CONTEXT86* context) +int MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) { unsigned long cur_frame = 0; - TRACE("(%p,%d)\n", jmp, retval); + TRACE("buf=%p ebx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx eip=%08lx frame=%08lx retval=%08x\n", + jmp, jmp->Ebx, jmp->Esi, jmp->Edi, jmp->Ebp, jmp->Esp, jmp->Eip, jmp->Registration, retval ); cur_frame=(unsigned long)NtCurrentTeb()->Tib.ExceptionList; TRACE("cur_frame=%lx\n",cur_frame); @@ -360,14 +377,7 @@ void WINAPI __regs_MSVCRT_longjmp(struct if (!retval) retval = 1; - TRACE("Jump to %lx returning %d\n",jmp->Eip,retval); - context->Ebp = jmp->Ebp; - context->Ebx = jmp->Ebx; - context->Edi = jmp->Edi; - context->Esi = jmp->Esi; - context->Esp = jmp->Esp; - context->Eip = jmp->Eip; - context->Eax = retval; + longjmp_set_regs( jmp, retval ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8e4a994..69aa578 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -322,7 +322,7 @@ @ cdecl _lock(long) @ cdecl _locking(long long long) @ cdecl _logb( double ) -@ cdecl -i386 -register _longjmpex(ptr long) MSVCRT_longjmp +@ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) @@ -426,8 +426,8 @@ @ cdecl _set_error_mode(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) -@ cdecl -i386 -register _setjmp(ptr) MSVCRT__setjmp -@ cdecl -i386 -register _setjmp3(ptr long) MSVCRT__setjmp3 +@ cdecl -i386 -norelay _setjmp(ptr) MSVCRT__setjmp +@ cdecl -i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 @ stub _setmaxstdio #(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) @@ -659,7 +659,7 @@ @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) @ cdecl log10(double) -@ cdecl -i386 -register longjmp(ptr long) MSVCRT_longjmp +@ cdecl -i386 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @ cdecl mbstowcs(ptr str long) ntdll.mbstowcs

1 0

Jacek Caban : urlmon: Added implementation of QueryService and stub implementation
by Alexandre Julliard 05 Jan '06

05 Jan '06

Module: wine Branch: refs/heads/master Commit: b235d7953c4569931087f67e651a3983a1a6ad85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b235d7953c4569931087f67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 13:42:43 2006 +0100 urlmon: Added implementation of QueryService and stub implementation of IHttpNegotiate2 interface. --- dlls/urlmon/binding.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 46ced83..4cb41a5 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -58,6 +58,77 @@ typedef struct { #define BINDINF(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) +static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { + TRACE("(IID_IHttpNegotiate %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IHttpNegotiate2, riid)) { + TRACE("(IID_IHttpNegotiate2 %p)\n", ppv); + *ppv = iface; + } + + if(*ppv) { + IHttpNegotiate2_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate2 *iface) +{ + URLMON_LockModule(); + return 2; +} + +static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate2 *iface) +{ + URLMON_UnlockModule(); + return 1; +} + +static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, + LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) +{ + FIXME("(%s %s %ld %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + pszAdditionalHeaders); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, + LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, + LPWSTR *pszAdditionalRequestHeaders) +{ + FIXME("(%ld %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders), + debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, + BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) +{ + FIXME("(%p %p %ld)\n", pbSecurityId, pcbSecurityId, dwReserved); + return E_NOTIMPL; +} + +static const IHttpNegotiate2Vtbl HttpNegotiate2Vtbl = { + HttpNegotiate_QueryInterface, + HttpNegotiate_AddRef, + HttpNegotiate_Release, + HttpNegotiate_BeginningTransaction, + HttpNegotiate_OnResponse, + HttpNegotiate_GetRootSecurityId +}; + +static IHttpNegotiate2 HttpNegotiate = { &HttpNegotiate2Vtbl }; #define BINDING_THIS(iface) DEFINE_THIS(Binding, Binding, iface) @@ -425,7 +496,22 @@ static HRESULT WINAPI ServiceProvider_Qu REFGUID guidService, REFIID riid, void **ppv) { Binding *This = SERVPROV_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + HRESULT hres; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(This->service_provider) { + hres = IServiceProvider_QueryService(This->service_provider, guidService, + riid, ppv); + if(SUCCEEDED(hres)) + return hres; + } + + if(IsEqualGUID(&IID_IHttpNegotiate, guidService) + || IsEqualGUID(&IID_IHttpNegotiate2, guidService)) + return IHttpNegotiate2_QueryInterface(&HttpNegotiate, riid, ppv); + + WARN("unknown service %s\n", debugstr_guid(guidService)); return E_NOTIMPL; }

1 0