November 2006 - Wine-commits

Alexandre Julliard : kernel32: Reimplemented SetFilePointerEx on top of ntdll functions.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 2cb4361c06669803d4ec057cc96c306b254be230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb4361c06669803d4ec057cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 16:12:57 2006 +0100 kernel32: Reimplemented SetFilePointerEx on top of ntdll functions. --- dlls/kernel32/file.c | 65 ++++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 8f8890d..d0b28d0 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -47,7 +47,6 @@ #include "excpt.h" #include "wine/unicode.h" #include "wine/debug.h" #include "thread.h" -#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(file); @@ -940,44 +939,48 @@ DWORD WINAPI SetFilePointer( HANDLE hFil BOOL WINAPI SetFilePointerEx( HANDLE hFile, LARGE_INTEGER distance, LARGE_INTEGER *newpos, DWORD method ) { - static const int whence[3] = { SEEK_SET, SEEK_CUR, SEEK_END }; - BOOL ret = FALSE; - NTSTATUS status; - int fd; - - TRACE("handle %p offset %s newpos %p origin %d\n", - hFile, wine_dbgstr_longlong(distance.QuadPart), newpos, method ); + LONGLONG pos; + IO_STATUS_BLOCK io; + FILE_POSITION_INFORMATION info; - if (method > FILE_END) + switch(method) { + case FILE_BEGIN: + pos = distance.QuadPart; + break; + case FILE_CURRENT: + if (NtQueryInformationFile( hFile, &io, &info, sizeof(info), FilePositionInformation )) + goto error; + pos = info.CurrentByteOffset.QuadPart + distance.QuadPart; + break; + case FILE_END: + { + FILE_END_OF_FILE_INFORMATION eof; + if (NtQueryInformationFile( hFile, &io, &eof, sizeof(eof), FileEndOfFileInformation )) + goto error; + pos = eof.EndOfFile.QuadPart + distance.QuadPart; + } + break; + default: SetLastError( ERROR_INVALID_PARAMETER ); - return ret; + return FALSE; } - if (!(status = wine_server_handle_to_fd( hFile, 0, &fd, NULL ))) + if (pos < 0) { - off_t pos, res; - - pos = distance.QuadPart; - if ((res = lseek( fd, pos, whence[method] )) == (off_t)-1) - { - /* also check EPERM due to SuSE7 2.2.16 lseek() EPERM kernel bug */ - if (((errno == EINVAL) || (errno == EPERM)) && (method != FILE_BEGIN) && (pos < 0)) - SetLastError( ERROR_NEGATIVE_SEEK ); - else - FILE_SetDosError(); - } - else - { - ret = TRUE; - if( newpos ) - newpos->QuadPart = res; - } - wine_server_release_fd( hFile, fd ); + SetLastError( ERROR_NEGATIVE_SEEK ); + return FALSE; } - else SetLastError( RtlNtStatusToDosError(status) ); - return ret; + info.CurrentByteOffset.QuadPart = pos; + if (NtSetInformationFile( hFile, &io, &info, sizeof(info), FilePositionInformation )) + goto error; + if (newpos) newpos->QuadPart = pos; + return TRUE; + +error: + SetLastError( RtlNtStatusToDosError(io.u.Status) ); + return FALSE; } /***********************************************************************

1 0

Alexandre Julliard : kernel32: Moved PeekNamedPipe implementation to ntdll.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 313d93e491f72d8dbbe71a0581c0cbe98a44f944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=313d93e491f72d8dbbe71a058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 16:24:36 2006 +0100 kernel32: Moved PeekNamedPipe implementation to ntdll. --- dlls/kernel32/sync.c | 92 ++++++++++---------------------------------------- dlls/ntdll/file.c | 74 ++++++++++++++++++++++++++++++++++++++++ include/winioctl.h | 8 ++++ 3 files changed, 100 insertions(+), 74 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8b90abb..eaa0f70 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -26,18 +26,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #include <errno.h> -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #include <stdarg.h> #include <stdio.h> @@ -54,7 +42,6 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" -#include "wine/server.h" #include "wine/unicode.h" #include "wine/winbase16.h" #include "kernel_private.h" @@ -1194,75 +1181,32 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR BOOL WINAPI PeekNamedPipe( HANDLE hPipe, LPVOID lpvBuffer, DWORD cbBuffer, LPDWORD lpcbRead, LPDWORD lpcbAvail, LPDWORD lpcbMessage ) { -#ifdef FIONREAD - int avail=0, fd, ret, flags; - - TRACE("(%p,%p,%u,%p,%p,%p)\n", hPipe, lpvBuffer, cbBuffer, lpcbRead, lpcbAvail, lpcbMessage); + FILE_PIPE_PEEK_BUFFER local_buffer; + FILE_PIPE_PEEK_BUFFER *buffer = &local_buffer; + IO_STATUS_BLOCK io; + NTSTATUS status; - ret = wine_server_handle_to_fd( hPipe, FILE_READ_DATA, &fd, &flags ); - if (ret) + if (cbBuffer && !(buffer = HeapAlloc( GetProcessHeap(), 0, + FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data[cbBuffer] )))) { - SetLastError( RtlNtStatusToDosError(ret) ); - return FALSE; - } - if (flags & FD_FLAG_RECV_SHUTDOWN) - { - wine_server_release_fd( hPipe, fd ); - SetLastError ( ERROR_PIPE_NOT_CONNECTED ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - if (ioctl(fd,FIONREAD, &avail ) != 0) - { - TRACE("FIONREAD failed reason: %s\n",strerror(errno)); - wine_server_release_fd( hPipe, fd ); - return FALSE; - } - if (!avail) /* check for closed pipe */ + status = NtFsControlFile( hPipe, 0, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, + buffer, FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data[cbBuffer] ) ); + if (!status) { - struct pollfd pollfd; - pollfd.fd = fd; - pollfd.events = POLLIN; - pollfd.revents = 0; - switch (poll( &pollfd, 1, 0 )) - { - case 0: - break; - case 1: /* got something */ - if (!(pollfd.revents & (POLLHUP | POLLERR))) break; - TRACE("POLLHUP | POLLERR\n"); - /* fall through */ - case -1: - wine_server_release_fd( hPipe, fd ); - SetLastError(ERROR_BROKEN_PIPE); - return FALSE; - } + ULONG read_size = io.Information - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); + if (lpcbAvail) *lpcbAvail = buffer->ReadDataAvailable; + if (lpcbRead) *lpcbRead = read_size; + if (lpcbMessage) *lpcbMessage = 0; /* FIXME */ + if (lpvBuffer) memcpy( lpvBuffer, buffer->Data, read_size ); } - TRACE(" 0x%08x bytes available\n", avail ); - ret = TRUE; - if (lpcbAvail) - *lpcbAvail = avail; - if (lpcbRead) - *lpcbRead = 0; - if (avail && lpvBuffer && cbBuffer) - { - int readbytes = (avail < cbBuffer) ? avail : cbBuffer; - readbytes = recv(fd, lpvBuffer, readbytes, MSG_PEEK); - if (readbytes < 0) - { - WARN("failed to peek socket (%d)\n", errno); - ret = FALSE; - } - else if (lpcbRead) - *lpcbRead = readbytes; - } - wine_server_release_fd( hPipe, fd ); - return ret; -#endif /* defined(FIONREAD) */ + else SetLastError( RtlNtStatusToDosError(status) ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("function not implemented\n"); - return FALSE; + if (buffer != &local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + return !status; } /*********************************************************************** diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 18a0e09..a2157d3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -42,6 +42,15 @@ #endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +#include <sys/poll.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_UTIME_H # include <utime.h> #endif @@ -1014,6 +1023,71 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE h } break; + case FSCTL_PIPE_PEEK: + { + FILE_PIPE_PEEK_BUFFER *buffer = out_buffer; + int avail = 0, fd, flags; + + if (out_size < FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data )) + { + io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if ((io->u.Status = wine_server_handle_to_fd( handle, FILE_READ_DATA, &fd, &flags ))) + break; + + if (flags & FD_FLAG_RECV_SHUTDOWN) + { + wine_server_release_fd( handle, fd ); + io->u.Status = STATUS_PIPE_DISCONNECTED; + break; + } + +#ifdef FIONREAD + if (ioctl( fd, FIONREAD, &avail ) != 0) + { + TRACE("FIONREAD failed reason: %s\n",strerror(errno)); + wine_server_release_fd( handle, fd ); + io->u.Status = FILE_GetNtStatus(); + break; + } +#endif + if (!avail) /* check for closed pipe */ + { + struct pollfd pollfd; + int ret; + + pollfd.fd = fd; + pollfd.events = POLLIN; + pollfd.revents = 0; + ret = poll( &pollfd, 1, 0 ); + if (ret == -1 || (ret == 1 && (pollfd.revents & (POLLHUP|POLLERR)))) + { + wine_server_release_fd( handle, fd ); + io->u.Status = STATUS_PIPE_BROKEN; + break; + } + } + buffer->NamedPipeState = 0; /* FIXME */ + buffer->ReadDataAvailable = avail; + buffer->NumberOfMessages = 0; /* FIXME */ + buffer->MessageLength = 0; /* FIXME */ + io->Information = FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); + io->u.Status = STATUS_SUCCESS; + if (avail) + { + ULONG data_size = out_size - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); + if (data_size) + { + int res = recv( fd, buffer->Data, data_size, MSG_PEEK ); + if (res >= 0) io->Information += res; + } + } + wine_server_release_fd( handle, fd ); + } + break; + case FSCTL_PIPE_DISCONNECT: SERVER_START_REQ(disconnect_named_pipe) { diff --git a/include/winioctl.h b/include/winioctl.h index 161d8b7..a54c5a5 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -411,6 +411,14 @@ typedef struct _FILE_PIPE_WAIT_FOR_BUFFE WCHAR Name[1]; } FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; +typedef struct _FILE_PIPE_PEEK_BUFFER { + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + /* Device GUIDs */ #ifdef DEFINE_GUID

1 0

James Hawkins : advpack: Use the full path of the INF file as the source directory if the CAB file is invalid .
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: a27ae7929566f42ee3dd420af7f284b57510d98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ae7929566f42ee3dd420af… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 1 11:52:58 2006 -0800 advpack: Use the full path of the INF file as the source directory if the CAB file is invalid. --- dlls/advpack/install.c | 16 ++++++++++------ dlls/advpack/tests/install.c | 3 +-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index b86c70a..0c12d9d 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -833,7 +833,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND LPWSTR cmdline_copy, cmdline_ptr; LPWSTR flags, ptr; CABINFOW cabinfo; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_w(cmdline), show); @@ -853,22 +853,26 @@ HRESULT WINAPI LaunchINFSectionExW(HWND if (flags) cabinfo.dwFlags = atolW(flags); + if (!is_full_path(cabinfo.pszCab) && !is_full_path(cabinfo.pszInf)) + { + HeapFree(GetProcessHeap(), 0, cmdline_copy); + return E_INVALIDARG; + } + /* get the source path from the cab filename */ if (cabinfo.pszCab && *cabinfo.pszCab) { if (!is_full_path(cabinfo.pszCab)) - goto done; + lstrcpyW(cabinfo.szSrcPath, cabinfo.pszInf); + else + lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); - lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); ptr = strrchrW(cabinfo.szSrcPath, '\\'); *(++ptr) = '\0'; } hr = ExecuteCabW(hWnd, &cabinfo, NULL); - -done: HeapFree(GetProcessHeap(), 0, cmdline_copy); - return SUCCEEDED(hr) ? ADV_SUCCESS : ADV_FAILURE; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 96c09a3..bc987dd 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -243,8 +243,7 @@ static void test_LaunchINFSectionEx() /* try an invalid CAB filename with a relative INF name */ lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); - todo_wine - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); DeleteFileA("test.inf"); }

1 0

Mike McCormack : imagelist: Move Nx1 assumptions about bitmaps dimensions into a single function.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 83a66a981f6c8f46072c466266a54f4e265bdf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a66a981f6c8f46072c46626… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 1 15:45:11 2006 +0900 imagelist: Move Nx1 assumptions about bitmaps dimensions into a single function. --- dlls/comctl32/imagelist.c | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index eac188e..ae24e06 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -22,14 +22,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTE - * + * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Sep. 12, 2002, by Dimitrie O. Paun. - * + * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * + * * TODO: * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE, ILS_ALPHA @@ -90,6 +90,12 @@ static inline void imagelist_point_from_ pt->y = 0; } +static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, UINT cy, SIZE *sz ) +{ + sz->cx = count * himl->cx; + sz->cy = cy; +} + /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] * @@ -111,6 +117,7 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; INT nNewWidth, nNewCount; + SIZE sz; if ((himl->cCurImage + nImageCount <= himl->cMaxImage) && (himl->cy >= cy)) @@ -128,10 +135,12 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy); - if(himl->cCurImage) + imagelist_get_bitmap_size(himl, nNewCount, cy, &sz); + + if (himl->cCurImage) { hbmNull = SelectObject (hdcBitmap, hbmNewBitmap); - BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy, + BitBlt (hdcBitmap, 0, 0, sz.cx, sz.cy, himl->hdcImage, 0, 0, SRCCOPY); SelectObject (hdcBitmap, hbmNull); } @@ -149,7 +158,7 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL if(himl->cCurImage) { hbmNull = SelectObject (hdcBitmap, hbmNewBitmap); - BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy, + BitBlt (hdcBitmap, 0, 0, sz.cx, sz.cy, himl->hdcMask, 0, 0, SRCCOPY); SelectObject (hdcBitmap, hbmNull); } @@ -617,9 +626,10 @@ ImageList_Create (INT cx, INT cy, UINT f himl->hbmImage = 0; if ((himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) { - himl->hbmMask = - CreateBitmap (himl->cx * himl->cMaxImage, himl->cy, - 1, 1, NULL); + SIZE sz; + + imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cy, &sz); + himl->hbmMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (himl->hbmMask == 0) { ERR("Error creating mask bitmap!\n"); goto cleanup; @@ -1275,11 +1285,14 @@ ImageList_Duplicate (HIMAGELIST himlSrc) if (himlDst) { - BitBlt (himlDst->hdcImage, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy, + SIZE sz; + + imagelist_get_bitmap_size(himlSrc, himlSrc->cCurImage, himlSrc->cy, &sz); + BitBlt (himlDst->hdcImage, 0, 0, sz.cx, sz.cy, himlSrc->hdcImage, 0, 0, SRCCOPY); if (himlDst->hbmMask) - BitBlt (himlDst->hdcMask, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy, + BitBlt (himlDst->hdcMask, 0, 0, sz.cx, sz.cy, himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; @@ -2079,8 +2092,10 @@ ImageList_Remove (HIMAGELIST himl, INT i himl->hbmImage = hbmNewImage; if (himl->hbmMask) { - hbmNewMask = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy, - 1, 1, NULL); + SIZE sz; + + imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cy, &sz); + hbmNewMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); SelectObject (himl->hdcMask, hbmNewMask); DeleteObject (himl->hbmMask); himl->hbmMask = hbmNewMask;

1 0

Mike McCormack : msi: Fix a typo.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 14dda0f74fe0072ea1c04fa9ad47e9768e59514b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14dda0f74fe0072ea1c04fa9a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 1 15:09:33 2006 +0900 msi: Fix a typo. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 385d2db..2282f08 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2065,7 +2065,7 @@ UINT msi_table_apply_transform( MSIDATAB goto end; /* - * Apply _Tables and _Coluimns transforms first so that + * Apply _Tables and _Columns transforms first so that * the table metadata is correct, and empty tables exist. */ ret = msi_table_load_transform( db, stg, strings, szTables );

1 0

Mike McCormack : msi: Search the patch package for source cabinet files.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 9a4ba8c11496d6ba82d8adee305975abe7e3d22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4ba8c11496d6ba82d8adee3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 1 15:09:23 2006 +0900 msi: Search the patch package for source cabinet files. --- dlls/msi/action.c | 7 +++++++ dlls/msi/msipriv.h | 1 + dlls/msi/table.c | 19 +++++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c349a94..a6cb5c2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -526,6 +526,13 @@ static UINT msi_apply_patch_package( MSI } msi_parse_patch_summary( package, patch_db ); + + /* + * There might be a CAB file in the patch package, + * so append it to the list of storage to search for streams. + */ + append_storage_to_db( package->db, patch_db->storage ); + msiobj_release( &patch_db->hdr ); return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 45bdeac..fa0c225 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -563,6 +563,7 @@ extern UINT read_raw_stream_data( MSIDAT extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ); extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ); +extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9b2d357..385d2db 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2101,14 +2101,7 @@ UINT msi_table_apply_transform( MSIDATAB } if ( ret == ERROR_SUCCESS ) - { - MSITRANSFORM *t; - - t = msi_alloc( sizeof *t ); - t->stg = stg; - IStorage_AddRef( stg ); - list_add_tail( &db->transforms, &t->entry ); - } + append_storage_to_db( db, stg ); end: if ( stgenum ) @@ -2119,6 +2112,16 @@ end: return ret; } +void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) +{ + MSITRANSFORM *t; + + t = msi_alloc( sizeof *t ); + t->stg = stg; + IStorage_AddRef( stg ); + list_add_tail( &db->transforms, &t->entry ); +} + void msi_free_transforms( MSIDATABASE *db ) { while( !list_empty( &db->transforms ) )

1 0

Mike McCormack : msi: Don't print traces for addref and release.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 3f2cedd41fed8469bcf217794a4c12dab8e3a850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2cedd41fed8469bcf217794… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 1 15:09:02 2006 +0900 msi: Don't print traces for addref and release. --- dlls/msi/handle.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 0193277..6af3c41 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -128,7 +128,7 @@ void *msihandle2msiinfo(MSIHANDLE handle goto out; ret = msihandletable[handle].obj; msiobj_addref( ret ); - + out: LeaveCriticalSection( &MSI_handle_cs ); @@ -153,8 +153,6 @@ void *alloc_msiobject(UINT type, UINT si void msiobj_addref( MSIOBJECTHDR *info ) { - TRACE("%p\n", info); - if( !info ) return; @@ -181,8 +179,6 @@ int msiobj_release( MSIOBJECTHDR *info ) { int ret; - TRACE("%p\n",info); - if( !info ) return -1;

1 0

Alexandre Julliard : ntdll: Simplify wine_server_handle_to_fd.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 226a14a48308f2a2a78104b8503404bba3f10522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=226a14a48308f2a2a78104b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 13:27:18 2006 +0100 ntdll: Simplify wine_server_handle_to_fd. Now that we have a critical section, races are no longer possible. --- dlls/ntdll/server.c | 105 +++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a128930..7df8e02 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -493,76 +493,67 @@ int wine_server_handle_to_fd( obj_handle RtlEnterCriticalSection( &fd_cache_section ); *unix_fd = -1; - for (;;) + + SERVER_START_REQ( get_handle_fd ) { - SERVER_START_REQ( get_handle_fd ) + req->handle = handle; + req->access = access; + if (!(ret = wine_server_call( req ))) { - req->handle = handle; - req->access = access; - if (!(ret = wine_server_call( req ))) - { - fd = reply->fd; - removable = reply->removable; - if (flags) *flags = reply->flags; - } + fd = reply->fd; + removable = reply->removable; + if (flags) *flags = reply->flags; } - SERVER_END_REQ; - if (ret) break; + } + SERVER_END_REQ; + if (ret) goto done; - if (fd != -1) - { - if ((fd = dup(fd)) == -1) ret = FILE_GetNtStatus(); - break; - } + if (fd != -1) + { + if ((fd = dup(fd)) == -1) ret = FILE_GetNtStatus(); + goto done; + } - /* it wasn't in the cache, get it from the server */ - fd = receive_fd( &fd_handle ); - if (fd == -1) - { - ret = STATUS_TOO_MANY_OPENED_FILES; - break; - } - if (fd_handle != handle) removable = -1; + /* it wasn't in the cache, get it from the server */ + fd = receive_fd( &fd_handle ); + if (fd == -1) + { + ret = STATUS_TOO_MANY_OPENED_FILES; + goto done; + } + assert( fd_handle == handle ); - if (removable == -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) - removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; - } - else if (removable) break; /* don't cache it */ + if (removable == -1) + { + FILE_FS_DEVICE_INFORMATION info; + if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) + removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; + } + else if (removable) goto done; /* don't cache it */ - /* and store it back into the cache */ - SERVER_START_REQ( set_handle_fd ) + /* and store it back into the cache */ + SERVER_START_REQ( set_handle_fd ) + { + req->handle = fd_handle; + req->fd = fd; + req->removable = removable; + if (!(ret = wine_server_call( req ))) { - req->handle = fd_handle; - req->fd = fd; - req->removable = removable; - if (!(ret = wine_server_call( req ))) + if (reply->cur_fd != -1) /* it has been cached */ { - if (reply->cur_fd != -1) /* it has been cached */ - { - if (reply->cur_fd != fd) close( fd ); /* someone was here before us */ - if ((fd = dup(reply->cur_fd)) == -1) ret = FILE_GetNtStatus(); - } - } - else - { - close( fd ); - fd = -1; + if (reply->cur_fd != fd) close( fd ); /* someone was here before us */ + if ((fd = dup(reply->cur_fd)) == -1) ret = FILE_GetNtStatus(); } } - SERVER_END_REQ; - if (ret) break; - - if (fd_handle == handle) break; - /* if we received a different handle this means there was - * a race with another thread; we restart everything from - * scratch in this case. - */ - close( fd ); + else + { + close( fd ); + fd = -1; + } } + SERVER_END_REQ; +done: RtlLeaveCriticalSection( &fd_cache_section ); if (!ret) *unix_fd = fd; return ret;

1 0

Alexandre Julliard : server: Compute the removable device flag on the server side.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 30b878b3b6101e6da413263306e5158af52ac2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b878b3b6101e6da41326330… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 13:28:05 2006 +0100 server: Compute the removable device flag on the server side. --- dlls/ntdll/server.c | 9 +---- include/wine/server_protocol.h | 3 +- server/fd.c | 70 ++++++++++++++++++++++++++++++++++----- server/protocol.def | 1 - server/trace.c | 3 +- 5 files changed, 64 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 7df8e02..272a441 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -523,20 +523,13 @@ int wine_server_handle_to_fd( obj_handle } assert( fd_handle == handle ); - if (removable == -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) - removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; - } - else if (removable) goto done; /* don't cache it */ + if (removable) goto done; /* don't cache it */ /* and store it back into the cache */ SERVER_START_REQ( set_handle_fd ) { req->handle = fd_handle; req->fd = fd; - req->removable = removable; if (!(ret = wine_server_call( req ))) { if (reply->cur_fd != -1) /* it has been cached */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 894d5f3..a707d8f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -861,7 +861,6 @@ struct set_handle_fd_request struct request_header __header; obj_handle_t handle; int fd; - int removable; }; struct set_handle_fd_reply { @@ -4426,6 +4425,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 255 +#define SERVER_PROTOCOL_VERSION 256 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index e422eea..0334723 100644 --- a/server/fd.c +++ b/server/fd.c @@ -37,6 +37,21 @@ #endif #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif +#ifdef HAVE_LINUX_MAJOR_H +#include <linux/major.h> +#endif +#ifdef HAVE_SYS_STATVFS_H +#include <sys/statvfs.h> +#endif +#ifdef HAVE_SYS_VFS_H +#include <sys/vfs.h> +#endif +#ifdef HAVE_SYS_MOUNT_H +#include <sys/mount.h> +#endif +#ifdef HAVE_SYS_STATFS_H +#include <sys/statfs.h> +#endif #ifdef HAVE_SYS_EVENT_H #include <sys/event.h> #undef LIST_INIT @@ -722,8 +737,47 @@ void main_loop(void) static struct list device_hash[DEVICE_HASH_SIZE]; +static int is_device_removable( dev_t dev, int unix_fd ) +{ +#if defined(linux) && defined(HAVE_FSTATFS) + struct statfs stfs; + + /* check for floppy disk */ + if (major(dev) == FLOPPY_MAJOR) return 1; + + if (fstatfs( unix_fd, &stfs ) == -1) return 0; + return (stfs.f_type == 0x9660 || /* iso9660 */ + stfs.f_type == 0x9fa1 || /* supermount */ + stfs.f_type == 0x15013346); /* udf */ +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) + struct statfs stfs; + + if (fstatfs( unix_fd, &stfs ) == -1) return 0; + return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); +#elif defined(__NetBSD__) + struct statvfs stfs; + + if (fstatvfs( unix_fd, &stfs ) == -1) return 0; + return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); +#elif defined(sun) +# include <sys/dkio.h> +# include <sys/vtoc.h> + struct dk_cinfo dkinf; + if (ioctl( unix_fd, DKIOCINFO, &dkinf ) == -1) return 0; + return (dkinf.dki_ctype == DKC_CDROM || + dkinf.dki_ctype == DKC_NCRFLOPPY || + dkinf.dki_ctype == DKC_SMSFLOPPY || + dkinf.dki_ctype == DKC_INTEL82072 || + dkinf.dki_ctype == DKC_INTEL82077); +#else + return 0; +#endif +} + /* retrieve the device object for a given fd, creating it if needed */ -static struct device *get_device( dev_t dev, int create ) +static struct device *get_device( dev_t dev, int unix_fd ) { struct device *device; unsigned int i, hash = dev % DEVICE_HASH_SIZE; @@ -737,11 +791,11 @@ static struct device *get_device( dev_t /* not found, create it */ - if (!create) return NULL; + if (unix_fd == -1) return NULL; if ((device = alloc_object( &device_ops ))) { device->dev = dev; - device->removable = -1; + device->removable = is_device_removable( dev, unix_fd ); for (i = 0; i < INODE_HASH_SIZE; i++) list_init( &device->inode_hash[i] ); list_add_head( &device_hash[hash], &device->entry ); } @@ -834,13 +888,13 @@ static void inode_destroy( struct object } /* retrieve the inode object for a given fd, creating it if needed */ -static struct inode *get_inode( dev_t dev, ino_t ino ) +static struct inode *get_inode( dev_t dev, ino_t ino, int unix_fd ) { struct device *device; struct inode *inode; unsigned int hash = ino % INODE_HASH_SIZE; - if (!(device = get_device( dev, 1 ))) return NULL; + if (!(device = get_device( dev, unix_fd ))) return NULL; LIST_FOR_EACH_ENTRY( inode, &device->inode_hash[hash], struct inode, entry ) { @@ -1508,7 +1562,7 @@ struct fd *open_fd( const char *name, in /* only bother with an inode for normal files and directories */ if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) { - struct inode *inode = get_inode( st.st_dev, st.st_ino ); + struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd ); if (!inode) { @@ -1808,7 +1862,7 @@ static void unmount_device( struct fd *d return; } - if (!(device = get_device( st.st_rdev, 0 ))) return; + if (!(device = get_device( st.st_rdev, -1 ))) return; for (i = 0; i < INODE_HASH_SIZE; i++) { @@ -1917,8 +1971,6 @@ DECL_HANDLER(set_handle_fd) { struct device *device = fd->inode ? fd->inode->device : NULL; - if (device && device->removable == -1) device->removable = req->removable; - /* only cache the fd on non-removable devices */ if (!device || !device->removable) reply->cur_fd = set_handle_unix_fd( current->process, req->handle, req->fd ); diff --git a/server/protocol.def b/server/protocol.def index 3acf366..49c4c30 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -677,7 +677,6 @@ #define FD_FLAG_AVAILABLE 0x10 @REQ(set_handle_fd) obj_handle_t handle; /* handle we are interested in */ int fd; /* file descriptor */ - int removable; /* is device removable? (-1 if unknown) */ @REPLY int cur_fd; /* current file descriptor */ @END diff --git a/server/trace.c b/server/trace.c index be268d1..a16310f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1116,8 +1116,7 @@ static void dump_get_handle_fd_reply( co static void dump_set_handle_fd_request( const struct set_handle_fd_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); - fprintf( stderr, " fd=%d,", req->fd ); - fprintf( stderr, " removable=%d", req->removable ); + fprintf( stderr, " fd=%d", req->fd ); } static void dump_set_handle_fd_reply( const struct set_handle_fd_reply *req )

1 0

Andrew Talbot : kernel32: Cast-qual warnings fix.
by Alexandre Julliard 01 Nov '06

01 Nov '06

Module: wine Branch: master Commit: 8125231e497b88647ba1e67b7e92fbab855f538a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8125231e497b88647ba1e67b7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Oct 31 22:09:36 2006 +0000 kernel32: Cast-qual warnings fix. --- dlls/kernel32/ne_segment.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 2ada891..b4f6e7c 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -421,8 +421,8 @@ BOOL NE_LoadSegment( NE_MODULE *pModule, if (buff == NULL) return FALSE; while(curr < buff + size) { - unsigned int rept = ((short*)curr)[0]; - unsigned int len = ((short*)curr)[1]; + unsigned int rept = ((const short *)curr)[0]; + unsigned int len = ((const short *)curr)[1]; curr += 2*sizeof(short); while (rept--)

1 0