wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Henri Verbeet : wined3d: Set VTF filter caps when VTF is supported.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 7f2ae9889d4b30912b01511e0bc489acbb5d1695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2ae9889d4b30912b01511e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:19 2014 +0200 wined3d: Set VTF filter caps when VTF is supported. --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 62ad4c8..132dad1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4546,6 +4546,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) {

1 0

Nikolay Sivov : wininet: Remove some dead code (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: d87724e626e48ff2b380d270325cd9e3e3e01321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87724e626e48ff2b380d2703… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 09:07:40 2014 +0400 wininet: Remove some dead code (Coverity). --- dlls/wininet/http.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 934af3a..07b4787 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3289,7 +3289,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - DWORD len, res = ERROR_SUCCESS; + DWORD len; TRACE("-->\n"); @@ -3378,13 +3378,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, INTERNET_STATUS_HANDLE_CREATED, &request->hdr.hInternet, sizeof(HINTERNET)); - TRACE("<-- %u (%p)\n", res, request); - - if(res != ERROR_SUCCESS) { - WININET_Release( &request->hdr ); - *ret = NULL; - return res; - } + TRACE("<-- (%p)\n", request); *ret = request->hdr.hInternet; return ERROR_SUCCESS;

1 0

Nikolay Sivov : riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 601738dfb56282b7b98a8dd6a181e54ead287a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601738dfb56282b7b98a8dd6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 08:49:41 2014 +0400 riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity). --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1235a16..bc5bc08 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1198,11 +1198,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && -#if 0 - /* FIXME: enable it when rich-edit properly implements this method */ IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && -#endif IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && IOleCache_Cache(lpOleCache, &fm, 0, &conn) == S_OK &&

1 0

Bruno Jesus : ws2_32: Use the correct address family in gethostbyaddr.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: c33e7308ad8a6ff29c103fb31289931ba59cf75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33e7308ad8a6ff29c103fb31… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 15 00:43:53 2014 -0300 ws2_32: Use the correct address family in gethostbyaddr. --- dlls/ws2_32/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe85356..54e7e2f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5084,6 +5084,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) { struct WS_hostent *retval = NULL; struct hostent* host; + int unixtype = convert_af_w2u(type); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; @@ -5093,7 +5094,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) host = NULL; extrabuf=HeapAlloc(GetProcessHeap(),0,ebufsize) ; while(extrabuf) { - int res = gethostbyaddr_r(addr, len, type, + int res = gethostbyaddr_r(addr, len, unixtype, &hostentry, extrabuf, ebufsize, &host, &locerr); if( res != ERANGE) break; ebufsize *=2; @@ -5102,7 +5103,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) if (!host) SetLastError((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); #else EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyaddr(addr, len, type); + host = gethostbyaddr(addr, len, unixtype); if (!host) SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); #endif if( host != NULL ) retval = WS_dup_he(host); @@ -6408,7 +6409,7 @@ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) p_to = WS_create_he(p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length); if (!p_to) return NULL; - p_to->h_addrtype = p_he->h_addrtype; + p_to->h_addrtype = convert_af_u2w(p_he->h_addrtype); p_to->h_length = p_he->h_length; for(i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length)

1 0

Dmitry Timoshkov : kernel32: Handle memory allocation failure in ReadConsoleA.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 2451d263de91bbde461a64d8627c7159bb4dc3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2451d263de91bbde461a64d86… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 15 11:20:21 2014 +0900 kernel32: Handle memory allocation failure in ReadConsoleA. --- dlls/kernel32/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 67c353b..9d47bf4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1607,6 +1607,12 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC DWORD ncr = 0; BOOL ret; + if (!ptr) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL);

1 0

Nikolay Sivov : kernel32/tests: Added missing comma (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 00ff2ed81e13d289641b1ba2c2ac7d2067877287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ff2ed81e13d289641b1ba2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 02:00:05 2014 +0400 kernel32/tests: Added missing comma (Coverity). --- dlls/kernel32/tests/toolhelp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index af67688..ed76c9c 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -204,17 +204,19 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) static const char* curr_expected_modules[] = { - "kernel32_test.exe" + "kernel32_test.exe", "kernel32.dll", - "ntdll.dll", + "ntdll.dll" }; + static const char* sub_expected_modules[] = { "kernel32_test.exe", "kernel32.dll", "shell32.dll", - "ntdll.dll", + "ntdll.dll" }; + #define NUM_OF(x) (sizeof(x) / sizeof(x[0])) static void test_module(DWORD pid, const char* expected[], unsigned num_expected)

1 0

Nikolay Sivov : shell32: Use a proper deallocator (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 3cadbbb4b0016ea7d00b0f44337c5ea8ecd1043b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cadbbb4b0016ea7d00b0f443… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:53:05 2014 +0400 shell32: Use a proper deallocator (Coverity). --- dlls/shell32/trash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index a5d53a1..043ae5b 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -562,7 +562,7 @@ static HDPA enum_bucket_trashinfos(const TRASH_BUCKET *bucket, int *count) goto failed; if (DPA_InsertPtr(ret, DPA_APPEND, filename) == -1) { - SHFree(filename); + LocalFree(filename); goto failed; } (*count)++;

1 0

Nikolay Sivov : shlwapi: Use a proper deallocator (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 0cb52a9cfa25a5ed2ee989e55bda58b442fefcc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb52a9cfa25a5ed2ee989e55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:52:49 2014 +0400 shlwapi: Use a proper deallocator (Coverity). --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 1a4ad14..b4b5b8a 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2821,7 +2821,7 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void TRACE("returning %s\n", debugstr_w(dst)); end: if(hmod) FreeLibrary(hmod); - HeapFree(GetProcessHeap(), 0, dllname); + LocalFree(dllname); return hr; }

1 0

Nikolay Sivov : winhttp: Use proper deallocator (Coverity).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 2c880e52714bed424cbf44fd9d2e14776bfce9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c880e52714bed424cbf44fd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 19:10:23 2014 +0400 winhttp: Use proper deallocator (Coverity). --- dlls/winhttp/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 97e763e..ebbec2e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1612,11 +1612,11 @@ done: heap_free( hdr ); if (!ret) { - heap_free( config->lpszAutoConfigUrl ); + GlobalFree( config->lpszAutoConfigUrl ); config->lpszAutoConfigUrl = NULL; - heap_free( config->lpszProxy ); + GlobalFree( config->lpszProxy ); config->lpszProxy = NULL; - heap_free( config->lpszProxyBypass ); + GlobalFree( config->lpszProxyBypass ); config->lpszProxyBypass = NULL; } return ret;

1 0

Vincent Povirk : gdiplus: Prevent NULL StringFormat in gdip_format_string.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 4def66c11c92fc229cb7e47781dbdadb3c8344ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4def66c11c92fc229cb7e4778… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 14 11:44:20 2014 -0500 gdiplus: Prevent NULL StringFormat in gdip_format_string. --- dlls/gdiplus/graphics.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 56d785e..861d160 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4392,12 +4392,24 @@ GpStatus gdip_format_string(HDC hdc, INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; BOOL seen_prefix = FALSE; + GpStringFormat *dyn_format=NULL; if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; + if (!format) + { + stat = GdipStringFormatGetGenericDefault(&dyn_format); + if (stat != Ok) + { + GdipFree(stringdup); + return stat; + } + format = dyn_format; + } + nwidth = rect->Width; nheight = rect->Height; if (ignore_empty_clip) @@ -4406,10 +4418,7 @@ GpStatus gdip_format_string(HDC hdc, if (!nheight) nheight = INT_MAX; } - if (format) - hkprefix = format->hkprefix; - else - hkprefix = HotkeyPrefixNone; + hkprefix = format->hkprefix; if (hkprefix == HotkeyPrefixShow) { @@ -4450,8 +4459,7 @@ GpStatus gdip_format_string(HDC hdc, length = j; - if (format) halign = format->align; - else halign = StringAlignmentNear; + halign = format->align; while(sum < length){ GetTextExtentExPointW(hdc, stringdup + sum, length - sum, @@ -4544,13 +4552,13 @@ GpStatus gdip_format_string(HDC hdc, break; /* Stop if this was a linewrap (but not if it was a linebreak). */ - if ((lret == fitcpy) && format && - (format->attr & StringFormatFlagsNoWrap)) + if ((lret == fitcpy) && (format->attr & StringFormatFlagsNoWrap)) break; } GdipFree(stringdup); GdipFree(hotkeyprefix_offsets); + GdipDeleteStringFormat(dyn_format); return stat; }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
50
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 April 2014