January 2014 - Wine-commits

Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::SetDescription().
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::GetDescription().
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

Nikolay Sivov : qmgr: Implement IBackgroundCopyManager::GetJob().
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 85d317bf195f6d470076fc7ad9dd7209390a7888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d317bf195f6d470076fc7ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:43:29 2013 +0400 qmgr: Implement IBackgroundCopyManager::GetJob(). (cherry picked from commit 421a26a9a855b36f1f92bd30db892afcffced048) --- dlls/qmgr/qmgr.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index bb66410..adbc94b 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -74,10 +74,34 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManag } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, - REFGUID jobID, IBackgroundCopyJob **ppJob) + REFGUID jobID, IBackgroundCopyJob **job) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyManagerImpl *qmgr = &globalMgr; + HRESULT hr = BG_E_NOT_FOUND; + BackgroundCopyJobImpl *cur; + + TRACE("(%s %p)\n", debugstr_guid(jobID), job); + + if (!job || !jobID) return E_INVALIDARG; + + *job = NULL; + + EnterCriticalSection(&qmgr->cs); + + LIST_FOR_EACH_ENTRY(cur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + if (IsEqualGUID(&cur->jobId, jobID)) + { + *job = (IBackgroundCopyJob*)&cur->IBackgroundCopyJob2_iface; + IBackgroundCopyJob2_AddRef(&cur->IBackgroundCopyJob2_iface); + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&qmgr->cs); + + return hr; } static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface,

1 0

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

10 Jan '14

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

Nikolay Sivov : server: Return key name info for KeyNameInformation class.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 7a41c9890d0dceb83008129d568fcbbba357492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a41c9890d0dceb83008129d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 19 08:40:49 2013 +0400 server: Return key name info for KeyNameInformation class. (cherry picked from commit 56aa5d8a5f805fb21c9d91a0cc945351a8b78acf) --- server/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/registry.c b/server/registry.c index fb9c06d..1436bfe 100644 --- a/server/registry.c +++ b/server/registry.c @@ -886,6 +886,7 @@ static void enum_key( const struct key *key, int index, int info_class, switch(info_class) { case KeyBasicInformation: + case KeyNameInformation: classlen = 0; /* only return the name */ /* fall through */ case KeyNodeInformation:

1 0

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

10 Jan '14

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

Hans Leidekker : msi: Don't add text to the scrollable text control twice.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 788ba3345e98f82352c02ce67c04508923dd55bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=788ba3345e98f82352c02ce67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 19 13:36:10 2013 +0100 msi: Don't add text to the scrollable text control twice. (cherry picked from commit f222582af6806bdd0aaab954bc87457b297647db) --- dlls/msi/dialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5347005..d78b721 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -739,12 +739,13 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog, MSIRECORD *rec, LPCWSTR szCls, DWORD style ) { DWORD attributes; - LPCWSTR text, name; + const WCHAR *text = NULL, *name, *control_type; DWORD exstyle = 0; name = MSI_RecordGetString( rec, 2 ); + control_type = MSI_RecordGetString( rec, 3 ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = MSI_RecordGetString( rec, 10 ); + if (strcmpW( control_type, szScrollableText )) text = MSI_RecordGetString( rec, 10 ); TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style);

1 0

Detlef Riekenberg : tools: make_authors is no longer used.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 76ee2bdec72f7546fbac3e3dbbed121600490e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ee2bdec72f7546fbac3e3db… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 19 16:39:44 2013 +0100 tools: make_authors is no longer used. (cherry picked from commit b87b9f04d7b07be6d5715c58ace47b699c5ac30d) --- tools/make_authors | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/tools/make_authors b/tools/make_authors deleted file mode 100755 index eeaba02..0000000 --- a/tools/make_authors +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl -w -# -# Generate AUTHORS -# -# Copyright 1998 Alexandre Julliard -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# -use strict; - -my @authors; -open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; -while(<AUTHORS>) - { - print NEWAUTHORS; - last if /^$/; - } -while(<AUTHORS>) - { - chop; - push @authors, $_; - } - -# Sort them -sub cmpnames() - { - my @anames = split(" ",$a); - my @bnames = split(" ",$b); - my $ret; - $ret = $anames[-1] cmp $bnames[-1]; - $ret = $anames[0] cmp $bnames[0] unless $ret; - return $ret; - } -(a)authors = sort cmpnames @authors; - -# Print authors -print NEWAUTHORS (join "\n", @authors) . "\n"; -print "Created AUTHORS.new\n";

1 0

Jacek Caban : widl: Include resource id in typelib path if not default.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 4d9a68589d2ba85d5cbe58584cb1dd5131f4ed25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9a68589d2ba85d5cbe58584… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 12 17:30:45 2013 +0100 widl: Include resource id in typelib path if not default. (cherry picked from commit 318931bd46e3c526b2ec5e2d5bcecaa704e123be) --- tools/widl/register.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index d8b34d9..9a4f219 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -280,6 +280,8 @@ void output_typelib_regscript( const typelib_t *typelib ) const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); unsigned int flags = 0; + char id_part[12] = ""; + expr_t *expr; if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ if (is_attr( typelib->attrs, ATTR_CONTROL )) flags |= 2; /* LIBFLAG_FCONTROL */ @@ -295,8 +297,11 @@ void output_typelib_regscript( const typelib_t *typelib ) put_str( indent, "'%u.%u' = s '%s'\n", MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); put_str( indent++, "{\n" ); - put_str( indent, "'%x' { %s = s '%%MODULE%%' }\n", - lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32" ); + expr = get_attrp( typelib->attrs, ATTR_ID ); + if (expr) + sprintf(id_part, "\\%d", expr->cval); + put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", + lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32", id_part ); put_str( indent, "FLAGS = s '%u'\n", flags ); put_str( --indent, "}\n" ); put_str( --indent, "}\n" );

1 0

Hans Leidekker : advapi32: Return a fake handle from LogonUserW.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 1395dc1cf5a9cf959467b0cdeb2ae8a6b7ff16df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1395dc1cf5a9cf959467b0cde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:31:54 2013 +0100 advapi32: Return a fake handle from LogonUserW. (cherry picked from commit 02970b578eb3bd46810508f622437e107abc541d) --- dlls/advapi32/advapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 7025a21..860c728 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -280,6 +280,7 @@ BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPa FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername), debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + *phToken = (HANDLE *)0xdeadbeef; return TRUE; }

1 0