wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Bruno Jesus : winhttp: Use a helper to send data and take care of EINTR.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 6db935a6f45391c82437c0892a077b30338f5e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db935a6f45391c82437c0892… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 21:16:25 2014 -0300 winhttp: Use a helper to send data and take care of EINTR. --- dlls/winhttp/net.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b751bf0..c7ff035 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,6 +139,17 @@ static int sock_get_error( int err ) return err; } +static int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -403,7 +414,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); res = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -524,7 +535,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -554,7 +565,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = send( conn->socket, msg, len, 0 )) == -1) + if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE;

1 0

Austin English : kernel32: Add DECLSPEC_HOTPATCH to SetFilePointer.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: bdc0099eb4e3e45761246d251d8ae741e0fe0eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc0099eb4e3e45761246d251… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 15 13:43:54 2014 -0700 kernel32: Add DECLSPEC_HOTPATCH to SetFilePointer. --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 9bcd9e9..412659b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1039,7 +1039,7 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c /*********************************************************************** * SetFilePointer (KERNEL32.@) */ -DWORD WINAPI SetFilePointer( HANDLE hFile, LONG distance, LONG *highword, DWORD method ) +DWORD WINAPI DECLSPEC_HOTPATCH SetFilePointer( HANDLE hFile, LONG distance, LONG *highword, DWORD method ) { LARGE_INTEGER dist, newpos;

1 0

Austin English : user32: Add a stub for SetGestureConfig.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 82392e78b73c2cc4d08be8b35a9d224b4bc3e79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82392e78b73c2cc4d08be8b35… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 15 13:34:49 2014 -0700 user32: Add a stub for SetGestureConfig. --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 15dd75a..2e6cc35 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -684,3 +684,13 @@ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUI FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); return NULL; } + +/********************************************************************** + * SetGestureConfig [USER32.@] + */ +BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) +{ + FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1425dac..da02c58 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -631,6 +631,7 @@ @ stdcall SetDoubleClickTime(long) @ stdcall SetFocus(long) @ stdcall SetForegroundWindow(long) +@ stdcall SetGestureConfig(ptr long long ptr long) @ stdcall SetInternalWindowPos(long long ptr ptr) @ stdcall SetKeyboardState(ptr) @ stdcall SetLastErrorEx(long long) diff --git a/include/winuser.h b/include/winuser.h index 8cda284..303f5d3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -628,6 +628,12 @@ typedef struct tagRID_DEVICE_INFO { #define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK) +typedef struct tagGESTURECONFIG { + DWORD dwID; + DWORD dwWant; + DWORD dwBlock; +} GESTURECONFIG, *PGESTURECONFIG; + #define GIDC_ARRIVAL 1 #define GIDC_REMOVAL 2 @@ -3916,6 +3922,7 @@ WINUSERAPI BOOL WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR); WINUSERAPI BOOL WINAPI SetDoubleClickTime(UINT); WINUSERAPI HWND WINAPI SetFocus(HWND); WINUSERAPI BOOL WINAPI SetForegroundWindow(HWND); +WINUSERAPI BOOL WINAPI SetGestureConfig(HWND,DWORD,UINT,PGESTURECONFIG,UINT); WINUSERAPI void WINAPI SetInternalWindowPos(HWND,UINT,LPRECT,LPPOINT); WINUSERAPI BOOL WINAPI SetKeyboardState(LPBYTE); WINUSERAPI VOID WINAPI SetLastErrorEx(DWORD,DWORD);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: c229428a1489d557de11676e63548547944e7fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c229428a1489d557de11676e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Jun 16 21:18:49 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index ed100dc..77da542 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-16 08:19+0300\n" +"PO-Revision-Date: 2014-06-16 21:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6593,10 +6593,8 @@ msgid "This network connection does not exist.\n" msgstr "Šis tinklo ryšys neegzistuoja.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Sujungimas nepriimtas.\n" +msgstr "Sujungimas nutrauktas kito serverio.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Marcus Meissner : winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity).
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: eddf841ab3846b65acfe18dcba3b337a13f19f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddf841ab3846b65acfe18dcb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:30:42 2014 +0200 winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity). --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5e40d6e..7d41110 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2823,7 +2823,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6603075..81816ca 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2421,7 +2421,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dd45fba..1e0e116 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2146,7 +2146,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec;

1 0

Marcus Meissner : mscms: Removed duplicate return ret (Coverity).
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 7ce613c3c2fe1d79e1f91ac3ac3a60bf14017a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce613c3c2fe1d79e1f91ac3a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:24:56 2014 +0200 mscms: Removed duplicate return ret (Coverity). --- dlls/mscms/profile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6759a96..d6ee715 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -355,8 +355,6 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, ret = get_tag_data( profile, type, offset, buffer, size ); *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; } @@ -1233,8 +1231,6 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, } ret = set_tag_data( profile, type, offset, buffer, size ); release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; }

1 0

Marcus Meissner : oleaut32: Avoid buffer overread (Coverity).
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: d3d54dfd3c5918c3ce1b892809c968114ab9dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d54dfd3c5918c3ce1b89280… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 07:43:25 2014 +0200 oleaut32: Avoid buffer overread (Coverity). --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a52c607..addc5a0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -84,7 +84,7 @@ const char *debugstr_vt(VARTYPE vt) if(vt & ~VT_TYPEMASK) return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - if(vt <= sizeof(variant_types)/sizeof(*variant_types)) + if(vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if(vt == VT_BSTR_BLOB)

1 0

Michael Stefaniuc : dmusic: Increment the refcount when a IReferenceClock pointer is returned.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 5e1783b59ad4dd0bfa1f80d2b35ce840d6c5bf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1783b59ad4dd0bfa1f80d2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 16 23:22:54 2014 +0200 dmusic: Increment the refcount when a IReferenceClock pointer is returned. --- dlls/dmusic/dmusic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 28be851..09a7f53 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -210,8 +210,10 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG if (guid_clock) *guid_clock = This->pMasterClock->pClockInfo.guidClock; - if (reference_clock) - *reference_clock = (IReferenceClock*)This->pMasterClock; + if (reference_clock) { + *reference_clock = &This->pMasterClock->IReferenceClock_iface; + IReferenceClock_AddRef(*reference_clock); + } return S_OK; }

1 0

Sebastian Lackner : kernel32: Update VirtualAddress of resource section in write_raw_resources.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 270d66efc74c11d86ea1c62d289c825a225b1f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270d66efc74c11d86ea1c62d2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 15 23:38:38 2014 +0200 kernel32: Update VirtualAddress of resource section in write_raw_resources. --- dlls/kernel32/resource.c | 1 + dlls/kernel32/tests/resource.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index e829f28..ecd599f 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1554,6 +1554,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; nt->OptionalHeader.SizeOfImage += rva_delta; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); } diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index f94fed6..43551fa 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -394,6 +394,7 @@ static void check_exe( const sec_verify *verify ) int i; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; + IMAGE_OPTIONAL_HEADER *opt; IMAGE_SECTION_HEADER *sec; IMAGE_RESOURCE_DIRECTORY *dir; HANDLE file, mapping; @@ -415,6 +416,7 @@ static void check_exe( const sec_verify *verify ) goto end; nt = (void*) ((BYTE*) dos + dos->e_lfanew); + opt = &nt->OptionalHeader; sec = (void*) &nt[1]; for(i = 0; i < max_sections; i++) @@ -444,6 +446,10 @@ static void check_exe( const sec_verify *verify ) verify->NumberOfNamedEntries, dir->NumberOfNamedEntries); ok( dir->NumberOfIdEntries == verify->NumberOfIdEntries, "NumberOfIdEntries should be %d instead of %d\n", verify->NumberOfIdEntries, dir->NumberOfIdEntries); + + ok(opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress == sec[verify->rsrc_section].VirtualAddress, + "VirtualAddress in optional header should be %d instead of %d\n", + sec[verify->rsrc_section].VirtualAddress, opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress); } end:

1 0

Francois Gouget : testbot/lib: Improve the Collection methods argument handling.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: tools Branch: master Commit: 96e7f4369df0d967b5c6f0af09dffeb8dc149e9f URL: http://source.winehq.org/git/tools.git/?a=commit;h=96e7f4369df0d967b5c6f0af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:28 2014 +0200 testbot/lib: Improve the Collection methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/Collection.pm | 131 ++++++++++++++++++--------------- testbot/lib/ObjectModel/Item.pm | 92 +++++++++++------------ 2 files changed, 114 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=96e7f4369df0d967b5c6…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
38
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 June 2014