April 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: When changing a process desktop, start the close timeout on the old desktop if necessary.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: be417d68909aa3bdbfcb0439b4940dc9c11a6e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be417d68909aa3bdbfcb0439b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 13:55:54 2013 +0200 server: When changing a process desktop, start the close timeout on the old desktop if necessary. --- server/winstation.c | 63 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index e0b7613..57e6995 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -300,6 +300,40 @@ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ) return get_desktop_obj( thread->process, thread->desktop, access ); } +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; + + desktop->close_timeout = NULL; + unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ + post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ +} + +/* add a user of the desktop and cancel the close timeout */ +static void add_desktop_user( struct desktop *desktop ) +{ + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } +} + +/* remove a user of the desktop and start the close timeout if necessary */ +static void remove_desktop_user( struct desktop *desktop ) +{ + assert( desktop->users > 0 ); + desktop->users--; + + /* if we have one remaining user, it has to be the manager of the desktop window */ + if (desktop->users == 1 && get_top_window_owner( desktop )) + { + assert( !desktop->close_timeout ); + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + } +} + /* set the process default desktop handle */ void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ) @@ -316,15 +350,10 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) if (!thread->desktop) thread->desktop = handle; - if (!process->is_system) + if (!process->is_system && desktop != old_desktop) { - desktop->users++; - if (desktop->close_timeout) - { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; - } - if (old_desktop) old_desktop->users--; + add_desktop_user( desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); } if (old_desktop) release_object( old_desktop ); @@ -372,15 +401,6 @@ done: clear_error(); } -static void close_desktop_timeout( void *private ) -{ - struct desktop *desktop = private; - - desktop->close_timeout = NULL; - unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ - post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ -} - /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { @@ -388,14 +408,7 @@ void close_process_desktop( struct process *process ) if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) { - assert( desktop->users > 0 ); - desktop->users--; - /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } + remove_desktop_user( desktop ); release_object( desktop ); } clear_error(); /* ignore errors */

1 0

Piotr Caban : wininet: Delete Content-Encoding header when uncompressing data.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 7883976722e447dc65bcb92776228e9489e3e1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7883976722e447dc65bcb9277… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:59:49 2013 +0200 wininet: Delete Content-Encoding header when uncompressing data. --- dlls/wininet/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f5ec392..281fe66 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2822,8 +2822,10 @@ static DWORD set_content_length(http_request_t *request) static const WCHAR gzipW[] = {'g','z','i','p',0}; encoding_idx = HTTP_GetCustomHeaderIndex(request, szContent_Encoding, 0, FALSE); - if(encoding_idx != -1 && !strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) + if(encoding_idx != -1 && !strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) { + HTTP_DeleteCustomHeader(request, encoding_idx); return init_gzip_stream(request); + } } return ERROR_SUCCESS;

1 0

Piotr Caban : wininet: Take HTTP_QUERY_FLAG_REQUEST_HEADERS flag into account when creating HTTP_QUERY_RAW_HEADERS data information .
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 259ffa2a1af83b03c8d4d0107d40666dcb7f2b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259ffa2a1af83b03c8d4d0107… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:59:33 2013 +0200 wininet: Take HTTP_QUERY_FLAG_REQUEST_HEADERS flag into account when creating HTTP_QUERY_RAW_HEADERS data information. --- dlls/wininet/http.c | 61 ++++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 682ed36..f5ec392 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -631,20 +631,21 @@ static void HTTP_FixURL(http_request_t *request) } } -static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR verb, LPCWSTR path, LPCWSTR version ) +static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, + const WCHAR *path, const WCHAR *version, BOOL use_cr) { LPWSTR requestString; DWORD len, n; LPCWSTR *req; UINT i; - LPWSTR p; static const WCHAR szSpace[] = { ' ',0 }; static const WCHAR szColon[] = { ':',' ',0 }; - static const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; + static const WCHAR szCr[] = { '\r',0 }; + static const WCHAR szLf[] = { '\n',0 }; /* allocate space for an array of all the string pointers to be added */ - len = (request->nCustHeaders)*4 + 10; + len = (request->nCustHeaders)*5 + 10; req = heap_alloc(len*sizeof(LPCWSTR)); /* add the verb, path and HTTP version string */ @@ -654,39 +655,34 @@ static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR ve req[n++] = path; req[n++] = szSpace; req[n++] = version; + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; /* Append custom request headers */ for (i = 0; i < request->nCustHeaders; i++) { if (request->custHeaders[i].wFlags & HDR_ISREQUEST) { - req[n++] = szCrLf; req[n++] = request->custHeaders[i].lpszField; req[n++] = szColon; req[n++] = request->custHeaders[i].lpszValue; + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; TRACE("Adding custom header %s (%s)\n", debugstr_w(request->custHeaders[i].lpszField), debugstr_w(request->custHeaders[i].lpszValue)); } } - - if( n >= len ) - ERR("oops. buffer overrun\n"); - + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; req[n] = NULL; + requestString = HTTP_build_req( req, 4 ); heap_free( req ); - - /* - * Set (header) termination string for request - * Make sure there's exactly two new lines at the end of the request - */ - p = &requestString[strlenW(requestString)-1]; - while ( (*p == '\n') || (*p == '\r') ) - p--; - strcpyW( p+1, sztwocrlf ); - return requestString; } @@ -3421,13 +3417,13 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, DWORD res = ERROR_INVALID_PARAMETER; if (request_only) - headers = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); + headers = build_request_header(request, request->verb, request->path, request->version, TRUE); else headers = build_response_header(request, TRUE); + if (!headers) + return ERROR_OUTOFMEMORY; - if (headers) - len = strlenW(headers) * sizeof(WCHAR); - + len = strlenW(headers) * sizeof(WCHAR); if (len + sizeof(WCHAR) > *lpdwBufferLength) { len += sizeof(WCHAR); @@ -3435,13 +3431,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } else if (lpBuffer) { - if (headers) - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); - else - { - len = strlenW(szCrLf) * sizeof(WCHAR); - memcpy(lpBuffer, szCrLf, sizeof(szCrLf)); - } + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR))); res = ERROR_SUCCESS; } @@ -3455,7 +3445,10 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, LPWSTR headers; DWORD len; - headers = build_response_header(request, FALSE); + if (request_only) + headers = build_request_header(request, request->verb, request->path, request->version, FALSE); + else + headers = build_response_header(request, FALSE); if (!headers) return ERROR_OUTOFMEMORY; @@ -4070,7 +4063,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) TRACE("\n"); - requestString = HTTP_BuildHeaderRequestString( request, connectW, server->host_port, g_szHttp1_1 ); + requestString = build_request_header( request, connectW, server->host_port, g_szHttp1_1, TRUE ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); @@ -4829,11 +4822,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->proxy) { WCHAR *url = build_proxy_path_url(request); - requestString = HTTP_BuildHeaderRequestString(request, request->verb, url, request->version); + requestString = build_request_header(request, request->verb, url, request->version, TRUE); heap_free(url); } else - requestString = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); + requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); TRACE("Request header -> %s\n", debugstr_w(requestString) );

1 0

Piotr Caban : wininet: Create raw HTTP headers dynamically.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: e092233396bceb950c64394b386fb3acad505935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e092233396bceb950c64394b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:58:00 2013 +0200 wininet: Create raw HTTP headers dynamically. --- dlls/wininet/http.c | 149 ++++++++++++++++++++++++++------------------------ 1 files changed, 77 insertions(+), 72 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 73aa3f7..682ed36 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -585,61 +585,9 @@ static DWORD init_gzip_stream(http_request_t *req) #endif /*********************************************************************** - * HTTP_Tokenize (internal) - * - * Tokenize a string, allocating memory for the tokens. - */ -static LPWSTR * HTTP_Tokenize(LPCWSTR string, LPCWSTR token_string) -{ - LPWSTR * token_array; - int tokens = 0; - int i; - LPCWSTR next_token; - - if (string) - { - /* empty string has no tokens */ - if (*string) - tokens++; - /* count tokens */ - for (i = 0; string[i]; i++) - { - if (!strncmpW(string+i, token_string, strlenW(token_string))) - { - DWORD j; - tokens++; - /* we want to skip over separators, but not the null terminator */ - for (j = 0; j < strlenW(token_string) - 1; j++) - if (!string[i+j]) - break; - i += j; - } - } - } - - /* add 1 for terminating NULL */ - token_array = heap_alloc((tokens+1) * sizeof(*token_array)); - token_array[tokens] = NULL; - if (!tokens) - return token_array; - for (i = 0; i < tokens; i++) - { - int len; - next_token = strstrW(string, token_string); - if (!next_token) next_token = string+strlenW(string); - len = next_token - string; - token_array[i] = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(token_array[i], string, len*sizeof(WCHAR)); - token_array[i][len] = '\0'; - string = next_token+strlenW(token_string); - } - return token_array; -} - -/*********************************************************************** * HTTP_FreeTokens (internal) * - * Frees memory returned from HTTP_Tokenize. + * Frees table of pointers. */ static void HTTP_FreeTokens(LPWSTR * token_array) { @@ -742,6 +690,59 @@ static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR ve return requestString; } +static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) +{ + static const WCHAR colonW[] = { ':',' ',0 }; + static const WCHAR crW[] = { '\r',0 }; + static const WCHAR lfW[] = { '\n',0 }; + static const WCHAR status_fmt[] = { ' ','%','u',' ',0 }; + + const WCHAR **req; + WCHAR *ret, buf[14]; + DWORD i, n = 0; + + req = heap_alloc((request->nCustHeaders*5+8)*sizeof(WCHAR*)); + if(!req) + return NULL; + + if(request->rawHeaders) + { + req[n++] = request->version; + sprintfW(buf, status_fmt, request->status_code); + req[n++] = buf; + req[n++] = request->statusText; + if (use_cr) + req[n++] = crW; + req[n++] = lfW; + } + + for(i = 0; i < request->nCustHeaders; i++) + { + if(!(request->custHeaders[i].wFlags & HDR_ISREQUEST) + && strcmpW(request->custHeaders[i].lpszField, szStatus)) + { + req[n++] = request->custHeaders[i].lpszField; + req[n++] = colonW; + req[n++] = request->custHeaders[i].lpszValue; + if(use_cr) + req[n++] = crW; + req[n++] = lfW; + + TRACE("Adding custom header %s (%s)\n", + debugstr_w(request->custHeaders[i].lpszField), + debugstr_w(request->custHeaders[i].lpszValue)); + } + } + if(use_cr) + req[n++] = crW; + req[n++] = lfW; + req[n] = NULL; + + ret = HTTP_build_req(req, 0); + heap_free(req); + return ret; +} + static void HTTP_ProcessCookies( http_request_t *request ) { int HeaderIndex; @@ -3422,7 +3423,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, if (request_only) headers = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); else - headers = request->rawHeaders; + headers = build_response_header(request, TRUE); if (headers) len = strlenW(headers) * sizeof(WCHAR); @@ -3446,38 +3447,42 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } *lpdwBufferLength = len; - if (request_only) heap_free(headers); + heap_free(headers); return res; } case HTTP_QUERY_RAW_HEADERS: { - LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(request->rawHeaders, szCrLf); - DWORD i, size = 0; - LPWSTR pszString = lpBuffer; + LPWSTR headers; + DWORD len; - for (i = 0; ppszRawHeaderLines[i]; i++) - size += strlenW(ppszRawHeaderLines[i]) + 1; + headers = build_response_header(request, FALSE); + if (!headers) + return ERROR_OUTOFMEMORY; - if (size + 1 > *lpdwBufferLength/sizeof(WCHAR)) + len = strlenW(headers) * sizeof(WCHAR); + if (len > *lpdwBufferLength) { - HTTP_FreeTokens(ppszRawHeaderLines); - *lpdwBufferLength = (size + 1) * sizeof(WCHAR); + *lpdwBufferLength = len; + heap_free(headers); return ERROR_INSUFFICIENT_BUFFER; } - if (pszString) + + if (lpBuffer) { - for (i = 0; ppszRawHeaderLines[i]; i++) + DWORD i; + + TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); + + for (i=0; i<len; i++) { - DWORD len = strlenW(ppszRawHeaderLines[i]); - memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); - pszString += len+1; + if (headers[i] == '\n') + headers[i] = 0; } - *pszString = '\0'; - TRACE("returning data: %s\n", debugstr_wn(lpBuffer, size)); + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); } - *lpdwBufferLength = size * sizeof(WCHAR); - HTTP_FreeTokens(ppszRawHeaderLines); + *lpdwBufferLength = len - sizeof(WCHAR); + heap_free(headers); return ERROR_SUCCESS; } case HTTP_QUERY_STATUS_TEXT:

1 0

Piotr Caban : msvcrt: Move _fstat32 and _fstat64i32 functions to msvcrt.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: f99742a5393e296581a07c6aef115d8248f83b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99742a5393e296581a07c6ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:29:59 2013 +0200 msvcrt: Move _fstat32 and _fstat64i32 functions to msvcrt. --- dlls/msvcr100/msvcr100.c | 32 +----------------------- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/file.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + 7 files changed, 66 insertions(+), 38 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 4449310..149f132 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -78,8 +78,8 @@ typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); /********************************************************************* - * * stat64_to_stat32 [internal] - * */ + * stat64_to_stat32 [internal] + */ static void stat64_to_stat32(const struct _stat64 *buf64, struct _stat32 *buf) { buf->st_dev = buf64->st_dev; @@ -210,20 +210,6 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } /********************************************************************* - * _fstat32 (MSVCR100.@) - */ -int CDECL _fstat32(int fd, struct _stat32* buf) -{ - int ret; - struct _stat64 buf64; - - ret = _fstat64(fd, &buf64); - if (!ret) - stat64_to_stat32(&buf64, buf); - return ret; -} - -/********************************************************************* * _stat32 (MSVCR100.@) */ int CDECL _stat32(const char *path, struct _stat32* buf) @@ -310,20 +296,6 @@ static void stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 * } /********************************************************************* - * _fstat64i32 (MSVCR100.@) - */ -int CDECL _fstat64i32(int fd, struct _stat64i32* buf) -{ - int ret; - struct _stat64 buf64; - - ret = _fstat64(fd, &buf64); - if (!ret) - stat64_to_stat64i32(&buf64, buf); - return ret; -} - -/********************************************************************* * _stat64i32 (MSVCR100.@) */ int CDECL _stat64i32(const char* path, struct _stat64i32 * buf) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e60e0fb..370feb2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -841,10 +841,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9f36dad..12fc808 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1193,10 +1193,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a8490e1..47bf34f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -507,10 +507,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9783c2f..d76ab73 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -489,10 +489,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c8863b3..c0c7124 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -177,6 +177,36 @@ static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct buf->st_ctime = buf64->st_ctime; } +static void msvcrt_stat64_to_stat32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +static void msvcrt_stat64_to_stat64i32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat64i32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + static void time_to_filetime( MSVCRT___time64_t time, FILETIME *ft ) { /* 1601 to 1970 is 369 years plus 89 leap days */ @@ -1558,6 +1588,30 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) return ret; } +/* _fstat32 - not exported in native msvcrt */ +int CDECL _fstat32(int fd, struct MSVCRT__stat32* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat32(&buf64, buf); + return ret; +} + +/* _fstat64i32 - not exported in native msvcrt */ +int CDECL _fstat64i32(int fd, struct MSVCRT__stat64i32* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} + /********************************************************************* * _futime64 (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43d3c45..55ebba9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1532,3 +1532,5 @@ @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _getptd() @ cdecl fread_s(ptr long long long ptr) +@ cdecl _fstat32(long ptr) +@ cdecl _fstat64i32(long ptr)

1 0

Christian Costa : d3dxof: Get rid of go_to_next_definition.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: a180e5ed00a298f971d6a015ac476629010b1d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a180e5ed00a298f971d6a015a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:43:03 2013 +0200 d3dxof: Get rid of go_to_next_definition. --- dlls/d3dxof/parsing.c | 40 ++-------------------------------------- 1 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b1dde86..37cf2e1 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1065,39 +1065,6 @@ static BOOL parse_template_parts(parse_buffer * buf) return TRUE; } -static void go_to_next_definition(parse_buffer * buf) -{ - char c; - while (buf->rem_bytes) - { - if (!read_bytes(buf, &c, 1)) - return; - if ((c == '#') || (c == '/')) - { - /* Handle comment (# or //) */ - if (c == '/') - { - if (!read_bytes(buf, &c, 1)) - return; - if (c != '/') - return; - } - c = 0; - while (c != 0x0A) - { - if (!read_bytes(buf, &c, 1)) - return; - } - continue; - } - else if (!is_space(c)) - { - rewind_bytes(buf, 1); - break; - } - } -} - static BOOL parse_template(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_TEMPLATE) @@ -1466,11 +1433,8 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next object */ - go_to_next_definition(buf); - } + /* For seeking to a possibly eof to avoid parsing another object next time */ + check_TOKEN(buf); return TRUE; }

1 0

Christian Costa : d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 1bd5bfebaeb3cf7dd901203c6b554a20723fff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd5bfebaeb3cf7dd901203c6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:55 2013 +0200 d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file. --- dlls/d3dx9_36/tests/xfile.c | 2 +- dlls/d3dxof/d3dxof.c | 7 ++++--- dlls/d3dxof/d3dxof_private.h | 2 +- dlls/d3dxof/parsing.c | 6 ++++-- dlls/d3dxof/tests/d3dxof.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 1238bcd..e514a5f 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -77,7 +77,7 @@ static void test_templates(void) ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5a08b21..498b192 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -241,7 +241,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - if (!parse_templates(&object->buf)) + /* Check if there are templates defined before the object */ + if (!parse_templates(&object->buf, TRUE)) { hr = DXFILEERR_PARSEERROR; goto error; @@ -320,7 +321,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (FAILED(hr)) goto cleanup; - if (!parse_templates(&buf)) + if (!parse_templates(&buf, FALSE)) { hr = DXFILEERR_PARSEERROR; goto cleanup; @@ -1003,7 +1004,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } /* Check if there are templates defined before the object */ - if (!parse_templates(&This->buf)) + if (!parse_templates(&This->buf, TRUE)) return DXFILEERR_PARSEERROR; if (!This->buf.rem_bytes) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 8872c14..5bd3c71 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -161,7 +161,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HID HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) DECLSPEC_HIDDEN; int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1c624d3..b1dde86 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1121,10 +1121,12 @@ static BOOL parse_template(parse_buffer * buf) return TRUE; } -BOOL parse_templates(parse_buffer * buf) +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) { - while (check_TOKEN(buf) == TOKEN_TEMPLATE) + while (check_TOKEN(buf) != TOKEN_NONE) { + if (templates_only && (check_TOKEN(buf) != TOKEN_TEMPLATE)) + return TRUE; if (!parse_template(buf)) { WARN("Template is not correct\n"); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 43a7fde..f6874a4 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -427,7 +427,7 @@ static void test_templates(void) ok(ret == DXFILEERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEFLOATSIZE); ret = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); IDirectXFile_Release(dxfile); }

1 0

Christian Costa : d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 37d037749d9c8954a41818d03b9f073336021f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d037749d9c8954a41818d03… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:46 2013 +0200 d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine. --- dlls/d3dxof/parsing.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 546166a..1c624d3 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1114,11 +1114,6 @@ static BOOL parse_template(parse_buffer * buf) return FALSE; if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next template */ - go_to_next_definition(buf); - } TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); buf->pdxf->nb_xtemplates++; @@ -1128,7 +1123,7 @@ static BOOL parse_template(parse_buffer * buf) BOOL parse_templates(parse_buffer * buf) { - while (buf->rem_bytes && (check_TOKEN(buf) == TOKEN_TEMPLATE)) + while (check_TOKEN(buf) == TOKEN_TEMPLATE) { if (!parse_template(buf)) {

1 0

Nikolay Sivov : netstat: No need to allocate fixed length stats structs.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 423d5f29e8d3cb9906d0663047c4dd51ed581f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d5f29e8d3cb9906d066304… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:26:43 2013 +0400 netstat: No need to allocate fixed length stats structs. --- programs/netstat/netstat.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index b7fee0e..23f2b40 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -274,25 +274,21 @@ static void NETSTAT_tcp_table(void) static void NETSTAT_tcp_stats(void) { - PMIB_TCPSTATS stats; + MIB_TCPSTATS stats; - stats = (PMIB_TCPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_TCPSTATS)); - - if (GetTcpStatistics(stats) == NO_ERROR) + if (GetTcpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats->dwActiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats->dwPassiveOpens); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats->dwAttemptFails); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats->dwEstabResets); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats->dwCurrEstab); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats->dwInSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats->dwOutSegs); - NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats->dwRetransSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_ACTIVE_OPEN), stats.dwActiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_PASSIV_OPEN), stats.dwPassiveOpens); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_FAILED_CONN), stats.dwAttemptFails); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_RESET_CONN), stats.dwEstabResets); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_CURR_CONN), stats.dwCurrEstab); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RECV), stats.dwInSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_SENT), stats.dwOutSegs); + NETSTAT_wprintf(fmttcpstat, NETSTAT_load_message(IDS_TCP_SEGM_RETRAN), stats.dwRetransSegs); } - - HeapFree(GetProcessHeap(), 0, stats); } static void NETSTAT_udp_table(void) @@ -325,21 +321,17 @@ static void NETSTAT_udp_table(void) static void NETSTAT_udp_stats(void) { - PMIB_UDPSTATS stats; + MIB_UDPSTATS stats; - stats = (PMIB_UDPSTATS)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_UDPSTATS)); - - if (GetUdpStatistics(stats) == NO_ERROR) + if (GetUdpStatistics(&stats) == NO_ERROR) { NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_UDP_STAT)); NETSTAT_wprintf(fmtn); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats->dwInDatagrams); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats->dwNoPorts); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats->dwInErrors); - NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats->dwOutDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_RECV), stats.dwInDatagrams); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_NO_PORTS), stats.dwNoPorts); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_RECV_ERRORS), stats.dwInErrors); + NETSTAT_wprintf(fmtudpstat, NETSTAT_load_message(IDS_UDP_DGRAMS_SENT), stats.dwOutDatagrams); } - - HeapFree(GetProcessHeap(), 0, stats); } static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[])

1 0

Detlef Riekenberg : dwrite/tests: Avoid refcount test failures.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 03101b06c95b8677ad46d5470b02dcc7202a4429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03101b06c95b8677ad46d5470… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:13:55 2013 +0200 dwrite/tests: Avoid refcount test failures. --- dlls/dwrite/tests/font.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9138061..8404c22 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -444,19 +444,12 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 2); hr = IDWriteFont_CreateFontFace(font, &fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); - EXPECT_REF(fontface, 3); - EXPECT_REF(font, 1); + /* the fontface refcount is increased here */ - IDWriteFontFace_AddRef(fontface); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 4); - IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface);

1 0