February 2008 - Wine-Commits

Rob Shearman : kernel32: Fix use of uninitialised nameW and typeW in find_resourceA.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 45ba200f192872df67fe9dcef8782e0a64649ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ba200f192872df67fe9dcef… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:11:52 2008 +0000 kernel32: Fix use of uninitialised nameW and typeW in find_resourceA. --- dlls/kernel32/resource.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 2fbf263..f49ea24 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -132,6 +132,9 @@ static HRSRC find_resourceA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD lan LDR_RESOURCE_INFO info; const IMAGE_RESOURCE_DATA_ENTRY *entry = NULL; + nameW.Buffer = NULL; + typeW.Buffer = NULL; + __TRY { if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) goto done;

1 0

Rob Shearman : dxdiagn: Fix the variable that the result of GetFileVersionInfoW is assigned to in DXDiag_AddFileDescContainer .
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: cebc73e3735c5284b026d58a8576aca0bed1d425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebc73e3735c5284b026d58a8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:11:33 2008 +0000 dxdiagn: Fix the variable that the result of GetFileVersionInfoW is assigned to in DXDiag_AddFileDescContainer. --- dlls/dxdiagn/provider.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 4c19d02..23da024 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -207,7 +207,7 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH retval = GetFileVersionInfoSizeW(szFile, &hdl); pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); - hr = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); + boolret = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); boolret = VerQueryValueW(pVersionInfo, szSlashSep, (LPVOID) &pFileInfo, &uiLength); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile);

1 0

Rob Shearman : msisys.ocx: Fix the signature of DllGetClassObject to match that declared in the headers .
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: e6539d967d749e0d1de79ca9bb84927cdae2b7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6539d967d749e0d1de79ca9b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:10:56 2008 +0000 msisys.ocx: Fix the signature of DllGetClassObject to match that declared in the headers. --- dlls/msisys.ocx/msisys.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msisys.ocx/msisys.c b/dlls/msisys.ocx/msisys.c index e5ee4ed..3863fba 100644 --- a/dlls/msisys.ocx/msisys.c +++ b/dlls/msisys.ocx/msisys.c @@ -93,7 +93,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /*********************************************************************** * DllGetClassObject (MSISYS.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, const IID* piid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { FIXME("\n");

1 0

Alistair Leslie-Hughes : msxml3: Correct IXMLDOMProcessingInstruction_put_data function.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: c61937b6d4ef7f313052b1c519f292e80d53db01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61937b6d4ef7f313052b1c51… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 29 20:54:53 2008 +1100 msxml3: Correct IXMLDOMProcessingInstruction_put_data function. --- dlls/msxml3/pi.c | 15 +++++++++++++++ dlls/msxml3/tests/domdoc.c | 14 +------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 90425fd..44e8a8b 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -506,9 +506,24 @@ static HRESULT WINAPI dom_pi_put_data( dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); HRESULT hr = E_FAIL; VARIANT val; + BSTR sTarget; + static WCHAR szXML[] = {'x','m','l',0}; TRACE("%p %s\n", This, debugstr_w(data) ); + /* Cannot set data to a PI node whos target is 'xml' */ + hr = dom_pi_get_nodeName(iface, &sTarget); + if(hr == S_OK) + { + if(lstrcmpW( sTarget, szXML) == 0) + { + SysFreeString(sTarget); + return E_FAIL; + } + + SysFreeString(sTarget); + } + V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2ced1cc..23fb1f3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -682,19 +682,7 @@ static void test_domdoc( void ) /* test put_data */ r = IXMLDOMProcessingInstruction_put_data(nodePI, _bstr_("version=\"1.0\" encoding=\"UTF-8\"")); - ok(r == S_OK, "ret %08x\n", r ); - SysFreeString(str); - - r = IXMLDOMProcessingInstruction_get_data(nodePI, &str); - ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("version=\"1.0\" encoding=\"UTF-8\"") ), "incorrect data string\n"); - SysFreeString(str); - - /* Confirm XML text is good */ - r = IXMLDOMProcessingInstruction_get_xml(nodePI, &str); - ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( str, _bstr_("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ), "incorrect xml string\n"); - SysFreeString(str); + ok(r == E_FAIL, "ret %08x\n", r ); IXMLDOMProcessingInstruction_Release(nodePI); }

1 0

Andrew Talbot : imm32: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 23dd9dc088c6fabdd51c1680bd85bcb142e8f94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dd9dc088c6fabdd51c1680b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 11:07:14 2008 +0000 imm32: Assign to structs instead of using memcpy. --- dlls/imm32/imm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 436c126..4ce857d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1014,7 +1014,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) if (!data) return FALSE; - memcpy(lpCompForm,&(data->IMC.cfCompForm),sizeof(COMPOSITIONFORM)); + *lpCompForm = data->IMC.cfCompForm; return 1; } @@ -1614,7 +1614,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) if (!data) return FALSE; - memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTW)); + data->IMC.lfFont.W = *lplf; ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) @@ -1751,7 +1751,7 @@ BOOL WINAPI ImmSetCompositionWindow( if (!data) return FALSE; - memcpy(&data->IMC.cfCompForm,lpCompForm,sizeof(COMPOSITIONFORM)); + data->IMC.cfCompForm = *lpCompForm; if (IsWindowVisible(hwndDefault)) {

1 0

Andrew Talbot : hlink: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: ad606f4d260833f7051ed5bcdd991c55e999adad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad606f4d260833f7051ed5bcd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 10:44:01 2008 +0000 hlink: Assign to struct instead of using memcpy. --- dlls/hlink/link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 1720006..ca9f12c 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -602,7 +602,7 @@ static HRESULT WINAPI IPersistStream_fnGetClassID(IPersistStream* iface, { HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); TRACE("(%p)\n", This); - memcpy(pClassID, &CLSID_StdHlink, sizeof(CLSID)); + *pClassID = CLSID_StdHlink; return S_OK; }

1 0

Louis Lenders : programs: Add a stubbed out secedit.exe.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 6547fef34b33420b6189d097fc1e3d445295f463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6547fef34b33420b6189d097f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Feb 26 22:12:40 2008 +0000 programs: Add a stubbed out secedit.exe. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + programs/Makefile.in | 2 ++ programs/secedit/Makefile.in | 14 ++++++++++++++ programs/secedit/main.c | 22 ++++++++++++++++++++++ 7 files changed, 45 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index c3b6cca..61d4f61 100644 --- a/.gitignore +++ b/.gitignore @@ -702,6 +702,7 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/rpcss/rpcss programs/rundll32/rundll32 +programs/secedit/secedit programs/spoolsv/spoolsv programs/start/rsrc.res programs/start/start diff --git a/Makefile.in b/Makefile.in index 2edfc8d..164763b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -523,6 +523,7 @@ ALL_MAKEFILES = \ programs/regsvr32/Makefile \ programs/rpcss/Makefile \ programs/rundll32/Makefile \ + programs/secedit/Makefile \ programs/spoolsv/Makefile \ programs/start/Makefile \ programs/svchost/Makefile \ @@ -938,6 +939,7 @@ programs/regedit/Makefile: programs/regedit/Makefile.in programs/Makeprog.rules programs/regsvr32/Makefile: programs/regsvr32/Makefile.in programs/Makeprog.rules programs/rpcss/Makefile: programs/rpcss/Makefile.in programs/Makeprog.rules programs/rundll32/Makefile: programs/rundll32/Makefile.in programs/Makeprog.rules +programs/secedit/Makefile: programs/secedit/Makefile.in programs/Makeprog.rules programs/spoolsv/Makefile: programs/spoolsv/Makefile.in programs/Makeprog.rules programs/start/Makefile: programs/start/Makefile.in programs/Makeprog.rules programs/svchost/Makefile: programs/svchost/Makefile.in programs/Makeprog.rules diff --git a/configure b/configure index 9e03348..71c9b66 100755 --- a/configure +++ b/configure @@ -21897,6 +21897,8 @@ ac_config_files="$ac_config_files programs/rpcss/Makefile" ac_config_files="$ac_config_files programs/rundll32/Makefile" +ac_config_files="$ac_config_files programs/secedit/Makefile" + ac_config_files="$ac_config_files programs/spoolsv/Makefile" ac_config_files="$ac_config_files programs/start/Makefile" @@ -22898,6 +22900,7 @@ do "programs/regsvr32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/regsvr32/Makefile" ;; "programs/rpcss/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rpcss/Makefile" ;; "programs/rundll32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rundll32/Makefile" ;; + "programs/secedit/Makefile") CONFIG_FILES="$CONFIG_FILES programs/secedit/Makefile" ;; "programs/spoolsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/spoolsv/Makefile" ;; "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;; "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;; diff --git a/configure.ac b/configure.ac index f1071de..014f601 100644 --- a/configure.ac +++ b/configure.ac @@ -2022,6 +2022,7 @@ AC_CONFIG_FILES([programs/regedit/Makefile]) AC_CONFIG_FILES([programs/regsvr32/Makefile]) AC_CONFIG_FILES([programs/rpcss/Makefile]) AC_CONFIG_FILES([programs/rundll32/Makefile]) +AC_CONFIG_FILES([programs/secedit/Makefile]) AC_CONFIG_FILES([programs/spoolsv/Makefile]) AC_CONFIG_FILES([programs/start/Makefile]) AC_CONFIG_FILES([programs/svchost/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index 3c128e1..15fd7bd 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -25,6 +25,7 @@ SUBDIRS = \ regsvr32 \ rpcss \ rundll32 \ + secedit \ spoolsv \ start \ svchost \ @@ -69,6 +70,7 @@ INSTALLSUBDIRS = \ regsvr32 \ rpcss \ rundll32 \ + secedit \ spoolsv \ start \ svchost \ diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in new file mode 100644 index 0000000..ddebe86 --- /dev/null +++ b/programs/secedit/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = secedit.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = \ + main.c \ + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/secedit/main.c b/programs/secedit/main.c new file mode 100644 index 0000000..878adc9 --- /dev/null +++ b/programs/secedit/main.c @@ -0,0 +1,22 @@ +/* + * 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 + */ + +#include <stdlib.h> + +int main() +{ + return 0; +}

1 0

Andrew Talbot : hid: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 18da6f23a2aa3f4dbcff28212dbbc0ae5dc6506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=18da6f23a2aa3f4dbcff28212… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 29 10:43:56 2008 +0000 hid: Assign to struct instead of using memcpy. --- dlls/hid/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 17eee9a..1869bb5 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -53,5 +53,5 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) void WINAPI HidD_GetHidGuid(LPGUID guid) { TRACE("(%p)\n", guid); - memcpy(guid, &HID_GUID, sizeof(GUID)); + *guid = HID_GUID; }

1 0

Dmitry Timoshkov : kernel32: Add stubs for fiber local storage APIs.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: e49e8b20dbe8f4f101dae7fdeacdba4e6b4b6a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49e8b20dbe8f4f101dae7fde… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 29 17:19:43 2008 +0800 kernel32: Add stubs for fiber local storage APIs. --- dlls/kernel32/fiber.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +++ include/winbase.h | 5 ++++ include/winnt.h | 1 + 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index 24ea351..e95ef86 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -34,6 +34,9 @@ #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fiber); struct fiber_data { @@ -201,3 +204,48 @@ void WINAPI SwitchToFiber( LPVOID fiber ) siglongjmp( new_fiber->jmpbuf, 1 ); } } + +/*********************************************************************** + * FlsAlloc (KERNEL32.@) + */ +DWORD WINAPI FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) +{ + FIXME( "%p: stub!\n", callback ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FLS_OUT_OF_INDEXES; +} + +/*********************************************************************** + * FlsFree (KERNEL32.@) + */ +BOOL WINAPI FlsFree( DWORD index ) +{ + FIXME( "%x: stub!\n", index ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** + * FlsGetValue (KERNEL32.@) + */ +PVOID WINAPI FlsGetValue( DWORD index ) +{ + FIXME( "%x: stub!\n", index ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return NULL; +} + +/*********************************************************************** + * FlsSetValue (KERNEL32.@) + */ +BOOL WINAPI FlsSetValue( DWORD index, PVOID data ) +{ + + FIXME( "%x, %p: stub!\n", index, data ); + + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6bc867f..112efbf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -388,6 +388,10 @@ @ stdcall FindResourceW(long wstr wstr) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) +@ stdcall FlsAlloc(ptr) +@ stdcall FlsFree(long) +@ stdcall FlsGetValue(long) +@ stdcall FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) diff --git a/include/winbase.h b/include/winbase.h index 0011c53..e2ee515 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -315,6 +315,7 @@ typedef struct _PROCESS_HEAP_ENTRY #define LOCKFILE_FAIL_IMMEDIATELY 1 #define LOCKFILE_EXCLUSIVE_LOCK 2 +#define FLS_OUT_OF_INDEXES ((DWORD)~0UL) #define TLS_OUT_OF_INDEXES ((DWORD)~0UL) #define SHUTDOWN_NORETRY 1 @@ -1499,6 +1500,10 @@ WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); #define FindNextVolumeMountPoint WINELIB_NAME_AW(FindNextVolumeMountPoint) WINBASEAPI BOOL WINAPI FindVolumeClose(HANDLE); WINBASEAPI BOOL WINAPI FindVolumeMountPointClose(HANDLE); +WINBASEAPI DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION); +WINBASEAPI BOOL WINAPI FlsFree(DWORD); +WINBASEAPI PVOID WINAPI FlsGetValue(DWORD); +WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); diff --git a/include/winnt.h b/include/winnt.h index 4489e93..cfd1cac 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4699,6 +4699,7 @@ typedef struct _RTL_CRITICAL_SECTION { } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); +typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID ); #include <pshpack8.h> typedef struct _IO_COUNTERS {

1 0

Roy Shea : qmgr: Implement GetLocalName and GetRemoteName for IBackgroundCopyFile.
by Alexandre Julliard Feb. 29, 2008

Feb. 29, 2008

Module: wine Branch: master Commit: 4866d1bde66848f550ca39ba2686e052bcfc126f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4866d1bde66848f550ca39ba2… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Thu Feb 28 18:59:26 2008 -0800 qmgr: Implement GetLocalName and GetRemoteName for IBackgroundCopyFile. --- dlls/qmgr/file.c | 24 +++++- dlls/qmgr/tests/Makefile.in | 1 + dlls/qmgr/tests/file.c | 172 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 60958f5..ad5546f 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -68,21 +68,35 @@ static ULONG WINAPI BITS_IBackgroundCopyFile_Release( return ref; } -/*** IBackgroundCopyFile methods ***/ +/* Get the remote name of a background copy file */ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetRemoteName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + int n = (lstrlenW(This->info.RemoteName) + 1) * sizeof(WCHAR); + + *pVal = CoTaskMemAlloc(n); + if (!*pVal) + return E_OUTOFMEMORY; + + memcpy(*pVal, This->info.RemoteName, n); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + int n = (lstrlenW(This->info.LocalName) + 1) * sizeof(WCHAR); + + *pVal = CoTaskMemAlloc(n); + if (!*pVal) + return E_OUTOFMEMORY; + + memcpy(*pVal, This->info.LocalName, n); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index b70f662..840676d 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = ole32 shlwapi user32 kernel32 CTESTS = \ enum_files.c \ + file.c \ job.c \ qmgr.c diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c new file mode 100644 index 0000000..b1fb954 --- /dev/null +++ b/dlls/qmgr/tests/file.c @@ -0,0 +1,172 @@ +/* + * Unit test suite for Background Copy File Interface + * + * Copyright 2007 Google (Roy Shea) + * + * 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 + */ + +#include <stdio.h> + +#include <shlwapi.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "bits.h" + +/* Globals used by many tests */ +#define NUM_FILES 1 +static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; +static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; +static WCHAR test_localFile[MAX_PATH]; +static WCHAR test_remoteUrl[MAX_PATH]; +static const ULONG test_fileCount = NUM_FILES; +static const WCHAR test_displayName[] = {'T','e','s','t', 0}; +static IBackgroundCopyJob *test_job; +static IBackgroundCopyManager *test_manager; +static IEnumBackgroundCopyFiles *test_enumFiles; +static IBackgroundCopyFile *test_file; + +/* Helper function to add a file to a job. The helper function takes base + file name and creates properly formed path and URL strings for creation of + the file. */ +static HRESULT addFileHelper(IBackgroundCopyJob* job, + const WCHAR *localName, const WCHAR *remoteName) +{ + DWORD urlSize; + + GetCurrentDirectoryW(MAX_PATH, test_localFile); + PathAppendW(test_localFile, localName); + GetCurrentDirectoryW(MAX_PATH, test_remoteUrl); + PathAppendW(test_remoteUrl, remoteName); + urlSize = MAX_PATH; + UrlCreateFromPathW(test_remoteUrl, test_remoteUrl, &urlSize, 0); + UrlUnescapeW(test_remoteUrl, NULL, &urlSize, URL_UNESCAPE_INPLACE); + return IBackgroundCopyJob_AddFile(test_job, test_remoteUrl, test_localFile); +} + +/* Generic test setup */ +static BOOL setup(void) +{ + HRESULT hres; + GUID test_jobId; + + test_manager = NULL; + test_job = NULL; + memset(&test_jobId, 0, sizeof test_jobId); + + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &test_manager); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, + BG_JOB_TYPE_DOWNLOAD, &test_jobId, &test_job); + if(hres != S_OK) + { + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + if (addFileHelper(test_job, test_localName, test_remoteName) != S_OK + || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) + { + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + hres = IEnumBackgroundCopyFiles_Next(test_enumFiles, 1, &test_file, NULL); + if(hres != S_OK) + { + IEnumBackgroundCopyFiles_Release(test_enumFiles); + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + return TRUE; +} + +/* Generic test cleanup */ +static void teardown(void) +{ + IBackgroundCopyFile_Release(test_file); + IEnumBackgroundCopyFiles_Release(test_enumFiles); + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); +} + +/* Test that the remote name is properly set */ +static void test_GetRemoteName(void) +{ + HRESULT hres; + LPWSTR name; + + hres = IBackgroundCopyFile_GetRemoteName(test_file, &name); + ok(hres == S_OK, "GetRemoteName failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get remote name of test_file.\n"); + return; + } + ok(lstrcmpW(name, test_remoteUrl) == 0, "Got incorrect remote name\n"); + CoTaskMemFree(name); +} + +/* Test that the local name is properly set */ +static void test_GetLocalName(void) +{ + HRESULT hres; + LPWSTR name; + + hres = IBackgroundCopyFile_GetLocalName(test_file, &name); + ok(hres == S_OK, "GetLocalName failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get local name of test_file.\n"); + return; + } + ok(lstrcmpW(name, test_localFile) == 0, "Got incorrect local name\n"); + CoTaskMemFree(name); +} + +typedef void (*test_t)(void); + +START_TEST(file) +{ + static const test_t tests[] = { + test_GetRemoteName, + test_GetLocalName, + 0 + }; + const test_t *test; + + CoInitialize(NULL); + for (test = tests; *test; ++test) + { + /* Keep state seperate between tests. */ + if (!setup()) + { + skip("Unable to setup test\n"); + break; + } + (*test)(); + teardown(); + } + CoUninitialize(); +}

1 0