wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Piotr Caban : usp10: Limit trace length in iso_dump_types.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 43871921204d4b598f55b6be1bfab076572ae69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43871921204d4b598f55b6be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:57:12 2014 +0200 usp10: Limit trace length in iso_dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2926454..5b227d8 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -513,11 +513,16 @@ static inline int iso_previousChar(IsolatedRun *iso_run, int index) static inline void iso_dump_types(const char* header, IsolatedRun *iso_run) { - int i; + int i, len = 0; TRACE("%s:",header); TRACE("[ "); - for (i = 0; i < iso_run->length; i++) + for (i = 0; i < iso_run->length && len < 200; i++) + { TRACE(" %s",debug_type[*iso_run->item[i].pcls]); + len += strlen(debug_type[*iso_run->item[i].pcls])+1; + } + if (i != iso_run->length) + TRACE("..."); TRACE(" ]\n"); }

1 0

Piotr Caban : usp10: Limit trace length in dump_types.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 6d7ce98fec4bbdff86bd901e91e5636bd6680bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ce98fec4bbdff86bd901e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:56:56 2014 +0200 usp10: Limit trace length in dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 63ffa6a..2926454 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -146,10 +146,15 @@ static const char debug_type[][4] = static inline void dump_types(const char* header, WORD *types, int start, int end) { - int i; + int i, len = 0; TRACE("%s:",header); - for (i = start; i< end; i++) + for (i = start; i < end && len < 200; i++) + { TRACE(" %s",debug_type[types[i]]); + len += strlen(debug_type[types[i]])+1; + } + if (i != end) + TRACE("..."); TRACE("\n"); }

1 0

Thomas Faber : dxdiag: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: f325bf745872cfeec383f33ea2b19dcaa67361c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f325bf745872cfeec383f33ea… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:40:12 2014 +0200 dxdiag: Do not omit mandatory argument to WriteFile. --- programs/dxdiag/output.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 7fb9a4c..c18c75d 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -72,6 +72,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) DWORD len = strlen(caption); DWORD total_len = 3 * (len + sizeof(crlf)); char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -92,7 +93,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) @@ -102,6 +103,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); char sprintf_fmt[1 + 10 + 3 + 1]; char *ptr = output_buffer; + DWORD bytes_written; assert(total_len <= sizeof(output_buffer)); @@ -111,12 +113,13 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); memcpy(ptr, crlf, sizeof(crlf)); - return WriteFile(hFile, output_buffer, total_len, NULL, NULL); + return WriteFile(hFile, output_buffer, total_len, &bytes_written, NULL); } static BOOL output_crlf(HANDLE hFile) { - return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL); + DWORD bytes_written; + return WriteFile(hFile, crlf, sizeof(crlf), &bytes_written, NULL); } static inline void fill_system_text_output_table(struct dxdiag_information *dxdiag_info, struct text_information_field *fields)

1 0

Thomas Faber : cmd: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: d4c4f0ab95871201ff120b6382bfbe722293d539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c4f0ab95871201ff120b638… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:39:13 2014 +0200 cmd: Do not omit mandatory argument to WriteFile. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4c95b43..cb7dfef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -436,6 +436,7 @@ void WCMD_choice (const WCHAR * args) { static BOOL WCMD_AppendEOF(WCHAR *filename) { HANDLE h; + DWORD bytes_written; char eof = '\x1a'; @@ -448,7 +449,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); - if (!WriteFile(h, &eof, 1, NULL, NULL)) { + if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE;

1 0

Thomas Faber : gdi32: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 07ca1afbd38b9f863c090dd0fd920469387e57fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ca1afbd38b9f863c090dd0f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:35:15 2014 +0200 gdi32: Do not omit mandatory argument to WriteFile. --- dlls/gdi32/enhmfdrv/init.c | 6 ++++-- dlls/gdi32/mfdrv/init.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 18f9eae..682f412 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -193,6 +193,7 @@ static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { DWORD len; + DWORD bytes_written; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; @@ -205,7 +206,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nRecords++; if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, NULL, NULL)) + if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) return FALSE; } else { DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); @@ -316,6 +317,7 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -407,7 +409,7 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, NULL, NULL )) { + if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle( hFile ); return 0; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 8f312a1..7b53244 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -321,6 +321,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; + DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -335,8 +336,8 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), NULL, - NULL )) { + if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), + &bytes_written, NULL )) { free_dc_ptr( dc ); CloseHandle (hFile ); return 0; @@ -387,6 +388,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) { DC *dc; METAFILEDRV_PDEVICE *physDev; + DWORD bytes_written; TRACE("(%p)\n", hdc ); @@ -423,7 +425,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), - NULL, NULL)) { + &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; }

1 0

Thomas Faber : d3dx9_36: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 5bd5c89596f66bb13a0f2ceb4be41dd24b438d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd5c89596f66bb13a0f2ceb4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:32:44 2014 +0200 d3dx9_36: Do not omit mandatory argument to WriteFile. --- dlls/d3dx9_36/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 3b3f308..94899cf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -181,6 +181,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) HRESULT hr = S_OK; void *buffer_pointer; DWORD buffer_size; + DWORD bytes_written; HANDLE file = CreateFileW(dst_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -188,7 +189,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) buffer_pointer = ID3DXBuffer_GetBufferPointer(buffer); buffer_size = ID3DXBuffer_GetBufferSize(buffer); - if (!WriteFile(file, buffer_pointer, buffer_size, NULL, NULL)) + if (!WriteFile(file, buffer_pointer, buffer_size, &bytes_written, NULL)) hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(file);

1 0

Thomas Faber : d3dxof: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 21b821677394ce760ad4e3065031f2d358961bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b821677394ce760ad4e3065… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:33:21 2014 +0200 d3dxof: Do not omit mandatory argument to WriteFile. --- dlls/d3dxof/d3dxof.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4172c62..8ca5793 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -136,6 +136,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HRESULT hr; LPBYTE file_buffer; DWORD file_size; + DWORD bytes_written; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -240,7 +241,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, file_buffer, file_size, NULL, NULL); + WriteFile(file, file_buffer, file_size, &bytes_written, NULL); CloseHandle(file); } } @@ -304,6 +305,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP parse_buffer buf; HRESULT hr; LPBYTE decomp_buffer = NULL; + DWORD bytes_written; ZeroMemory(&buf, sizeof(buf)); buf.buffer = pvData; @@ -325,7 +327,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, pvData, cbSize, NULL, NULL); + WriteFile(file, pvData, cbSize, &bytes_written, NULL); CloseHandle(file); } }

1 0

Thomas Faber : wininet: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 9609df86e3ad9ec90ca936c3f11de7c60a4482ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9609df86e3ad9ec90ca936c3f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:30:29 2014 +0200 wininet: Do not omit mandatory argument to WriteFile. --- dlls/wininet/cookie.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 34234db..2c8dd84 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -416,6 +416,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) BOOL do_save = FALSE; char buf[64], *dyn_buf; FILETIME time; + DWORD bytes_written; if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) return FALSE; @@ -454,31 +455,31 @@ static BOOL save_persistent_cookie(cookie_container_t *container) continue; dyn_buf = heap_strdupWtoA(cookie_container->name); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(cookie_container->data); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(container->domain->domain); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -486,7 +487,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) heap_free(dyn_buf); dyn_buf = heap_strdupWtoA(container->path); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -496,7 +497,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); - if(!WriteFile(cookie_handle, buf, strlen(buf), NULL, NULL)) { + if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { do_save = FALSE; break; }

1 0

Jacek Caban : wininet: Rewrite structs storing cookies to represent domains as a tree.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 4707b4483bfaa4ef55c6c0665dd20fe6c26226e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707b4483bfaa4ef55c6c0665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:38 2014 +0200 wininet: Rewrite structs storing cookies to represent domains as a tree. --- dlls/wininet/cookie.c | 571 ++++++++++++++++++++++++++------------------------ 1 file changed, 301 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707b4483bfaa4ef55c6c…

1 0

Jacek Caban : wininet: Use stored server name in HTTP_InsertCookies.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: ffec675b4f1dfdadda6635f2a819b126ac00338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffec675b4f1dfdadda6635f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:11 2014 +0200 wininet: Use stored server name in HTTP_InsertCookies. --- dlls/wininet/http.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffd31e6..8ff42a2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4177,16 +4177,11 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; - HTTPHEADERW *host; WCHAR *cookies; static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - host = HTTP_GetHeader(request, hostW); - if(!host) - return; - - if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) + if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); @@ -4194,7 +4189,7 @@ static void HTTP_InsertCookies(http_request_t *request) return; cnt += sprintfW(cookies, cookieW); - get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); + get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); strcatW(cookies, szCrLf); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2014