January 2014 - Wine-Commits

Huw Davies : wordpad: Pass the correct window to the font size list validator.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 44e153f9d45ee434bb2727a1d9cd7502cec7fa2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e153f9d45ee434bb2727a1d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 16:28:31 2013 +0000 wordpad: Pass the correct window to the font size list validator. (cherry picked from commit 39538f91f5d396cf4b721086ddddb08a38bc18d1) --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8468148..1da6a27 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2016,7 +2016,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,endEdit->szText); + on_sizelist_modified(hwndSizeList,endEdit->szText); } } return 0;

1 0

Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::SetDescription().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6f933cba724e1fe2de0d05b59a2b3fd192974974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f933cba724e1fe2de0d05b59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:42:31 2013 +0400 qmgr: Implement IBackgroundCopyJob::SetDescription(). (cherry picked from commit eeb05e6ef98d7bb5cade2eda82640846ebb18c11) --- dlls/qmgr/job.c | 50 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/qmgr/qmgr.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 4abf220..a395ec6 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -25,9 +25,15 @@ #include "qmgr.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) +{ + return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; +} + static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -73,6 +79,7 @@ static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This->description); HeapFree(GetProcessHeap(), 0, This); } @@ -147,8 +154,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Resume( HRESULT rv = S_OK; EnterCriticalSection(&globalMgr.cs); - if (This->state == BG_JOB_STATE_CANCELLED - || This->state == BG_JOB_STATE_ACKNOWLEDGED) + if (is_job_done(This)) { rv = BG_E_INVALID_STATE; } @@ -182,8 +188,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Complete( EnterCriticalSection(&This->cs); - if (This->state == BG_JOB_STATE_CANCELLED - || This->state == BG_JOB_STATE_ACKNOWLEDGED) + if (is_job_done(This)) { rv = BG_E_INVALID_STATE; } @@ -313,7 +318,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDisplayName( if (!pVal) return E_INVALIDARG; - n = (lstrlenW(This->displayName) + 1) * sizeof **pVal; + n = (strlenW(This->displayName) + 1) * sizeof **pVal; *pVal = CoTaskMemAlloc(n); if (*pVal == NULL) return E_OUTOFMEMORY; @@ -325,8 +330,36 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetDescription( IBackgroundCopyJob2 *iface, LPCWSTR Val) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + static const int max_description_len = 1024; + HRESULT hr = S_OK; + int len; + + TRACE("(%p)->(%s)\n", This, debugstr_w(Val)); + + if (!Val) return E_INVALIDARG; + + len = strlenW(Val); + if (len > max_description_len) return BG_E_STRING_TOO_LONG; + + EnterCriticalSection(&This->cs); + + if (is_job_done(This)) + { + hr = BG_E_INVALID_STATE; + } + else + { + HeapFree(GetProcessHeap(), 0, This->description); + if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) + strcpyW(This->description, Val); + else + hr = E_OUTOFMEMORY; + } + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDescription( @@ -588,7 +621,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - n = (lstrlenW(displayName) + 1) * sizeof *displayName; + n = (strlenW(displayName) + 1) * sizeof *displayName; This->displayName = HeapAlloc(GetProcessHeap(), 0, n); if (!This->displayName) { @@ -617,6 +650,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->jobProgress.FilesTransferred = 0; This->state = BG_JOB_STATE_SUSPENDED; + This->description = NULL; *job = This; return S_OK; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 215c200..1f64d41 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -36,6 +36,7 @@ typedef struct IBackgroundCopyJob2 IBackgroundCopyJob2_iface; LONG ref; LPWSTR displayName; + LPWSTR description; BG_JOB_TYPE type; GUID jobId; struct list files;

1 0

Stefan Leichter : setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ccca0fe076b7670e2139dc051f9ec96e9d3915d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccca0fe076b7670e2139dc051… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 17 21:42:00 2013 +0100 setupapi: Support signature $Windows NT$ in SetupDiGetINFClassA/W too. (cherry picked from commit 6aace3014d355d355e802299d62a34e8865951ba) --- dlls/setupapi/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6ddebb0..a8648c1 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -58,6 +58,7 @@ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; +static const WCHAR WindowsNT[] = {'$','W','i','n','d','o','w','s',' ','N','T','$',0}; /* Registry key and value names */ static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', @@ -4100,7 +4101,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) return FALSE; - if (lstrcmpiW(buffer, Chicago)) + if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) return FALSE; buffer[0] = '\0';

1 0

Hans Leidekker : advapi32: Avoid a crash when storing credentials on MacOS.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 8694d95bae9a30bf98076c05afddd51e0df4a3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8694d95bae9a30bf98076c05a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 19 13:36:47 2013 +0100 advapi32: Avoid a crash when storing credentials on MacOS. (cherry picked from commit 2f3c474e413b237271911d615630b7a2be26b7c3) --- dlls/advapi32/cred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 58dd72d..e0f86af 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -571,7 +571,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b TRACE("adding server %s, domain %s, username %s using Keychain\n", servername, domain, username); status = SecKeychainAddInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, strlen(username), + domain ? strlen(domain) : 0, domain, strlen(username), username, 0, NULL, 0, 0 /* no protocol */, kSecAuthenticationTypeDefault, @@ -583,7 +583,7 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b SecKeychainItemRef keychain_item; status = SecKeychainFindInternetPassword(NULL, strlen(servername), servername, - strlen(domain), domain, + domain ? strlen(domain) : 0, domain, strlen(username), username, 0, NULL /* any path */, 0, 0 /* any protocol */,

1 0

Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::GetDescription().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 5de9bfaf6ae95b888db9d4b83e1a4e37674fb041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de9bfaf6ae95b888db9d4b83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:42:50 2013 +0400 qmgr: Implement IBackgroundCopyJob::GetDescription(). (cherry picked from commit b8771368c6d12f6e128a04490a8ea4b54a03da7e) --- dlls/qmgr/job.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index a395ec6..d66ccc7 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -34,6 +34,23 @@ static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; } +static HRESULT return_strval(const WCHAR *str, WCHAR **ret) +{ + int len; + + if (!ret) return E_INVALIDARG; + + len = strlenW(str); + *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if (!*ret) return E_OUTOFMEMORY; + + if (len) + strcpyW(*ret, str); + else + **ret = 0; + return S_OK; +} + static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -313,17 +330,10 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDisplayName( LPWSTR *pVal) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - int n; - if (!pVal) - return E_INVALIDARG; + TRACE("(%p)->(%p)\n", This, pVal); - n = (strlenW(This->displayName) + 1) * sizeof **pVal; - *pVal = CoTaskMemAlloc(n); - if (*pVal == NULL) - return E_OUTOFMEMORY; - memcpy(*pVal, This->displayName, n); - return S_OK; + return return_strval(This->displayName, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetDescription( @@ -366,8 +376,11 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDescription( IBackgroundCopyJob2 *iface, LPWSTR *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + + TRACE("(%p)->(%p)\n", This, pVal); + + return return_strval(This->description, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetPriority(

1 0

Ken Thomases : ntdll: On Mac, store the dyld image info address in the PEB.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f512cf479ae5b623c8cf2e1858b10a71e3b45501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f512cf479ae5b623c8cf2e185… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:07:55 2013 -0600 ntdll: On Mac, store the dyld image info address in the PEB. (cherry picked from commit 22cf68e1bc079c05ad4bf9397c48f6065019d5e3) --- dlls/ntdll/thread.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 703e83c..ca5c8f9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -186,6 +186,23 @@ done: return status; } +#ifdef __APPLE__ +#include <mach/mach.h> +#include <mach/mach_error.h> + +static ULONG get_dyld_image_info_addr(void) +{ + ULONG ret = 0; +#ifdef TASK_DYLD_INFO + struct task_dyld_info dyld_info; + mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; + if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) + ret = dyld_info.all_image_info_addr; +#endif + return ret; +} +#endif /* __APPLE__ */ + /*********************************************************************** * thread_init * @@ -245,6 +262,9 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); InitializeListHead( &tls_links ); +#ifdef __APPLE__ + peb->Reserved[0] = get_dyld_image_info_addr(); +#endif /* allocate and initialize the initial TEB */

1 0

Huw Davies : ntdll: Don' t reduce the size of the local buffer when we come to read another batch of entries.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ed2a34bf31616ade3f866fa38119f175008e0580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2a34bf31616ade3f866fa38… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 3 13:06:21 2013 +0000 ntdll: Don't reduce the size of the local buffer when we come to read another batch of entries. In the wildcard case, we can't know how much to reduce it by anyway. (cherry picked from commit fed9f67bc4e40cecf2fc560004b8d9cd0a4329e3) --- dlls/ntdll/directory.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e6e1795..3e30129 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1848,9 +1848,6 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff continue; } if (size < initial_size) break; /* already restarted once, give up now */ - size = min( size, length - io->Information ); - /* if size is too small don't bother to continue */ - if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart:

1 0

Huw Davies : kernel32: Give the non-wildcard case a chance of succeeding first time around.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 2d2d46b2f1dd2cb3dfd52d1557e1948a5a8bbf56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2d46b2f1dd2cb3dfd52d155… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 4 14:28:55 2013 +0000 kernel32: Give the non-wildcard case a chance of succeeding first time around. (cherry picked from commit 67545ed54c94e3541ae28f8c0e6dcf91dc87f4eb) --- 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 89e0fad..3239696 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1952,7 +1952,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, IO_STATUS_BLOCK io; BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; - info->data_size = has_wildcard ? 8192 : max_entry_size; + info->data_size = has_wildcard ? 8192 : max_entry_size * 2; while (info->data_size) {

1 0

Andrew Eikum : dsound: Don' t change play position if IAudioClient methods fail.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 50abdd8053aa7994fa7a319f87ad4bf838843df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50abdd8053aa7994fa7a319f8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:41 2013 -0600 dsound: Don't change play position if IAudioClient methods fail. (cherry picked from commit ace3c315b891fbfc801ab20303dce08ad1c76e63) --- dlls/dsound/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 282808e..43b7dca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -605,8 +605,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) if(!prebuf_bytes) return; - device->in_mmdev_bytes += prebuf_bytes; - if(prebuf_bytes + read_offs_bytes > device->buflen){ DWORD chunk_bytes = device->buflen - read_offs_bytes; prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; @@ -631,6 +629,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; + /* check if anything wrapped */ if(prebuf_bytes > 0){ prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; @@ -648,6 +648,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) WARN("ReleaseBuffer failed: %08x\n", hr); return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; } TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes);

1 0

Andrew Eikum : winecoreaudio.drv: Don' t return 0 absolute position if AudioQueue call fails.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: deca08bc93d54a6f06462d80640fa75b1fc00ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca08bc93d54a6f06462d806… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:35 2013 -0600 winecoreaudio.drv: Don't return 0 absolute position if AudioQueue call fails. Some failures are temporary, for example if the user reconfigures their audio setup while playing audio. Returning 0 could have bad "going backward in time" effects which can break audio even after the call starts to succeed again. (cherry picked from commit f53dd40ad881cc7f887c0587d42f70bb07ddd2e0) --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 92be329..7a0b3ff 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -681,6 +681,8 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) if(sc != noErr){ if(sc != kAudioQueueErr_InvalidRunState) WARN("Unable to get current time: %lx\n", sc); + if(mode == BUFPOS_ABSOLUTE) + return This->highest_sampletime; return 0; }

1 0