January 2013 - Wine-commits

Jacek Caban : wininet: Moved WORKREQ_FTPDELETEFILEW out of WORKREQUEST.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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: Get rid of WORKREQ* types.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: f824e20010a4bc23bd54a6489e1e64c6e5019a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f824e20010a4bc23bd54a6489… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 30 11:39:34 2013 +0100 wininet: Get rid of WORKREQ* types. --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/internet.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 152e336..f0a6257 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1248,9 +1248,9 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) sizeof(INTERNET_ASYNC_RESULT)); } -static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void FTPFILE_AsyncQueryDataAvailableProc(task_header_t *task) { - ftp_file_t *file = (ftp_file_t*)workRequest->hdr; + ftp_file_t *file = (ftp_file_t*)task->hdr; FTP_ReceiveRequestData(file, FALSE); } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8d8ffec..d4c822d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2993,9 +2993,9 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +static void AsyncQueryDataAvailableProc(task_header_t *task) { - http_request_t *req = (http_request_t*)workRequest->hdr; + http_request_t *req = (http_request_t*)task->hdr; HTTP_ReceiveRequestData(req, FALSE); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dff24d9..384516c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3715,16 +3715,16 @@ void *alloc_async_task(object_header_t *hdr, async_task_proc_t proc, size_t size * RETURNS * */ -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) +DWORD INTERNET_AsyncCall(task_header_t *task) { BOOL bSuccess; TRACE("\n"); - bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpWorkRequest, WT_EXECUTELONGFUNCTION); + bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, task, WT_EXECUTELONGFUNCTION); if (!bSuccess) { - heap_free(lpWorkRequest); + heap_free(task); return ERROR_INTERNET_ASYNC_THREAD_FAILED; } return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index bcb7fe6..6d08db1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -354,14 +354,14 @@ typedef struct netconn_stream_t netconn_stream; } http_request_t; -typedef struct WORKREQ task_header_t; +typedef struct task_header_t task_header_t; typedef void (*async_task_proc_t)(task_header_t*); -typedef struct WORKREQ +struct task_header_t { async_task_proc_t proc; object_header_t *hdr; -} WORKREQUEST, *LPWORKREQUEST; +}; void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN; @@ -393,7 +393,7 @@ BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HI void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) DECLSPEC_HIDDEN; +DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN; LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Don' t make stdout and stderr bufferred when writing to console.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 2ee5323a91025b914c6c3c5b0c6ec87cfeb6448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee5323a91025b914c6c3c5b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:08 2013 +0100 msvcrt: Don't make stdout and stderr bufferred when writing to console. --- dlls/msvcrt/file.c | 67 ++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d9b0e19..8e2a067 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -560,20 +560,39 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return 0; } +/********************************************************************* + * _isatty (MSVCRT.@) + */ +int CDECL MSVCRT__isatty(int fd) +{ + HANDLE hand = msvcrt_fdtoh(fd); + + TRACE(":fd (%d) handle (%p)\n",fd,hand); + if (hand == INVALID_HANDLE_VALUE) + return 0; + + return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; +} + /* INTERNAL: Allocate stdio file buffer */ -static void msvcrt_alloc_buffer(MSVCRT_FILE* file) +static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) { - file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); - if(file->_base) { - file->_bufsiz = MSVCRT_BUFSIZ; - file->_flag |= MSVCRT__IOMYBUF; - } else { - file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); - } - file->_ptr = file->_base; - file->_cnt = 0; + if((file->_file==MSVCRT_STDOUT_FILENO || file->_file==MSVCRT_STDERR_FILENO) + && MSVCRT__isatty(file->_file)) + return FALSE; + + file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); + if(file->_base) { + file->_bufsiz = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__IOMYBUF; + } else { + file->_base = (char*)(&file->_charbuf); + /* put here 2 ??? */ + file->_bufsiz = sizeof(file->_charbuf); + } + file->_ptr = file->_base; + file->_cnt = 0; + return TRUE; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -1619,20 +1638,6 @@ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) } /********************************************************************* - * _isatty (MSVCRT.@) - */ -int CDECL MSVCRT__isatty(int fd) -{ - HANDLE hand = msvcrt_fdtoh(fd); - - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return 0; - - return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; -} - -/********************************************************************* * _mktemp (MSVCRT.@) */ char * CDECL MSVCRT__mktemp(char *pattern) @@ -3661,10 +3666,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm /* Fill the buffer on small reads. * TODO: Use a better buffering strategy. */ - if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF)) { - if (file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); - } + if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF) + && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -4472,10 +4475,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if(file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); + if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file)) file->_ptr++; - } if(file->_ptr>file->_base) { file->_ptr--; *file->_ptr=c;

1 0

Piotr Caban : msvcrt: Use temporary buffers to speed up operations on stdout and stderr.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: a8df9b14ada72409625dead81936c7b2c0fcec64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8df9b14ada72409625dead81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 29 13:21:27 2013 +0100 msvcrt: Use temporary buffers to speed up operations on stdout and stderr. --- dlls/msvcrt/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8e2a067..fc4154c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,6 +595,29 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) return TRUE; } +/* INTERNAL: Allocate temporary buffer for stdout and stderr */ +static BOOL add_std_buffer(MSVCRT_FILE *file) +{ + static char buffers[2][MSVCRT_BUFSIZ]; + + if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) + || !MSVCRT__isatty(file->_file) || file->_bufsiz) + return FALSE; + + file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; + file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + return TRUE; +} + +/* INTERNAL: Removes temporary buffer from stdout or stderr */ +/* Only call this function when add_std_buffer returned TRUE */ +static void remove_std_buffer(MSVCRT_FILE *file) +{ + msvcrt_flush_buffer(file); + file->_ptr = file->_base = NULL; + file->_bufsiz = file->_cnt = 0; +} + /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ static int msvcrt_int_to_base32(int num, char *str) { @@ -3911,6 +3934,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) { MSVCRT_size_t i, len = strlenW(s); + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); @@ -3919,13 +3943,17 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__unlock_file(file); return ret; } + + tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; } } + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return 0; } @@ -4271,10 +4299,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4285,12 +4316,15 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4301,10 +4335,13 @@ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4315,12 +4352,15 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; @@ -4332,12 +4372,15 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { + BOOL tmp_buf; int ret; if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret;

1 0

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

30 Jan '13

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

Erich Hoover : advapi32: Support service objects in SetSecurityInfo.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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

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

30 Jan '13

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

Ludger Sprenker : windowscodecs: Implement ComponentFactory:: CreateEncoderPropertyBag.
by Alexandre Julliard 30 Jan '13

30 Jan '13

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

Ludger Sprenker : windowscodecs: Implement IPropertyBag2::CountProperties.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 71bd7fdf7745c2524e221c99be155df587a270a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bd7fdf7745c2524e221c99b… Author: Ludger Sprenker <Ludger(a)sprenker.net> Date: Wed Jan 23 23:35:19 2013 +0100 windowscodecs: Implement IPropertyBag2::CountProperties. --- dlls/windowscodecs/propertybag.c | 14 ++++++++++++-- dlls/windowscodecs/tests/propertybag.c | 2 -- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 1c90b15..f95e7eb 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref; + UINT prop_count; } PropertyBag; static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) @@ -108,8 +109,16 @@ static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *pcProperties) { - FIXME("(%p,%p): stub\n", iface, pcProperties); - return E_NOTIMPL; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%p)\n", iface, pcProperties); + + if (!pcProperties) + return E_INVALIDARG; + + *pcProperties = This->prop_count; + + return S_OK; } static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iProperty, @@ -147,6 +156,7 @@ HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, This->IPropertyBag2_iface.lpVtbl = &PropertyBag_Vtbl; This->ref = 1; + This->prop_count = count; *ppPropertyBag2 = &This->IPropertyBag2_iface; diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index d5ac809..83141a2 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -237,7 +237,6 @@ static void test_empty_propertybag(void) ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; -todo_wine test_propertybag_countproperties(property, 0); todo_wine @@ -267,7 +266,6 @@ static void test_filled_propertybag(void) ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); if (FAILED(hr)) return; -todo_wine test_propertybag_countproperties(property, 2); todo_wine

1 0

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

30 Jan '13

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