January 2014 - Wine-Commits

Alexander Nicolaysen Sørnes : screenshots.php: Prevent use of unitialized variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: e58d239b999b8526a7ccca181f00201f50c3fe91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e58d239b999b8526a7ccca18… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Jan 11 17:51:04 2014 +0100 screenshots.php: Prevent use of unitialized variable --- screenshots.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screenshots.php b/screenshots.php index d8ae285..160eefe 100644 --- a/screenshots.php +++ b/screenshots.php @@ -68,6 +68,8 @@ if($hResult && query_num_rows($hResult)) // display thumbnails $c = 1; + + $iCurrentVersionId = 0; // optimization so we don't have to perform as many database queries // only update this variable when $iCurrentVersionId changes

1 0

Alexander Nicolaysen Sørnes : distribution: Mark some functions as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 71ac4f0c838324748f17d8e2a526153318c9a849 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=71ac4f0c838324748f17d8e2… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:34:44 2014 +0100 distribution: Mark some functions as static --- include/distribution.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 354e585..3031d6d 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -504,7 +504,7 @@ class distribution { } /* Get the total number of Distributions in the database */ - function objectGetEntriesCount($sState, $oFilter = null) + public static function objectGetEntriesCount($sState, $oFilter = null) { /* Not implemented */ if($sState == 'rejected') @@ -528,7 +528,7 @@ class distribution { } /* Make a dropdown list of distributions */ - function make_distribution_list($varname, $cvalue) + public static function make_distribution_list($varname, $cvalue) { $sQuery = "SELECT name, distributionId FROM distributions WHERE state = 'accepted' @@ -572,7 +572,7 @@ class distribution { return 'name'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) { /* Not implemented */ if($sState == 'rejected')

1 0

Alexander Nicolaysen Sørnes : version_queue: Fix invocation of non-static function
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 7bbc11aba8edb84953ed691b96882db250fc14ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7bbc11aba8edb84953ed691b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:32:51 2014 +0100 version_queue: Fix invocation of non-static function --- include/version_queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version_queue.php b/include/version_queue.php index d922adc..0b3f132 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -353,7 +353,7 @@ class version_queue function objectDisplayQueueProcessingHelp() { - version::objectDisplayQueueProcessingHelp(); + $this->oVersion->objectDisplayQueueProcessingHelp(); } function objectMoveChildren($iNewId)

1 0

Alexandre Julliard : Wine release 1.6.2
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: website Branch: master Commit: be7cc027d071cc5aa3a47df7f04e2ccbc58b6495 URL: http://source.winehq.org/git/website.git/?a=commit;h=be7cc027d071cc5aa3a47d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:45:10 2014 +0100 Wine release 1.6.2 --- news/en/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2014011001.xml b/news/en/2014011001.xml new file mode 100644 index 0000000..6d4dffb --- /dev/null +++ b/news/en/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>January 10, 2014</date> +<title>Wine 1.6.2 Released</title> +<body> + The Wine maintenance release 1.6.2 is now available. + <a href="{$root}/announce/1.6.2">What's new</a> in this release: +<ul> + <li>Color management support updated to liblcms version 2.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Huw Davies : riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 333365369674b7f1f8d00be4d0c6686c235100a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333365369674b7f1f8d00be4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 10 11:19:08 2013 +0000 riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs. (cherry picked from commit b0f177b61913b9fac1cf8952582d77576705bad1) --- dlls/riched20/caret.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index fd7034d..4b1fea5 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -56,7 +56,19 @@ int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) { - if (ME_GetCursorOfs(&editor->pCursors[0]) < ME_GetCursorOfs(&editor->pCursors[1])) + int from_ofs = ME_GetCursorOfs( &editor->pCursors[0] ); + int to_ofs = ME_GetCursorOfs( &editor->pCursors[1] ); + BOOL swap = (from_ofs > to_ofs); + + if (from_ofs == to_ofs) + { + /* If cursor[0] is at the beginning of a run and cursor[1] at the end + of the prev run then we need to swap. */ + if (editor->pCursors[0].nOffset < editor->pCursors[1].nOffset) + swap = TRUE; + } + + if (!swap) { *from = &editor->pCursors[0]; *to = &editor->pCursors[1];

1 0

Hans Leidekker : mscms: Port to liblcms2.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 5a51c3dfeee562b9342350b3c1ee61cfd8874554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a51c3dfeee562b9342350b3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:02:40 2013 +0200 mscms: Port to liblcms2. (cherry picked from commit d40c91262b91f72c44151a1481a77acfe71ba044) --- configure | 70 +++++++++--------- configure.ac | 20 +++--- dlls/mscms/Makefile.in | 4 +- dlls/mscms/handle.c | 14 ++-- dlls/mscms/icc.c | 93 ++++++++++++++---------- dlls/mscms/mscms_main.c | 22 ++---- dlls/mscms/mscms_priv.h | 70 +++--------------- dlls/mscms/profile.c | 184 ++++++++++++++++++----------------------------- dlls/mscms/transform.c | 28 ++++---- include/config.h.in | 9 +-- 10 files changed, 211 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a51c3dfeee562b934235…

1 0

Huw Davies : mshtml: Remove a double-Release.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 79054f2fd43d02d14d204a8c30a65f78186a45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=79054f2fd43d02d14d204a8c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 20 14:29:34 2013 +0000 mshtml: Remove a double-Release. (cherry picked from commit 72297ebfbb31bd8c5848687e915b785d87e44621) --- dlls/mshtml/nsio.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index da7d930..11d10b1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,9 +1501,6 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, } } - if(This->post_data_stream) - nsIInputStream_Release(This->post_data_stream); - if(aContentLength != -1) FIXME("Unsupported acontentLength = %s\n", wine_dbgstr_longlong(aContentLength));

1 0

Austin English : ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 18175bbc8524c30d6a6e051bdfc46c817af215ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=18175bbc8524c30d6a6e051bd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 19 17:47:02 2013 -0800 ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl. (cherry picked from commit 0dac887f48f2067f90c4556cb5b082345b0ad403) --- dlls/ntdll/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6e5d2a3..f6b5622 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1491,6 +1491,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = RtlImpersonateSelf( SecurityImpersonation ); break; + case FSCTL_IS_VOLUME_MOUNTED: case FSCTL_LOCK_VOLUME: case FSCTL_UNLOCK_VOLUME: FIXME("stub! return success - Unsupported fsctl %x (device=%x access=%x func=%x method=%x)\n",

1 0

Tag wine-1.6.2 : Alexandre Julliard : Release 1.6.2
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: refs/tags/wine-1.6.2 Tag: 2a0860e5e2b30a7d40c3e721374ded8f054a3108 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2a0860e5e2b30a7d40c3e721374d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:37:29 2014 +0100 Release 1.6.2

1 0

Alexandre Julliard : Release 1.6.2.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 40dc905fac617f06e69fe803a8313fa5e6a953b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40dc905fac617f06e69fe803a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:37:29 2014 +0100 Release 1.6.2. --- .mailmap | 1 + ANNOUNCE | 603 +++++++++++++++++++++++-------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 244 insertions(+), 384 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40dc905fac617f06e69fe…

1 0

Austin English : dinput: Consistently use GetCurrentTime().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9d44303a2963bdcd4a2c6ae107e248f2fdfef9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d44303a2963bdcd4a2c6ae10… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 10 16:45:28 2013 -0800 dinput: Consistently use GetCurrentTime(). (cherry picked from commit bfafb1ffc5a102966025b5b9f3acb81fea5435d1) --- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d973a84..dc6e9e3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -689,8 +689,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } } if (inst_id >= 0) - queue_event(iface, inst_id, - value, jse.time, This->generic.base.dinput->evsequence++); + queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5d1cacc..23d8d45 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -873,7 +873,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } if (inst_id >= 0) queue_event(iface, inst_id, - value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); + value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e8e7515..a5967d7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -126,7 +126,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, hook->time, This->base.dinput->evsequence++); + new_diks, GetCurrentTime(), This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret;

1 0

Ken Thomases : dbghelp: For Mach-O, get the address of the process' s image info from its PEB.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: e5f7aeadf113bb080f1202c9f42953b23869a159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f7aeadf113bb080f1202c9f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:08:06 2013 -0600 dbghelp: For Mach-O, get the address of the process's image info from its PEB. (cherry picked from commit 1577fb6c3f5941a9b2ba1fec7e38e61cdfa2b757) --- dlls/dbghelp/macho_module.c | 57 +++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1aaa7f1..e39e2ce 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -24,6 +24,8 @@ #include "config.h" #include "wine/port.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "dbghelp_private.h" #ifdef HAVE_MACH_O_LOADER_H @@ -948,23 +950,52 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, */ if (macho_info->flags & MACHO_INFO_DEBUG_HEADER) { - static void* dyld_all_image_infos_addr; + PROCESS_BASIC_INFORMATION pbi; + NTSTATUS status; - /* This symbol should be in the same place in all processes. */ - if (!dyld_all_image_infos_addr) + ret = FALSE; + + /* Get address of PEB */ + status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status == STATUS_SUCCESS) { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; + ULONG dyld_image_info; + + /* Read dyld image info address from PEB */ + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + &dyld_image_info, sizeof(dyld_image_info), NULL)) + { + TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", + dyld_image_info, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + macho_info->dbg_hdr_addr = dyld_image_info; + ret = TRUE; + } } - if (dyld_all_image_infos_addr) - macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; - else - ret = FALSE; - TRACE("dbg_hdr_addr = 0x%08lx\n", macho_info->dbg_hdr_addr); + if (!ret) + { + static void* dyld_all_image_infos_addr; + + /* Our next best guess is that dyld was loaded at its base address + and we can find the dyld image infos address by looking up its symbol. */ + if (!dyld_all_image_infos_addr) + { + struct nlist nl[2]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; + if (!nlist("/usr/lib/dyld", nl)) + dyld_all_image_infos_addr = (void*)nl[0].n_value; + } + + if (dyld_all_image_infos_addr) + { + TRACE("got dyld_image_info %p from /usr/lib/dyld symbol table\n", + dyld_all_image_infos_addr); + macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; + ret = TRUE; + } + } } if (macho_info->flags & MACHO_INFO_MODULE)

1 0

Austin English : apphelp: Add a stub for ShimFlushCache.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: b278116f373bd2b2dbcf9915698a8d6636cad27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278116f373bd2b2dbcf99156… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 2 15:58:46 2013 -0800 apphelp: Add a stub for ShimFlushCache. (cherry picked from commit 58bb2608859488a618267a8ed904b61b182cbecb) --- dlls/apphelp/apphelp.c | 7 +++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index a82bc94..e8fce78 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -74,3 +74,10 @@ BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags if (flags) *flags = 0; return TRUE; } + +BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int cmd ) +{ + FIXME("stub: %p %p %s %u\n", hwnd, instance, debugstr_a(cmdline), cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 76af9ad..60d931c 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -164,4 +164,4 @@ @ stub SetPermLayers @ stub ShimDbgPrint @ stub ShimDumpCache -@ stub ShimFlushCache +@ stdcall ShimFlushCache(ptr ptr str long)

1 0

Stefan Leichter : dbghelp: Add a null check for optional output parameter for function SymFromAddr.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1cfe8fb3b2dacdd2e051d5dfd68cc3a11b4b6b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfe8fb3b2dacdd2e051d5dfd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 1 22:07:20 2013 +0100 dbghelp: Add a null check for optional output parameter for function SymFromAddr. (cherry picked from commit 89832cde4eb2e8d2dc9570cf4840fcaff19b8429) --- dlls/dbghelp/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ebc4644..26a8bec 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1229,7 +1229,8 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); - *Displacement = Address - Symbol->Address; + if (Displacement) + *Displacement = Address - Symbol->Address; return TRUE; }

1 0

Nikolay Sivov : qmgr: Implement IBackgroundCopyManager::GetJob().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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

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

Jan. 10, 2014

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 Jan. 10, 2014

Jan. 10, 2014

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

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

Jan. 10, 2014

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

Ken Thomases : winemac: Include the OpenGL headers to fix building on OS X 10.9.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1b431ea7dca4f0569c138ce10b09b34e935fdfc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b431ea7dca4f0569c138ce10… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:02:28 2013 -0600 winemac: Include the OpenGL headers to fix building on OS X 10.9. (cherry picked from commit f0c4354a6bd0eeab094124f76987fa7de299c978) --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 45799db..6c2dbf2 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <OpenGL/gl.h> #import "cocoa_opengl.h" #include "macdrv_cocoa.h"

1 0

Hans Leidekker : msi: Fix handling of empty mask edit templates.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d020cc02b37c50d45cd84664be7e82c65e2b3f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d020cc02b37c50d45cd84664b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 11:18:06 2013 +0100 msi: Fix handling of empty mask edit templates. (cherry picked from commit 3271b982632e7730d6cee373f4c9a4af37012036) --- dlls/msi/dialog.c | 59 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 80e2d68..5347005 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1781,24 +1781,33 @@ static void msi_mask_control_change( struct msi_maskedit_info *info ) val = msi_alloc( (info->num_chars+1)*sizeof(WCHAR) ); for( i=0, n=0; i<info->num_groups; i++ ) { - if( (info->group[i].len + n) > info->num_chars ) + if (info->group[i].len == ~0u) { - ERR("can't fit control %d text into template\n",i); - break; - } - if (!msi_mask_editable(info->group[i].type)) - { - for(r=0; r<info->group[i].len; r++) - val[n+r] = info->group[i].type; - val[n+r] = 0; + UINT len = SendMessageW( info->group[i].hwnd, WM_GETTEXTLENGTH, 0, 0 ); + val = msi_realloc( val, (len + 1) * sizeof(WCHAR) ); + GetWindowTextW( info->group[i].hwnd, val, len + 1 ); } else { - r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); - if( r != info->group[i].len ) + if (info->group[i].len + n > info->num_chars) + { + ERR("can't fit control %d text into template\n",i); break; + } + if (!msi_mask_editable(info->group[i].type)) + { + for(r=0; r<info->group[i].len; r++) + val[n+r] = info->group[i].type; + val[n+r] = 0; + } + else + { + r = GetWindowTextW( info->group[i].hwnd, &val[n], info->group[i].len+1 ); + if( r != info->group[i].len ) + break; + } + n += r; } - n += r; } TRACE("%d/%d controls were good\n", i, info->num_groups); @@ -1893,14 +1902,14 @@ msi_maskedit_set_text( struct msi_maskedit_info *info, LPCWSTR text ) static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { - struct msi_maskedit_info * info = NULL; + struct msi_maskedit_info *info; int i = 0, n = 0, total = 0; LPCWSTR p; TRACE("masked control, template %s\n", debugstr_w(mask)); if( !mask ) - return info; + return NULL; info = msi_alloc_zero( sizeof *info ); if( !info ) @@ -1916,7 +1925,16 @@ static struct msi_maskedit_info * msi_dialog_parse_groups( LPCWSTR mask ) { /* stop at the end of the string */ if( p[0] == 0 || p[0] == '>' ) + { + if (!total) + { + /* create a group for the empty mask */ + info->group[0].type = '&'; + info->group[0].len = ~0u; + i = 1; + } break; + } /* count the number of the same identifier */ for( n=0; p[n] == p[0]; n++ ) @@ -1962,9 +1980,16 @@ msi_maskedit_create_children( struct msi_maskedit_info *info, LPCWSTR font ) { if (!msi_mask_editable( info->group[i].type )) continue; - wx = (info->group[i].ofs * width) / info->num_chars; - ww = (info->group[i].len * width) / info->num_chars; - + if (info->num_chars) + { + wx = (info->group[i].ofs * width) / info->num_chars; + ww = (info->group[i].len * width) / info->num_chars; + } + else + { + wx = 0; + ww = width; + } hwnd = CreateWindowW( szEdit, NULL, style, wx, 0, ww, height, info->hwnd, NULL, NULL, NULL ); if( !hwnd )

1 0

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