January 2013 - Wine-Commits

Nikolay Sivov : comctl32: Use NM_RCLICK return value to allow default processing.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: ac4192e7699de937bc68ccbaa115338771855092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4192e7699de937bc68ccbaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 01:22:07 2013 +0400 comctl32: Use NM_RCLICK return value to allow default processing. --- dlls/comctl32/listview.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd09ffb..c16a619 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -884,11 +884,13 @@ static inline LRESULT notify_listview(const LISTVIEW_INFO *infoPtr, INT code, LP return notify_hdr(infoPtr, code, (LPNMHDR)plvnm); } +/* Handles NM_DBLCLK, NM_CLICK, NM_RDBLCLK, NM_RCLICK. Only NM_RCLICK return value is used. */ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTESTINFO *lvht) { NMITEMACTIVATE nmia; LVITEMW item; HWND hwnd = infoPtr->hwndSelf; + LRESULT ret; TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); ZeroMemory(&nmia, sizeof(nmia)); @@ -899,8 +901,8 @@ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTEST item.iItem = lvht->iItem; item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmia.lParam = item.lParam; - notify_hdr(infoPtr, code, (LPNMHDR)&nmia); - return IsWindow(hwnd); + ret = notify_hdr(infoPtr, code, (NMHDR*)&nmia); + return IsWindow(hwnd) && (code == NM_RCLICK ? !ret : TRUE); } static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem)

1 0

Ludger Sprenker : windowscodecs: Implement ComponentFactory:: CreateEncoderPropertyBag.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: d4b1db7141070f0db63e6a7703334a32c5c7aa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b1db7141070f0db63e6a770… Author: Ludger Sprenker <Ludger(a)Sprenker.net> Date: Tue Jan 29 19:50:36 2013 +0100 windowscodecs: Implement ComponentFactory::CreateEncoderPropertyBag. --- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/icnsformat.c | 2 +- dlls/windowscodecs/imgfactory.c | 4 ++-- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/propertybag.c | 4 +++- dlls/windowscodecs/tests/propertybag.c | 2 -- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 3 ++- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 27922e7..9bd2340 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -538,7 +538,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) return hr; encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index c777581..254f81f 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -663,7 +663,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, goto end; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) goto end; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 3e574d5..7965c55 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -821,8 +821,8 @@ static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComp static HRESULT WINAPI ComponentFactory_CreateEncoderPropertyBag(IWICComponentFactory *iface, PROPBAG2 *options, UINT count, IPropertyBag2 **property) { - FIXME("%p,%p,%u,%p: stub\n", iface, options, count, property); - return E_NOTIMPL; + TRACE("(%p,%p,%u,%p)\n", iface, options, count, property); + return CreatePropertyBag2(options, count, property); } static const IWICComponentFactoryVtbl ComponentFactory_Vtbl = { diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6463de5..1aca6d1 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1389,7 +1389,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4183d8e..e4236e2 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1615,7 +1615,7 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 3a85df0..1c90b15 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2013 Ludger Sprenker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -136,7 +137,8 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { PropertyBag_LoadObject }; -HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) +HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **ppPropertyBag2) { PropertyBag *This; diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index b7e5153..d5ac809 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -234,7 +234,6 @@ static void test_empty_propertybag(void) hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, NULL, 0, &property); -todo_wine ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; @@ -265,7 +264,6 @@ static void test_filled_propertybag(void) hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, opts, 2, &property); -todo_wine ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index fcaa905..8cebb0c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1883,7 +1883,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (SUCCEEDED(hr)) { - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); } if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f8b7789..617db71 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -62,7 +62,8 @@ extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT heigh extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) DECLSPEC_HIDDEN; +extern HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN;

1 0

Erich Hoover : advapi32: Make an internal routine for [Get|Set] SecurityInfo file objects.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: d195bbeb69a6423125a28f5e4f8af1882a0bbe17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d195bbeb69a6423125a28f5e4… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 10:59:01 2013 -0700 advapi32: Make an internal routine for [Get|Set]SecurityInfo file objects. --- dlls/advapi32/security.c | 80 ++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index fac6f39..d70fb63 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -401,6 +401,28 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } +/* helper function for SE_FILE_OBJECT objects in [Get|Set]NamedSecurityInfo */ +static inline DWORD get_security_file( LPWSTR full_file_name, DWORD access, HANDLE *file ) +{ + UNICODE_STRING file_nameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + + if (!RtlDosPathNameToNtPathName_U( full_file_name, &file_nameW, NULL, NULL )) + return ERROR_PATH_NOT_FOUND; + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &file_nameW; + attr.SecurityDescriptor = NULL; + status = NtCreateFile( file, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); + RtlFreeUnicodeString( &file_nameW ); + return RtlNtStatusToDosError( status ); +} + #define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) static void GetWorldAccessACL(PACL pACL) @@ -3964,12 +3986,9 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, PSID psidGroup, PACL pDacl, PACL pSacl) { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - IO_STATUS_BLOCK io; DWORD access = 0; - HANDLE hFile; - DWORD status; + HANDLE handle; + DWORD err; TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); @@ -3980,8 +3999,6 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, } if (!pObjectName) return ERROR_INVALID_PARAMETER; - if (!RtlDosPathNameToNtPathName_U( pObjectName, &nameW, NULL, NULL )) - return ERROR_PATH_NOT_FOUND; if (SecurityInfo & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION)) access |= WRITE_OWNER; @@ -3989,21 +4006,13 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, access |= WRITE_DAC; if (SecurityInfo & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nameW; - attr.SecurityDescriptor = NULL; - status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, - FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); - RtlFreeUnicodeString( &nameW ); - if (status != STATUS_SUCCESS) - return RtlNtStatusToDosError( status ); - status = SetSecurityInfo( hFile, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); - CloseHandle( hFile ); - return status; + err = get_security_file( pObjectName, access, &handle ); + if (err != ERROR_SUCCESS) + return err; + err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseHandle( handle ); + return err; } /****************************************************************************** @@ -5520,12 +5529,9 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, SECURITY_INFORMATION info, PSID* owner, PSID* group, PACL* dacl, PACL* sacl, PSECURITY_DESCRIPTOR* descriptor ) { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - IO_STATUS_BLOCK io; DWORD access = 0; - HANDLE hFile; - DWORD status; + HANDLE handle; + DWORD err; TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); @@ -5550,28 +5556,18 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, || ((info & DACL_SECURITY_INFORMATION) && !dacl) || ((info & SACL_SECURITY_INFORMATION) && !sacl) )) return ERROR_INVALID_PARAMETER; - if (!RtlDosPathNameToNtPathName_U( name, &nameW, NULL, NULL )) - return ERROR_PATH_NOT_FOUND; if (info & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION)) access |= READ_CONTROL; if (info & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = &nameW; - attr.SecurityDescriptor = NULL; - status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, - FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); - RtlFreeUnicodeString( &nameW ); - if (status != STATUS_SUCCESS) - return RtlNtStatusToDosError( status ); - status = GetSecurityInfo( hFile, type, info, owner, group, dacl, sacl, descriptor ); - CloseHandle( hFile ); - return status; + err = get_security_file( name, access, &handle); + if (err != ERROR_SUCCESS) + return err; + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseHandle( handle ); + return err; } /******************************************************************************

1 0

Alexandre Julliard : server: Use the monotonic time counter also on the server side.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: a74dc1a1195b38e0e04798799229a3aab8a021ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74dc1a1195b38e0e04798799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 30 12:49:33 2013 +0100 server: Use the monotonic time counter also on the server side. --- server/Makefile.in | 6 +++--- server/request.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index a2f1a52..2e9bba1 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -1,5 +1,5 @@ DEFS = -D__WINESRC__ -EXTRALIBS = @LIBPOLL@ +EXTRALIBS = @LIBPOLL@ @LIBRT@ C_SRCS = \ async.c \ @@ -62,10 +62,10 @@ all: $(PROGRAMS) @MAKE_RULES@ wineserver: $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_LOCAL) + $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(EXTRALIBS) $(LIBS) $(LDRPATH_LOCAL) wineserver-installed: $(OBJS) - $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) $(LDRPATH_INSTALL) + $(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(EXTRALIBS) $(LIBS) $(LDRPATH_INSTALL) install install-lib:: wineserver-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver diff --git a/server/request.c b/server/request.c index 8d6a7f9..eeb3476 100644 --- a/server/request.c +++ b/server/request.c @@ -51,6 +51,9 @@ #ifdef HAVE_POLL_H #include <poll.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -486,6 +489,20 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) /* get current tick count to return to client */ unsigned int get_tick_count(void) { +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; +#elif defined(__APPLE__) + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; +#endif return (current_time - server_start_time) / 10000; }

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 302fd67e61dbfba205b0afd496667416fbde5b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=302fd67e61dbfba205b0afd49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:39:23 2013 +0100 wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 10 ---------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f3764ed..152e336 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1786,15 +1786,20 @@ BOOL WINAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName) return ret; } -static void AsyncFtpDeleteFileProc(WORKREQUEST *workRequest) +typedef struct { + task_header_t hdr; + WCHAR *file_name; +} delete_file_task_t; + +static void AsyncFtpDeleteFileProc(task_header_t *hdr) { - struct WORKREQ_FTPDELETEFILEW const *req = &workRequest->u.FtpDeleteFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + delete_file_task_t *task = (delete_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpDeleteFileW(lpwfs, req->lpszFilename); - heap_free(req->lpszFilename); + FTP_FtpDeleteFileW(session, task->file_name); + heap_free(task->file_name); } /*********************************************************************** @@ -1841,14 +1846,12 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFtpSession, LPCWSTR lpszFileName) hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPDELETEFILEW *req; + delete_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpDeleteFileProc, sizeof(*task)); - req = &task->u.FtpDeleteFileW; - req->lpszFilename = heap_strdupW(lpszFileName); + task->file_name = heap_strdupW(lpszFileName); - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 82a15ae..bcb7fe6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -354,12 +354,6 @@ typedef struct netconn_stream_t netconn_stream; } http_request_t; - -struct WORKREQ_FTPDELETEFILEW -{ - LPWSTR lpszFilename; -}; - typedef struct WORKREQ task_header_t; typedef void (*async_task_proc_t)(task_header_t*); @@ -367,10 +361,6 @@ typedef struct WORKREQ { async_task_proc_t proc; object_header_t *hdr; - - union { - struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; - } u; } WORKREQUEST, *LPWORKREQUEST; void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPOPENFILEW out of WORKREQUEST.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 228d6a6064d2e68646db4e85ccf7243759291b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=228d6a6064d2e68646db4e85c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:38:49 2013 +0100 wininet: Moved WORKREQ_FTPOPENFILEW out of WORKREQUEST. --- dlls/wininet/ftp.c | 40 ++++++++++++++++++++++------------------ dlls/wininet/internet.h | 9 --------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3d05a42..ba7d5c3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -791,7 +791,7 @@ HINTERNET WINAPI FtpFindFirstFileW(HINTERNET hConnect, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - find_first_file_t *task; + find_first_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpFindFirstFileProc, sizeof(*task)); task->search_file = heap_strdupW(lpszSearchFile); @@ -1454,17 +1454,23 @@ HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, return ret; } +typedef struct { + task_header_t hdr; + WCHAR *file_name; + DWORD access; + DWORD flags; + DWORD_PTR context; +} open_file_task_t; -static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) +static void AsyncFtpOpenFileProc(task_header_t *hdr) { - struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + open_file_task_t *task = (open_file_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE("%p\n", lpwfs); + TRACE("%p\n", session); - FTP_FtpOpenFileW(lpwfs, req->lpszFilename, - req->dwAccess, req->dwFlags, req->dwContext); - heap_free(req->lpszFilename); + FTP_FtpOpenFileW(session, task->file_name, task->access, task->flags, task->context); + heap_free(task->file_name); } /*********************************************************************** @@ -1518,18 +1524,16 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPOPENFILEW *req; + open_file_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpOpenFileProc, sizeof(*task)); - req = &task->u.FtpOpenFileW; - req->lpszFilename = heap_strdupW(lpszFileName); - req->dwAccess = fdwAccess; - req->dwFlags = dwFlags; - req->dwContext = dwContext; + task->file_name = heap_strdupW(lpszFileName); + task->access = fdwAccess; + task->flags = dwFlags; + task->context = dwContext; - INTERNET_AsyncCall(task); - r = NULL; + INTERNET_AsyncCall(&task->hdr); + r = NULL; } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 7e49e9d..efb6ef5 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,14 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPOPENFILEW -{ - LPWSTR lpszFilename; - DWORD dwAccess; - DWORD dwFlags; - DWORD_PTR dwContext; -}; - struct WORKREQ_FTPDELETEFILEW { LPWSTR lpszFilename; @@ -388,7 +380,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPOPENFILEW FtpOpenFileW; struct WORKREQ_FTPDELETEFILEW FtpDeleteFileW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW;

1 0

Marcus Meissner : kernel32: Conditional variable tests.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 17ca7ee82f63600b05324687aff7aa2a867d0ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ca7ee82f63600b05324687a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 30 11:19:56 2013 +0100 kernel32: Conditional variable tests. --- dlls/kernel32/tests/sync.c | 154 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 145 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 0ab82f0..3924dc0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1253,12 +1253,12 @@ static LONG condvar_producer_sleepcnt,condvar_consumer_sleepcnt; #define BUFFER_SIZE 5 static DWORD WINAPI condvar_producer(LPVOID x) { - DWORD sleepinterval = 50; + DWORD sleepinterval = 5; while (1) { Sleep(sleepinterval); - if (sleepinterval > 10) - sleepinterval -= 10; + if (sleepinterval > 1) + sleepinterval -= 1; EnterCriticalSection(&buffercrit); while ((bufferlen == BUFFER_SIZE) && !condvar_stop) { @@ -1282,7 +1282,7 @@ static DWORD WINAPI condvar_producer(LPVOID x) { static DWORD WINAPI condvar_consumer(LPVOID x) { DWORD *cnt = (DWORD*)x; - DWORD sleepinterval = 10; + DWORD sleepinterval = 1; while (1) { EnterCriticalSection(&buffercrit); @@ -1303,12 +1303,12 @@ static DWORD WINAPI condvar_consumer(LPVOID x) { LeaveCriticalSection(&buffercrit); pWakeConditionVariable(&buffernotfull); Sleep(sleepinterval); - if (sleepinterval < 50) sleepinterval += 10; + if (sleepinterval < 5) sleepinterval += 1; } return 0; } -static void test_condvars(void) +static void test_condvars_consumer_producer(void) { HANDLE hp1,hp2,hp3,hc1,hc2,hc3; DWORD dummy; @@ -1328,8 +1328,10 @@ static void test_condvars(void) * pInitializeConditionVariable(&buffernotfull); */ pInitializeConditionVariable(&buffernotempty); - InitializeCriticalSection(&buffercrit); + + /* Larger Test: consumer/producer example */ + bufferlen = totalproduced = totalconsumed = cnt1 = cnt2 = cnt3 = 0; hp1 = CreateThread(NULL, 0, condvar_producer, NULL, 0, &dummy); @@ -1349,7 +1351,9 @@ static void test_condvars(void) pWakeAllConditionVariable (&buffernotfull); pWakeAllConditionVariable (&buffernotempty); - ok(buffernotfull.Ptr == NULL, "buffernotfull.Ptr is %p\n", buffernotfull.Ptr); + /* (mostly an implementation detail) + * ok(buffernotfull.Ptr == NULL, "buffernotfull.Ptr is %p\n", buffernotfull.Ptr); + */ WaitForSingleObject(hp1, 1000); WaitForSingleObject(hp2, 1000); @@ -1371,6 +1375,137 @@ static void test_condvars(void) trace("producer sleep %d, consumer sleep %d\n", condvar_producer_sleepcnt, condvar_consumer_sleepcnt); } +/* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ +static DWORD condvar_seq = 0; +static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CRITICAL_SECTION condvar_crit; + +/* Sequence of wake/sleep to check boundary conditions: + * 0: init + * 1: producer emits a WakeConditionVaribale without consumer waiting. + * 2: consumer sleeps without a wake expecting timeout + * 3: producer emits a WakeAllConditionVaribale without consumer waiting. + * 4: consumer sleeps without a wake expecting timeout + * 5: a wake is handed to a SleepConditionVariableCS + * 6: a wakeall is handed to a SleepConditionVariableCS + * 7: sleep after above should timeout + * 8: wake with crit section locked into the sleep timeout + * 9: end + */ +static DWORD WINAPI condvar_base_producer(LPVOID x) { + while (condvar_seq < 1) Sleep(1); + + pWakeConditionVariable (&condvar_base); + condvar_seq = 2; + + while (condvar_seq < 3) Sleep(1); + pWakeAllConditionVariable (&condvar_base); + condvar_seq = 4; + + while (condvar_seq < 5) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeConditionVariable (&condvar_base); + LeaveCriticalSection (&condvar_crit); + while (condvar_seq < 6) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeAllConditionVariable (&condvar_base); + LeaveCriticalSection (&condvar_crit); + + while (condvar_seq < 8) Sleep(1); + EnterCriticalSection (&condvar_crit); + pWakeConditionVariable (&condvar_base); + Sleep(50); + LeaveCriticalSection (&condvar_crit); + + return 0; +} + +static DWORD WINAPI condvar_base_consumer(LPVOID x) { + BOOL ret; + + while (condvar_seq < 2) Sleep(1); + + /* wake was emitted, but we were not sleeping */ + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + condvar_seq = 3; + while (condvar_seq < 4) Sleep(1); + + /* wake all was emitted, but we were not sleeping */ + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 5; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 6; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); + condvar_seq = 7; + + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); + + EnterCriticalSection (&condvar_crit); + condvar_seq = 8; + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + LeaveCriticalSection (&condvar_crit); + ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); + condvar_seq = 9; + + return 0; +} + +static void test_condvars_base(void) { + HANDLE hp, hc; + DWORD dummy; + BOOL ret; + + + if (!pInitializeConditionVariable) { + /* function is not yet in XP, only in newer Windows */ + /* and not yet implemented in Wine for some days/weeks */ + todo_wine win_skip("no condition variable support.\n"); + return; + } + + InitializeCriticalSection (&condvar_crit); + + EnterCriticalSection (&condvar_crit); + ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + LeaveCriticalSection (&condvar_crit); + + ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); + ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); + + + hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + + condvar_seq = 1; /* go */ + + while (condvar_seq < 9) + Sleep (5); + WaitForSingleObject(hp, 100); + WaitForSingleObject(hc, 100); +} + + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1403,5 +1538,6 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars(); + test_condvars_base(); + test_condvars_consumer_producer(); }

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation for BITMAPINFO.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 35fc9c12dcffa646dfb56c6a48930f5b6a6e208c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35fc9c12dcffa646dfb56c6a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 30 18:02:14 2013 +0800 gdiplus: Avoid not necessary memory allocation for BITMAPINFO. --- dlls/gdiplus/image.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6aa8d32..9c34333 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1821,7 +1821,6 @@ static GpStatus get_screen_resolution(REAL *xres, REAL *yres) GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { - BITMAPINFO* pbmi; HBITMAP hbitmap=NULL; INT row_size, dib_stride; BYTE *bits=NULL, *own_bits=NULL; @@ -1851,9 +1850,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if (format & PixelFormatGDI && !(format & (PixelFormatAlpha|PixelFormatIndexed)) && !scan0) { - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbmi->bmiHeader.biWidth = width; @@ -1870,8 +1868,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, hbitmap = CreateDIBSection(0, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); - GdipFree(pbmi); - if (!hbitmap) return GenericError; stride = dib_stride;

1 0

Erich Hoover : advapi32: Support service objects in SetSecurityInfo.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: e4717c299efa4f7e281de9eb8782b632b5539df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4717c299efa4f7e281de9eb8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 10:58:48 2013 -0700 advapi32: Support service objects in SetSecurityInfo. --- dlls/advapi32/security.c | 11 ++++++++++- dlls/advapi32/service.c | 3 +++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6da7331..fac6f39 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5680,7 +5680,16 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (SecurityInfo & SACL_SECURITY_INFORMATION) SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE); - status = NtSetSecurityObject(handle, SecurityInfo, &sd); + switch (ObjectType) + { + case SE_SERVICE: + FIXME("stub: Service objects are not supported at this time.\n"); + status = STATUS_SUCCESS; /* Implement SetServiceObjectSecurity */ + break; + default: + status = NtSetSecurityObject(handle, SecurityInfo, &sd); + break; + } return RtlNtStatusToDosError(status); } diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index fc98880..9a952e1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2196,6 +2196,9 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, /****************************************************************************** * SetServiceObjectSecurity [ADVAPI32.@] + * + * NOTES + * - SetSecurityInfo should be updated to call this function once it's implemented. */ BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation,

1 0

Alexandre Julliard : winetest: Use non-breaking spaces when formatting dates, and don't display time.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: tools Branch: master Commit: 54e41755e866e05eb7f77fd6bf181ecac52724c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=54e41755e866e05eb7f77fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 30 18:31:06 2013 +0100 winetest: Use non-breaking spaces when formatting dates, and don't display time. --- winetest/build-index | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index d7f4e0b..393e132 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -178,8 +178,8 @@ EOF printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", - $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; + printf OUT " <td class=\"date\">%02d %s %04d</td>", + $date[3], $months[$date[4]], $date[5] + 1900, $date[2]; foreach my $group (@groups) { next unless defined $used_group{$group->{name}}; @@ -228,7 +228,7 @@ foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; + printf OUT " <td class=\"date\">%02d %s %04d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2]; my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) {

1 0