July 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Support for arbitrary memory allocation granularity.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 8f47bd0306f969e9a34796f531541eedadaeac36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f47bd0306f969e9a34796f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 20:36:41 2006 +0200 ntdll: Support for arbitrary memory allocation granularity. --- dlls/ntdll/virtual.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5e7a15d..e00acfb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -129,7 +129,6 @@ static UINT_PTR page_mask; # define ADDRESS_SPACE_LIMIT 0 /* no limit needed on other platforms */ # define USER_SPACE_LIMIT 0 /* no limit needed on other platforms */ #endif /* __i386__ */ -static const UINT_PTR granularity_mask = 0xffff; /* Allocation granularity (usually 64k) */ #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -238,6 +237,17 @@ static struct file_view *VIRTUAL_FindVie /*********************************************************************** + * get_mask + */ +static inline UINT_PTR get_mask( ULONG zero_bits ) +{ + if (!zero_bits) return 0xffff; /* allocations are aligned to 64K by default */ + if (zero_bits < page_shift) zero_bits = page_shift; + return (1 << zero_bits) - 1; +} + + +/*********************************************************************** * find_view_range * * Find the first view overlapping at least part of the specified range. @@ -574,7 +584,8 @@ static inline void *unmap_extra_space( v * Create a view and mmap the corresponding memory area. * The csVirtual section must be held by caller. */ -static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, BYTE vprot ) +static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t mask, + BYTE vprot ) { void *ptr; NTSTATUS status; @@ -615,7 +626,7 @@ static NTSTATUS map_view( struct file_vi } else { - size_t view_size = size + granularity_mask + 1; + size_t view_size = size + mask + 1; for (;;) { @@ -628,7 +639,7 @@ static NTSTATUS map_view( struct file_vi if (is_beyond_limit( ptr, view_size, user_space_limit )) add_reserved_area( ptr, view_size ); else break; } - ptr = unmap_extra_space( ptr, view_size, size, granularity_mask ); + ptr = unmap_extra_space( ptr, view_size, size, mask ); } status = create_view( view_ret, ptr, size, vprot ); @@ -831,7 +842,7 @@ static int do_relocations( char *base, c * * Map an executable (PE format) image into memory. */ -static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, +static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, SIZE_T header_size, int shared_fd, BOOL removable, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; @@ -850,11 +861,11 @@ static NTSTATUS map_image( HANDLE hmappi RtlEnterCriticalSection( &csVirtual ); if (base >= (char *)0x110000) /* make sure the DOS area remains free */ - status = map_view( &view, base, total_size, + status = map_view( &view, base, total_size, mask, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status == STATUS_CONFLICTING_ADDRESSES) - status = map_view( &view, NULL, total_size, + status = map_view( &view, NULL, total_size, mask, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status != STATUS_SUCCESS) goto error; @@ -1258,6 +1269,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( void *base; BYTE vprot; SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; struct file_view *view; @@ -1278,13 +1290,13 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (*ret) { if (type & MEM_RESERVE) /* Round down to 64k boundary */ - base = ROUND_ADDR( *ret, granularity_mask ); + base = ROUND_ADDR( *ret, mask ); else base = ROUND_ADDR( *ret, page_mask ); size = (((UINT_PTR)*ret + size + page_mask) & ~page_mask) - (UINT_PTR)base; /* disallow low 64k, wrap-around and kernel space */ - if (((char *)base <= (char *)granularity_mask) || + if (((char *)base < (char *)0x10000) || ((char *)base + size < (char *)base) || is_beyond_limit( base, size, ADDRESS_SPACE_LIMIT )) return STATUS_INVALID_PARAMETER; @@ -1301,9 +1313,6 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( type &= ~MEM_TOP_DOWN; } - if (zero_bits) - WARN("zero_bits %lu ignored\n", zero_bits); - /* Compute the alloc type flags */ if (!(type & MEM_SYSTEM)) @@ -1333,7 +1342,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( } else if ((type & MEM_RESERVE) || !base) { - status = map_view( &view, base, size, vprot ); + status = map_view( &view, base, size, mask, vprot ); if (status == STATUS_SUCCESS) { view->flags |= VFLAG_VALLOC; @@ -1722,6 +1731,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND FILE_FS_DEVICE_INFORMATION device_info; NTSTATUS res; SIZE_T size = 0; + SIZE_T mask = get_mask( zero_bits ); int unix_handle = -1; int prot; void *base; @@ -1744,8 +1754,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND /* Check parameters */ - if ((offset.u.LowPart & granularity_mask) || - (*addr_ptr && ((UINT_PTR)*addr_ptr & granularity_mask))) + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( get_mapping_info ) @@ -1776,14 +1785,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND if ((res = wine_server_handle_to_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, NULL ))) goto done; - res = map_image( handle, unix_handle, base, size_low, header_size, + res = map_image( handle, unix_handle, base, size_low, mask, header_size, shared_fd, removable, addr_ptr ); wine_server_release_fd( shared_file, shared_fd ); NtClose( shared_file ); } else { - res = map_image( handle, unix_handle, base, size_low, header_size, + res = map_image( handle, unix_handle, base, size_low, mask, header_size, -1, removable, addr_ptr ); } wine_server_release_fd( handle, unix_handle ); @@ -1840,7 +1849,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND RtlEnterCriticalSection( &csVirtual ); - res = map_view( &view, *addr_ptr, size, prot ); + res = map_view( &view, *addr_ptr, size, mask, prot ); if (res) { RtlLeaveCriticalSection( &csVirtual );

1 0

Jonathan Ernst : notepad: Fix the ellipsis and shortcuts in menus.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: 9e697bff1d8057759573490061a9d2dab2c64da5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e697bff1d8057759573490… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Jul 12 13:32:47 2006 +0200 notepad: Fix the ellipsis and shortcuts in menus. --- programs/notepad/Bg.rc | 4 ++-- programs/notepad/Cs.rc | 6 +++--- programs/notepad/Da.rc | 8 ++++---- programs/notepad/De.rc | 2 +- programs/notepad/Eo.rc | 4 ++-- programs/notepad/Es.rc | 6 +++--- programs/notepad/Fi.rc | 8 ++++---- programs/notepad/Fr.rc | 6 +++--- programs/notepad/Hu.rc | 8 ++++---- programs/notepad/It.rc | 4 ++-- programs/notepad/Ja.rc | 6 +++--- programs/notepad/Ko.rc | 4 ++-- programs/notepad/Nl.rc | 8 ++++---- programs/notepad/No.rc | 4 ++-- programs/notepad/Pl.rc | 4 ++-- programs/notepad/Pt.rc | 8 ++++---- programs/notepad/Ru.rc | 8 ++++---- programs/notepad/Si.rc | 8 ++++---- programs/notepad/Sk.rc | 8 ++++---- programs/notepad/Sw.rc | 8 ++++---- programs/notepad/Th.rc | 4 ++-- programs/notepad/Tr.rc | 4 ++-- programs/notepad/Wa.rc | 8 ++++---- programs/notepad/Zh.rc | 8 ++++---- 24 files changed, 73 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9e697bff1d805775957…

1 0

Jonathan Ernst : wordpad: Add shortcuts in menus.
by Alexandre Julliard July 14, 2006

July 14, 2006

Module: wine Branch: refs/heads/master Commit: ad4516fc471bc79c73087bc1ba5a80de13667be0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad4516fc471bc79c73087bc… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Jul 12 14:08:47 2006 +0200 wordpad: Add shortcuts in menus. --- programs/wordpad/De.rc | 6 +++--- programs/wordpad/En.rc | 8 ++++---- programs/wordpad/Fr.rc | 6 +++--- programs/wordpad/Hu.rc | 6 +++--- programs/wordpad/Ko.rc | 6 +++--- programs/wordpad/Nl.rc | 6 +++--- programs/wordpad/No.rc | 6 +++--- programs/wordpad/Ru.rc | 6 +++--- programs/wordpad/Tr.rc | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index eaf0dbe..be8e607 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu", ID_FILE_NEW - MENUITEM "&�ffnen", ID_FILE_OPEN - MENUITEM "&Speichern", ID_FILE_SAVE + MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW + MENUITEM "&�ffnen\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&Beenden", ID_FILE_EXIT END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 7bbe6ac..e99d140 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -22,11 +22,11 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&New", ID_FILE_NEW - MENUITEM "&Open", ID_FILE_OPEN - MENUITEM "&Save", ID_FILE_SAVE + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR - MENUITEM "&Exit", ID_FILE_EXIT + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&Edit" BEGIN diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 75ba08b..6c2573b 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Nouveau", ID_FILE_NEW - MENUITEM "&Ouvrir", ID_FILE_OPEN - MENUITEM "&Sauver", ID_FILE_SAVE + MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ouvrir\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Sauver\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&Quitter", ID_FILE_EXIT END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index e4b1e5a..0326448 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&F�jl" BEGIN - MENUITEM "&�j", ID_FILE_NEW - MENUITEM "&Megnyit�s", ID_FILE_OPEN - MENUITEM "M&ent�s", ID_FILE_SAVE + MENUITEM "&�j\tCtrl+N", ID_FILE_NEW + MENUITEM "&Megnyit�s\tCtrl+O", ID_FILE_OPEN + MENUITEM "M&ent�s\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&Kil�p�s", ID_FILE_EXIT END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 4773aa4..8c507f2 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -23,9 +23,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "��(&F)" BEGIN - MENUITEM "�� (&N)", ID_FILE_NEW - MENUITEM "��(&O)", ID_FILE_OPEN - MENUITEM "��(&S)", ID_FILE_SAVE + MENUITEM "�� (&N)\tCtrl+N", ID_FILE_NEW + MENUITEM "��(&O)\tCtrl+O", ID_FILE_OPEN + MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "��(&E)", ID_FILE_EXIT END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index efe2161..9a7321b 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Nieuw" ID_FILE_NEW - MENUITEM "&Openen", ID_FILE_OPEN - MENUITEM "O&pslaan", ID_FILE_SAVE + MENUITEM "&Nieuw\tCtrl+N" ID_FILE_NEW + MENUITEM "&Openen\tCtrl+O", ID_FILE_OPEN + MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&Afsluiten", ID_FILE_EXIT END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 8945e2e..d9dd3cd 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Ny", ID_FILE_NEW - MENUITEM "&�pne", ID_FILE_OPEN - MENUITEM "&Lagre", ID_FILE_SAVE + MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW + MENUITEM "&�pne\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 4c56eac..fd24593 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -22,9 +22,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&��" BEGIN - MENUITEM "��&��", ID_FILE_NEW - MENUITEM "&��", ID_FILE_OPEN - MENUITEM "&��", ID_FILE_SAVE + MENUITEM "��&��\tCtrl+N", ID_FILE_NEW + MENUITEM "&��\tCtrl+O", ID_FILE_OPEN + MENUITEM "&��\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "�&��", ID_FILE_EXIT END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 20a288b..d47e86e 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -24,9 +24,9 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Dosya" BEGIN - MENUITEM "&Yeni", ID_FILE_NEW - MENUITEM "&A�", ID_FILE_OPEN - MENUITEM "&Kaydet", ID_FILE_SAVE + MENUITEM "&Yeni\tCtrl+N", ID_FILE_NEW + MENUITEM "&A�\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM SEPARATOR MENUITEM "&��k", ID_FILE_EXIT END

1 0

appdb/include testData.php
by WineHQ July 14, 2006

July 14, 2006

ChangeSet ID: 26517 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/13 20:48:46 Modified files: include : testData.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Show additional comments when viewing test data in application version Patch: http://cvs.winehq.org/patch.py?id=26517 Old revision New revision Changes Path 1.3 1.4 +2 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.3 appdb/include/testData.php:1.4 --- appdb/include/testData.php:1.3 14 Jul 2006 1:48:46 -0000 +++ appdb/include/testData.php 14 Jul 2006 1:48:46 -0000 @@ -356,6 +356,8 @@ class testData{ echo $this->sWhatDoesnt; echo 'What was not tested ',"\n"; echo $this->sWhatNotTested; + echo 'Additional Comments ',"\n"; + echo $this->sComments; } // Show the Test results for a application version

1 0

appdb/include testData.php
by WineHQ July 14, 2006

July 14, 2006

ChangeSet ID: 26516 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/13 20:32:04 Modified files: include : testData.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Include link to app and version when displaying a list of test results Patch: http://cvs.winehq.org/patch.py?id=26516 Old revision New revision Changes Path 1.2 1.3 +2 -2 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.2 appdb/include/testData.php:1.3 --- appdb/include/testData.php:1.2 14 Jul 2006 1:32: 4 -0000 +++ appdb/include/testData.php 14 Jul 2006 1:32: 4 -0000 @@ -654,8 +654,8 @@ class testData{ echo $oSubmitter->sRealname; echo $oSubmitter->sEmail ? "</a>":""; echo " </td>\n"; - echo " <td>".$oApp->sName."</td>\n"; - echo " <td>".$oVersion->sName."</td>\n"; + echo ' <td><a href="'.BASE.'appview.php?iAppId='.$oApp->iAppId.'">'.$oApp->sName.'</a></td>'; + echo ' <td><a href="'.BASE.'appview.php?iVersionId='.$oVersion->iVersionId.'&iTestingId='.$oTest->iTestingId.'">'.$oVersion->sName.'</a></td>'; echo " <td>".$oTest->sTestedRelease."</td>\n"; echo " <td>".$oTest->sTestedRating."</td>\n"; echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sSub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n";

1 0

appdb/include application.php bugs.php distrib ...
by WineHQ July 13, 2006

July 13, 2006

ChangeSet ID: 26515 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/13 13:54:10 Modified files: include : application.php bugs.php distributions.php note.php screenshot.php testData.php url.php user.php version.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Fix missing reply text by renaming replyText to sReplyText Patch: http://cvs.winehq.org/patch.py?id=26515 Old revision New revision Changes Path 1.67 1.68 +11 -11 appdb/include/application.php 1.14 1.15 +2 -2 appdb/include/bugs.php 1.13 1.14 +11 -11 appdb/include/distributions.php 1.15 1.16 +3 -3 appdb/include/note.php 1.46 1.47 +2 -2 appdb/include/screenshot.php 1.1 1.2 +9 -9 appdb/include/testData.php 1.8 1.9 +2 -2 appdb/include/url.php 1.76 1.77 +2 -2 appdb/include/user.php 1.76 1.77 +11 -11 appdb/include/version.php

1 0

Mikołaj Zalewski : comdlg32: Update Polish translation .
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: d569060860e468635f04ac2124f631d448dd3add URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d569060860e468635f04ac2… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 13 15:31:49 2006 +0200 comdlg32: Update Polish translation. --- dlls/comdlg32/cdlg_Pl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Pl.rc b/dlls/comdlg32/cdlg_Pl.rc index a04f56c..bfafc69 100644 --- a/dlls/comdlg32/cdlg_Pl.rc +++ b/dlls/comdlg32/cdlg_Pl.rc @@ -402,9 +402,9 @@ STRINGTABLE DISCARDABLE PD32_OUT_OF_MEMORY "Za ma�o pami�ci dla tej operacji." PD32_GENERIC_ERROR "Podczas tej operacji wyst�pi� b��d." PD32_DRIVER_UNKNOWN "Nieznany sterownik drukarki." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Zanim b�dzie mo�na wykonywa� czynno�ci zwi�zane \ +z drukowaniem takie jak ustawienie strony lub wydruk dokumentu nale�y zainstalowa� drukark�. \ +Po zainstalowaniu spr�buj ponownie." PD32_DEFAULT_PRINTER "Domy�lna Drukarka; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "W kolejce znajduj� si� %d dokumenty"

1 0

Robert Shearman : ole32: Don' t loop while peeking messages in CoWaitForMultipleHandles.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 11c1bcf6def5f7fe8e5588c71a28fb237fe9af9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11c1bcf6def5f7fe8e5588c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:07:13 2006 +0100 ole32: Don't loop while peeking messages in CoWaitForMultipleHandles. It increases the latency on completing the COM call and could result in the COM call never completing in some circumstances. --- dlls/ole32/compobj.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a25d9ec..4efa235 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2875,7 +2875,12 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (COM_PeekMessage(apt, &msg)) + + /* note: using "if" here instead of "while" might seem less + * efficient, but only if we are optimising for quick delivery + * of pending messages, rather than quick completion of the + * COM call */ + if (COM_PeekMessage(apt, &msg)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); @@ -2887,7 +2892,6 @@ HRESULT WINAPI CoWaitForMultipleHandles( PostQuitMessage(msg.wParam); /* no longer need to process messages */ message_loop = FALSE; - break; } } continue;

1 0

Robert Shearman : include: Add NI_* defines and add a WS(socklen_t) type.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 264503d40daa297eac2948b1a392ba4b86215d00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=264503d40daa297eac2948b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:06:30 2006 +0100 include: Add NI_* defines and add a WS(socklen_t) type. --- dlls/ws2_32/socket.c | 2 +- include/ws2tcpip.h | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8887ae8..4c17f21 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3238,7 +3238,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename return EAI_FAIL; } -int WINAPI WS_getnameinfo(const SOCKADDR *sa, socklen_t salen, PCHAR host, +int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { #if HAVE_GETNAMEINFO diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index dcdcd4e..8d3c837 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -53,6 +53,8 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; +typedef int WS(socklen_t); + typedef ADDRINFOA ADDRINFO, *LPADDRINFO; /* @@ -202,6 +204,21 @@ # define WS_EAI_SERVICE WSATYPE_NOT_FOUN # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT #endif +/* Possible Windows flags for getnameinfo() */ +#ifndef USE_WS_PREFIX +# define NI_NOFQDN 0x01 +# define NI_NUMERICHOST 0x02 +# define NI_NAMEREQD 0x04 +# define NI_NUMERICSERV 0x08 +# define NI_DGRAM 0x10 +#else +# define WS_NI_NOFQDN 0x01 +# define WS_NI_NUMERICHOST 0x02 +# define WS_NI_NAMEREQD 0x04 +# define WS_NI_NUMERICSERV 0x08 +# define WS_NI_DGRAM 0x10 +#endif + #ifdef __cplusplus extern "C" { @@ -215,9 +232,9 @@ int WINAPI WS(getaddrinfo)(const char*, #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI WS(getnameinfo)(const SOCKADDR*,socklen_t,PCHAR,DWORD,PCHAR,DWORD,INT); +int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWORD,INT); #define GetNameInfoA WS(getnameinfo) -INT WINAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); +INT WINAPI GetNameInfoW(const SOCKADDR*,WS(socklen_t),PWCHAR,DWORD,PWCHAR,DWORD,INT); #define GetNameInfo WINELIB_NAME_AW(GetNameInfo) /*

1 0

Robert Shearman : oleaut32: Convert void return types to the VT_EMPTY variant type in ITypeInfo:: Invoke.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: f9c9a2bf3d97bfecc1f3ab8edf4ccb3f5e5d3133 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9c9a2bf3d97bfecc1f3ab8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:07:36 2006 +0100 oleaut32: Convert void return types to the VT_EMPTY variant type in ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ccb5829..d539cd6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5363,9 +5363,16 @@ static HRESULT WINAPI ITypeInfo_fnInvoke goto func_fail; /* FIXME: we don't free changed types here */ } - V_VT(&varresult) = 0; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, &func_desc->elemdescFunc.tdesc, &V_VT(&varresult)); - if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ + /* VT_VOID is a special case for return types, so it is not + * handled in the general function */ + if (func_desc->elemdescFunc.tdesc.vt == VT_VOID) + V_VT(&varresult) = VT_EMPTY; + else + { + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, &func_desc->elemdescFunc.tdesc, &V_VT(&varresult)); + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ + } hres = DispCallFunc(pIUnk, func_desc->oVft, func_desc->callconv, V_VT(&varresult), func_desc->cParams, rgvt,

1 0