February 2008 - Wine-Commits

Alistair Leslie-Hughes : msvcrt: Implement wcscpy_s.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 00609d5e7824a117084f3f4b75e1aec03b60102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00609d5e7824a117084f3f4b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 27 19:58:04 2008 +1100 msvcrt: Implement wcscpy_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/string.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 38 +++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d6cffcb..7b821e6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -761,6 +761,7 @@ @ cdecl wcscmp(wstr wstr) ntdll.wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) ntdll.wcslen diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c6dcd34..4201c5e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -50,6 +50,7 @@ static int* (*pmemcmp)(void *, const void *, size_t n); static int (*pstrcpy_s)(char *dst, size_t len, const char *src); static int (*pstrcat_s)(char *dst, size_t len, const char *src); static int (*p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); +static int (*p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -562,6 +563,47 @@ static void test__mbsnbcpy_s(void) dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } +static void test_wcscpy_s(void) +{ + static const WCHAR szLongText[] = { 'T','h','i','s','A','L','o','n','g','s','t','r','i','n','g',0 }; + static WCHAR szDest[18]; + static WCHAR szDestShort[8]; + int ret; + + if(!p_wcscpy_s) + { + skip("wcscpy_s not found\n"); + return; + } + + /* Test NULl Dest */ + ret = p_wcscpy_s(NULL, 18, szLongText); + ok(ret == EINVAL, "p_wcscpy_s expect EINVAL got %d\n", ret); + + /* Test NULl Source */ + szDest[0] = 'A'; + ret = p_wcscpy_s(szDest, 18, NULL); + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + /* Test invalid size */ + szDest[0] = 'A'; + ret = p_wcscpy_s(szDest, 0, szLongText); + ok(ret == ERANGE, "expected ERANGE got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + /* Copy same buffer size */ + ret = p_wcscpy_s(szDest, 18, szLongText); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + + /* Copy smaller buffer size */ + szDest[0] = 'A'; + ret = p_wcscpy_s(szDestShort, 8, szLongText); + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); +} + START_TEST(string) { char mem[100]; @@ -577,6 +619,7 @@ START_TEST(string) SET(pstrcpy_s,"strcpy_s"); SET(pstrcat_s,"strcat_s"); SET(p_mbsnbcpy_s,"_mbsnbcpy_s"); + SET(p_wcscpy_s,"wcscpy_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -599,4 +642,6 @@ START_TEST(string) test_strcpy_s(); test_strcat_s(); test__mbsnbcpy_s(); + + test_wcscpy_s(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 92dd644..c6f3e95 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -971,3 +971,41 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) { return isxdigitW( wc ); } + +/********************************************************************* + * wcscpy_s (MSVCRT.@) + */ +INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) +{ + INT size = 0; + + if(!wcDest) + return MSVCRT_EINVAL; + + if(!wcSrc) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } + + if(numElement == 0) + { + wcDest[0] = 0; + return MSVCRT_ERANGE; + } + + size = strlenW(wcSrc) + 1; + + if(size > numElement) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } + + if(size > numElement) + size = numElement; + + memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + + return 0; +}

1 0

Alexandre Julliard : mscms/tests: The tests shouldn' t fail if we have some ICM files.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 5ddcb2c1d36b676da2b9db714225ce3772dc6378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddcb2c1d36b676da2b9db714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 14:44:22 2008 +0100 mscms/tests: The tests shouldn't fail if we have some ICM files. --- dlls/mscms/tests/profile.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index d7e1f6a..68d14d2 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -803,8 +803,10 @@ static void test_EnumColorProfilesA(void) ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - todo_wine - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + if (standardprofile) + ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + else + todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); size = 0; @@ -815,8 +817,10 @@ static void test_EnumColorProfilesA(void) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - todo_wine - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + if (standardprofile) + ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + else + todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -853,8 +857,10 @@ static void test_EnumColorProfilesW(void) ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - todo_wine - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + if (standardprofileW) + ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + else + todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -864,8 +870,10 @@ static void test_EnumColorProfilesW(void) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - todo_wine - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + if (standardprofileW) + ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + else + todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); }

1 0

James Hawkins : propsys: Add an initial implementation of PropVariantChangeType.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 47120f500300e377cd7d86a897e6f9787733d87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47120f500300e377cd7d86a89… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Feb 27 02:38:14 2008 -0600 propsys: Add an initial implementation of PropVariantChangeType. --- dlls/propsys/Makefile.in | 3 +- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/propidl.idl | 2 + include/propvarutil.h | 41 +++++++++++++++++++++ 6 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index dd630b2..1563741 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -6,7 +6,8 @@ MODULE = propsys.dll IMPORTS = kernel32 C_SRCS = \ - propsys_main.c + propsys_main.c \ + propvar.c @MAKE_DLL_RULES@ diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 8de5e4b..a2ae522 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -93,7 +93,7 @@ @ stub PSSetPropertyValue @ stub PSStringFromPropertyKey @ stub PSUnregisterPropertySchema -@ stub PropVariantChangeType +@ stdcall PropVariantChangeType(ptr ptr long long) @ stub PropVariantCompareEx @ stub PropVariantGetBooleanElem @ stub PropVariantGetDoubleElem diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c new file mode 100644 index 0000000..cdfb89f --- /dev/null +++ b/dlls/propsys/propvar.c @@ -0,0 +1,88 @@ +/* + * PropVariant implementation + * + * Copyright 2008 James Hawkins for CodeWeavers + * + * 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 <stdarg.h> +#include <stdio.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" +#include "winuser.h" +#include "shlobj.h" +#include "propvarutil.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + +static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, + REFPROPVARIANT propvarSrc, VARTYPE vt) +{ + SYSTEMTIME time; + + FileTimeToSystemTime(&propvarSrc->u.filetime, &time); + + switch (vt) + { + case VT_LPSTR: + { + static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; + + ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, + lstrlenA(format) + 1); + if (!ppropvarDest->u.pszVal) + return E_OUTOFMEMORY; + + sprintf(ppropvarDest->u.pszVal, format, time.wYear, time.wMonth, + time.wDay, time.wHour, time.wMinute, + time.wSecond, time.wMilliseconds); + + return S_OK; + } + + default: + FIXME("Unhandled target type: %d\n", vt); + } + + return E_FAIL; +} + +/****************************************************************** + * PropVariantChangeType (PROPSYS.@) + */ +HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, + PROPVAR_CHANGE_FLAGS flags, VARTYPE vt) +{ + FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, + propvarSrc->vt, flags, vt); + + switch (propvarSrc->vt) + { + case VT_FILETIME: + return PROPVAR_ConvertFILETIME(ppropvarDest, propvarSrc, vt); + default: + FIXME("Unhandled source type: %d\n", propvarSrc->vt); + } + + return E_FAIL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 1acd285..73d1cb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -326,6 +326,7 @@ SRCDIR_INCLUDES = \ poppack.h \ powrprof.h \ profinfo.h \ + propvarutil.h \ prsht.h \ psapi.h \ pshpack1.h \ diff --git a/include/propidl.idl b/include/propidl.idl index a0d83be..6720988 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -206,6 +206,8 @@ interface IPropertyStorage : IUnknown typedef struct tagPROPVARIANT *LPPROPVARIANT; + cpp_quote("#define REFPROPVARIANT const PROPVARIANT *") + cpp_quote("#define PIDDI_THUMBNAIL 0x00000002L /* VT_BLOB */") cpp_quote("") cpp_quote("#define PIDSI_TITLE 0x00000002L /* VT_LPSTR */") diff --git a/include/propvarutil.h b/include/propvarutil.h new file mode 100644 index 0000000..2573d38 --- /dev/null +++ b/include/propvarutil.h @@ -0,0 +1,41 @@ +/* + * Copyright 2008 James Hawkins for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_PROPVARUTIL_H +#define __WINE_PROPVARUTIL_H + +#include <propidl.h> +#include <shtypes.h> +#include <shlwapi.h> + +enum tagPROPVAR_CHANGE_FLAGS +{ + PVCHF_DEFAULT = 0x00000000, + PVCHF_NOVALUEPROP = 0x00000001, + PVCHF_ALPHABOOL = 0x00000002, + PVCHF_NOUSEROVERRIDE = 0x00000004, + PVCHF_LOCALBOOL = 0x00000008, + PVCHF_NOHEXSTRING = 0x00000010, +}; + +typedef int PROPVAR_CHANGE_FLAGS; + +HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, + PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); + +#endif /* __WINE_PROPVARUTIL_H */

1 0

Roy Shea : qmgr: Implement the IUnknown interface for IEnumBackgroundCopyFiles.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 83aee6b1a30a29d2b8e7052c3a2cc1c48cb29faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aee6b1a30a29d2b8e7052c3… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Feb 26 17:52:04 2008 -0800 qmgr: Implement the IUnknown interface for IEnumBackgroundCopyFiles. --- dlls/qmgr/Makefile.in | 1 + dlls/qmgr/enum_files.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 12 ++++ 3 files changed, 184 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 327a695..30c699b 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = advpack ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ + enum_files.c \ enum_jobs.c \ factory.c \ file.c \ diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c new file mode 100644 index 0000000..8dd479a --- /dev/null +++ b/dlls/qmgr/enum_files.c @@ -0,0 +1,171 @@ +/* + * Queue Manager (BITS) File Enumerator + * + * 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 "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) +{ + ULONG i; + + for(i = 0; i < This->numFiles; i++) + IBackgroundCopyFile_Release(This->files[i]); + + HeapFree(GetProcessHeap(), 0, This->files); + HeapFree(GetProcessHeap(), 0, This); +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef( + IEnumBackgroundCopyFiles* iface) +{ + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface( + IEnumBackgroundCopyFiles* iface, + REFIID riid, + void **ppvObject) +{ + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + TRACE("IID: %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) + { + *ppvObject = &This->lpVtbl; + BITS_IEnumBackgroundCopyFiles_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( + IEnumBackgroundCopyFiles* iface) +{ + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + EnumBackgroundCopyFilesDestructor(This); + + return ref; +} + +/*** IEnumBackgroundCopyFiles methods ***/ +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( + IEnumBackgroundCopyFiles* iface, + ULONG celt, + IBackgroundCopyFile **rgelt, + ULONG *pceltFetched) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( + IEnumBackgroundCopyFiles* iface, + ULONG celt) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( + IEnumBackgroundCopyFiles* iface) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( + IEnumBackgroundCopyFiles* iface, + IEnumBackgroundCopyFiles **ppenum) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( + IEnumBackgroundCopyFiles* iface, + ULONG *puCount) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static const IEnumBackgroundCopyFilesVtbl BITS_IEnumBackgroundCopyFiles_Vtbl = +{ + BITS_IEnumBackgroundCopyFiles_QueryInterface, + BITS_IEnumBackgroundCopyFiles_AddRef, + BITS_IEnumBackgroundCopyFiles_Release, + BITS_IEnumBackgroundCopyFiles_Next, + BITS_IEnumBackgroundCopyFiles_Skip, + BITS_IEnumBackgroundCopyFiles_Reset, + BITS_IEnumBackgroundCopyFiles_Clone, + BITS_IEnumBackgroundCopyFiles_GetCount +}; + +HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob* iCopyJob) +{ + EnumBackgroundCopyFilesImpl *This; + BackgroundCopyFileImpl *file; + BackgroundCopyJobImpl *job = (BackgroundCopyJobImpl *) iCopyJob; + ULONG i; + + TRACE("%p, %p)\n", ppObj, job); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; + This->ref = 1; + + /* Create array of files */ + This->indexFiles = 0; + This->numFiles = list_count(&job->files); + This->files = NULL; + if (This->numFiles > 0) + { + This->files = HeapAlloc(GetProcessHeap(), 0, + This->numFiles * sizeof This->files[0]); + if (!This->files) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + } + + i = 0; + LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) + { + file->lpVtbl->AddRef((IBackgroundCopyFile *) file); + This->files[i] = (IBackgroundCopyFile *) file; + ++i; + } + + *ppObj = &This->lpVtbl; + return S_OK; +} diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 8c32982..3036f7a 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -49,6 +49,16 @@ typedef struct LONG ref; } EnumBackgroundCopyJobsImpl; +/* Enum background copy files vtbl and related data */ +typedef struct +{ + const IEnumBackgroundCopyFilesVtbl *lpVtbl; + LONG ref; + IBackgroundCopyFile **files; + ULONG numFiles; + ULONG indexFiles; +} EnumBackgroundCopyFilesImpl; + /* Background copy file vtbl and related data */ typedef struct { @@ -79,6 +89,8 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyManager* copyManager); HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, LPCWSTR localName, LPVOID *ppObj); +HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, + IBackgroundCopyJob* copyJob); /* Little helper functions */ static inline char *

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_AddFile.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: be8bac15fd43756aeaac883c145c17645729dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8bac15fd43756aeaac883c1… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Feb 26 17:51:20 2008 -0800 qmgr: Implement IBackgroundCopyJob_AddFile. --- dlls/qmgr/job.c | 27 +++++++++++++- dlls/qmgr/qmgr.h | 6 +++ dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index b14783c..3db3c79 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -80,8 +80,25 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( LPCWSTR RemoteUrl, LPCWSTR LocalName) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + IBackgroundCopyFile *pFile; + BackgroundCopyFileImpl *file; + HRESULT res; + + /* We should return E_INVALIDARG in these cases. */ + FIXME("Check for valid filenames and supported protocols\n"); + + res = BackgroundCopyFileConstructor(RemoteUrl, LocalName, (LPVOID *) &pFile); + if (res != S_OK) + return res; + + /* Add a reference to the file to file list */ + IBackgroundCopyFile_AddRef(pFile); + file = (BackgroundCopyFileImpl *) pFile; + list_add_head(&This->files, &file->entryFromJob); + ++This->jobProgress.FilesTotal; + + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_EnumFiles( @@ -414,6 +431,12 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, } memcpy(pJobId, &This->jobId, sizeof(GUID)); + list_init(&This->files); + This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; + This->jobProgress.BytesTransferred = 0; + This->jobProgress.FilesTotal = 0; + This->jobProgress.FilesTransferred = 0; + *ppObj = &This->lpVtbl; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 08b4da3..8c32982 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -28,6 +28,7 @@ #include "bits.h" #include <string.h> +#include "wine/list.h" /* Background copy job vtbl and related data */ typedef struct @@ -37,6 +38,8 @@ typedef struct LPWSTR displayName; BG_JOB_TYPE type; GUID jobId; + struct list files; + BG_JOB_PROGRESS jobProgress; } BackgroundCopyJobImpl; /* Enum background copy jobs vtbl and related data */ @@ -52,6 +55,7 @@ typedef struct const IBackgroundCopyFileVtbl *lpVtbl; LONG ref; BG_FILE_INFO info; + struct list entryFromJob; } BackgroundCopyFileImpl; /* Background copy manager vtbl and related data */ @@ -73,6 +77,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj); HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyManager* copyManager); +HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, + LPCWSTR localName, LPVOID *ppObj); /* Little helper functions */ static inline char * diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 0508656..9e71b09 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = qmgr.dll -IMPORTS = ole32 kernel32 +IMPORTS = ole32 user32 kernel32 CTESTS = \ job.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 65ac06c..7aec1a7 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -27,11 +27,67 @@ /* Globals used by many tests */ static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; +static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; +static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; +static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; +static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; +static WCHAR *test_currentDir; +static WCHAR *test_remotePathA; +static WCHAR *test_remotePathB; +static WCHAR *test_localPathA; +static WCHAR *test_localPathB; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +static BOOL init_paths(void) +{ + static const WCHAR format[] = {'%','s','\\','%','s', 0}; + DWORD n; + + n = GetCurrentDirectoryW(0, NULL); + if (n == 0) + { + skip("Couldn't get current directory size\n"); + return FALSE; + } + + test_currentDir = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + test_localPathA + = HeapAlloc(GetProcessHeap(), 0, + (n + 1 + lstrlenW(test_localNameA)) * sizeof(WCHAR)); + test_localPathB + = HeapAlloc(GetProcessHeap(), 0, + (n + 1 + lstrlenW(test_localNameB)) * sizeof(WCHAR)); + test_remotePathA + = HeapAlloc(GetProcessHeap(), 0, + (n + 1 + lstrlenW(test_remoteNameA)) * sizeof(WCHAR)); + test_remotePathB + = HeapAlloc(GetProcessHeap(), 0, + (n + 1 + lstrlenW(test_remoteNameB)) * sizeof(WCHAR)); + + if (!test_currentDir || !test_localPathA || !test_localPathB + || !test_remotePathA || !test_remotePathB) + { + skip("Couldn't allocate memory for full paths\n"); + return FALSE; + } + + if (GetCurrentDirectoryW(n, test_currentDir) != n - 1) + { + skip("Couldn't get current directory\n"); + return FALSE; + } + + wsprintfW(test_localPathA, format, test_currentDir, test_localNameA); + wsprintfW(test_localPathB, format, test_currentDir, test_localNameB); + wsprintfW(test_remotePathA, format, test_currentDir, test_remoteNameA); + wsprintfW(test_remotePathB, format, test_currentDir, test_remoteNameB); + + return TRUE; +} + /* Generic test setup */ static BOOL setup(void) { @@ -116,6 +172,25 @@ static void test_GetName(void) CoTaskMemFree(displayName); } +/* Test adding a file */ +static void test_AddFile(void) +{ + HRESULT hres; + + hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, + test_localPathA); + ok(hres == S_OK, "First call to AddFile failed: 0x%08x\n", hres); + if (hres != S_OK) + { + skip("Unable to add first file to job\n"); + return; + } + + hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathB, + test_localPathB); + ok(hres == S_OK, "Second call to AddFile failed: 0x%08x\n", hres); +} + typedef void (*test_t)(void); START_TEST(job) @@ -124,10 +199,14 @@ START_TEST(job) test_GetId, test_GetType, test_GetName, + test_AddFile, 0 }; const test_t *test; + if (!init_paths()) + return; + CoInitialize(NULL); for (test = tests; *test; ++test) {

1 0

James Hawkins : msi: Change the property variant if the types don't match.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 9101665233433d3705737b3a43b72bf22e056c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9101665233433d3705737b3a4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Feb 27 02:39:21 2008 -0600 msi: Change the property variant if the types don't match. --- dlls/msi/suminfo.c | 78 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 51 insertions(+), 27 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 2f9e7f4..5dd3297 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -34,6 +34,7 @@ #include "msidefs.h" #include "msipriv.h" #include "objidl.h" +#include "propvarutil.h" #include "msiserver.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -78,6 +79,10 @@ typedef struct { #include "poppack.h" +static HRESULT (WINAPI *pPropVariantChangeType) + (PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, + PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); + #define SECT_HDR_SIZE (sizeof(PROPERTYSECTIONHEADER)) static const WCHAR szSumInfo[] = { 5 ,'S','u','m','m','a','r','y', @@ -144,6 +149,22 @@ static UINT get_property_count( const PROPVARIANT *property ) return n; } +static UINT propvar_changetype(PROPVARIANT *changed, PROPVARIANT *property, VARTYPE vt) +{ + HRESULT hr; + HMODULE propsys = LoadLibraryA("propsys.dll"); + pPropVariantChangeType = (void *)GetProcAddress(propsys, "PropVariantChangeType"); + + if (!pPropVariantChangeType) + { + ERR("PropVariantChangeType function missing!\n"); + return ERROR_FUNCTION_FAILED; + } + + hr = pPropVariantChangeType(changed, property, 0, vt); + return (hr == S_OK) ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; +} + /* FIXME: doesn't deal with endian conversion */ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz ) { @@ -151,7 +172,8 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz DWORD i; int size; PROPERTY_DATA *propdata; - PROPVARIANT *property; + PROPVARIANT property, *ptr; + PROPVARIANT changed; PROPERTYIDOFFSET *idofs; PROPERTYSECTIONHEADER *section_hdr; @@ -161,6 +183,12 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz /* now set all the properties */ for( i = 0; i < section_hdr->cProperties; i++ ) { + if( idofs[i].propid >= MSI_MAX_PROPS ) + { + ERR("Unknown property ID %d\n", idofs[i].propid ); + break; + } + type = get_type( idofs[i].propid ); if( type == VT_EMPTY ) { @@ -170,45 +198,41 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz propdata = (PROPERTY_DATA*) &data[ idofs[i].dwOffset ]; - /* check the type is the same as we expect */ - if( type != propdata->type ) - { - ERR("wrong type %d != %d\n", type, propdata->type); - break; - } - /* check we don't run off the end of the data */ size = sz - idofs[i].dwOffset - sizeof(DWORD); if( sizeof(DWORD) > size || - ( type == VT_FILETIME && sizeof(FILETIME) > size ) || - ( type == VT_LPSTR && (propdata->u.str.len + sizeof(DWORD)) > size ) ) + ( propdata->type == VT_FILETIME && sizeof(FILETIME) > size ) || + ( propdata->type == VT_LPSTR && (propdata->u.str.len + sizeof(DWORD)) > size ) ) { ERR("not enough data\n"); break; } - if( idofs[i].propid >= MSI_MAX_PROPS ) - { - ERR("Unknown property ID %d\n", idofs[i].propid ); - break; - } - - property = &prop[ idofs[i].propid ]; - property->vt = type; - - if( type == VT_LPSTR ) + property.vt = propdata->type; + if( propdata->type == VT_LPSTR ) { LPSTR str = msi_alloc( propdata->u.str.len ); memcpy( str, propdata->u.str.str, propdata->u.str.len ); str[ propdata->u.str.len - 1 ] = 0; - property->u.pszVal = str; + property.u.pszVal = str; + } + else if( propdata->type == VT_FILETIME ) + property.u.filetime = propdata->u.ft; + else if( propdata->type == VT_I2 ) + property.u.iVal = propdata->u.i2; + else if( propdata->type == VT_I4 ) + property.u.lVal = propdata->u.i4; + + /* check the type is the same as we expect */ + if( type != propdata->type ) + { + propvar_changetype(&changed, &property, type); + ptr = &changed; } - else if( type == VT_FILETIME ) - property->u.filetime = propdata->u.ft; - else if( type == VT_I2 ) - property->u.iVal = propdata->u.i2; - else if( type == VT_I4 ) - property->u.lVal = propdata->u.i4; + else + ptr = &property; + + memcpy(&prop[ idofs[i].propid ], ptr, sizeof(PROPVARIANT)); } }

1 0

Roy Shea : qmgr: Implement the IUnknown interface for IBackgroundCopyFile.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 128654ba0805eb132d77f2e3963694f25b9b8c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=128654ba0805eb132d77f2e39… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Feb 26 17:50:43 2008 -0800 qmgr: Implement the IUnknown interface for IBackgroundCopyFile. --- dlls/qmgr/Makefile.in | 1 + dlls/qmgr/file.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 8 +++ 3 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index ccd5ef6..327a695 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = -luuid C_SRCS = \ enum_jobs.c \ factory.c \ + file.c \ job.c \ qmgr.c \ qmgr_main.c \ diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c new file mode 100644 index 0000000..60958f5 --- /dev/null +++ b/dlls/qmgr/file.c @@ -0,0 +1,143 @@ +/* + * Queue Manager (BITS) File + * + * 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 "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) +{ + HeapFree(GetProcessHeap(), 0, This->info.LocalName); + HeapFree(GetProcessHeap(), 0, This->info.RemoteName); + HeapFree(GetProcessHeap(), 0, This); +} + +static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) +{ + BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( + IBackgroundCopyFile* iface, + REFIID riid, + void **ppvObject) +{ + BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IBackgroundCopyFile)) + { + *ppvObject = &This->lpVtbl; + BITS_IBackgroundCopyFile_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + + +static ULONG WINAPI BITS_IBackgroundCopyFile_Release( + IBackgroundCopyFile* iface) +{ + BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + BackgroundCopyFileDestructor(This); + + return ref; +} + +/*** IBackgroundCopyFile methods ***/ +static HRESULT WINAPI BITS_IBackgroundCopyFile_GetRemoteName( + IBackgroundCopyFile* iface, + LPWSTR *pVal) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( + IBackgroundCopyFile* iface, + LPWSTR *pVal) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( + IBackgroundCopyFile* iface, + BG_FILE_PROGRESS *pVal) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static const IBackgroundCopyFileVtbl BITS_IBackgroundCopyFile_Vtbl = +{ + BITS_IBackgroundCopyFile_QueryInterface, + BITS_IBackgroundCopyFile_AddRef, + BITS_IBackgroundCopyFile_Release, + BITS_IBackgroundCopyFile_GetRemoteName, + BITS_IBackgroundCopyFile_GetLocalName, + BITS_IBackgroundCopyFile_GetProgress +}; + +HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, + LPCWSTR localName, LPVOID *ppObj) +{ + BackgroundCopyFileImpl *This; + int n; + + TRACE("(%s,%s,%p)\n", debugstr_w(remoteName), + debugstr_w(localName), ppObj); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + if (!This) + return E_OUTOFMEMORY; + + n = (lstrlenW(remoteName) + 1) * sizeof(WCHAR); + This->info.RemoteName = HeapAlloc(GetProcessHeap(), 0, n); + if (!This->info.RemoteName) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + memcpy(This->info.RemoteName, remoteName, n); + + n = (lstrlenW(localName) + 1) * sizeof(WCHAR); + This->info.LocalName = HeapAlloc(GetProcessHeap(), 0, n); + if (!This->info.LocalName) + { + HeapFree(GetProcessHeap(), 0, This->info.RemoteName); + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + memcpy(This->info.LocalName, localName, n); + + This->lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; + This->ref = 1; + + *ppObj = &This->lpVtbl; + return S_OK; +} diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1719492..08b4da3 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -46,6 +46,14 @@ typedef struct LONG ref; } EnumBackgroundCopyJobsImpl; +/* Background copy file vtbl and related data */ +typedef struct +{ + const IBackgroundCopyFileVtbl *lpVtbl; + LONG ref; + BG_FILE_INFO info; +} BackgroundCopyFileImpl; + /* Background copy manager vtbl and related data */ typedef struct {

1 0

Alexander Nicolaysen Sørnes : comdlg32: PrintDlgW: Remove incorrect FIXME.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: a3a49149b69ffd2600f14645a49857abe3652d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a49149b69ffd2600f14645a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 29 22:46:01 2008 +0100 comdlg32: PrintDlgW: Remove incorrect FIXME. --- dlls/comdlg32/printdlg.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index b74c9fa..c048297 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1769,11 +1769,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, } break; - case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT */ - if (PrinterComboID != LOWORD(wParam)) { - FIXME("No handling for print quality combo box yet.\n"); - break; - } + case cmb1: /* Printer Combobox in PRINT SETUP */ /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) {

1 0

Roderick Colenbrander : wined3d: Improved CheckDeviceType.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 4ac1b94d9686366830a19d8f309cfe2b20221196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac1b94d9686366830a19d8f3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 26 10:47:30 2008 +0100 wined3d: Improved CheckDeviceType. --- dlls/d3d9/tests/device.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 79 ++++++++++++++++++++++++------- 2 files changed, 182 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ac1b94d9686366830a19…

1 0

Alexandre Julliard : msvcrt: Use the correct msvcrt defines for errno values.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: d66b9f7e48bc9acae4e986b006448d884a6e0862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66b9f7e48bc9acae4e986b00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 12:26:15 2008 +0100 msvcrt: Use the correct msvcrt defines for errno values. --- dlls/msvcrt/heap.c | 1 - dlls/msvcrt/mbcs.c | 11 +++++------ dlls/msvcrt/string.c | 17 ++++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 227bc91..8b92f0f 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -23,7 +23,6 @@ #include "msvcrt.h" #include "mtdll.h" -#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 392f450..4acc52f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -27,7 +27,6 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "msvcrt/mbctype.h" -#include "msvcrt/errno.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -454,11 +453,11 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha MSVCRT_size_t pos = 0; if(!dst || size == 0) - return EINVAL; + return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } if(!n) return 0; @@ -471,7 +470,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(pos == size) { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } is_lead = (!is_lead && _ismbblead(*src)); n--; @@ -489,7 +488,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(pos == size) { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } if(!(*src)) break; @@ -502,7 +501,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha else { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } return 0; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 660b94d..74beefb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include "msvcrt.h" -#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -159,12 +158,12 @@ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) { MSVCRT_size_t i; - if(!elem) return EINVAL; - if(!dst) return EINVAL; + if(!elem) return MSVCRT_EINVAL; + if(!dst) return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } for(i = 0; i < elem; i++) @@ -172,7 +171,7 @@ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) if((dst[i] = src[i]) == '\0') return 0; } dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } /********************************************************************* @@ -181,12 +180,12 @@ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) { MSVCRT_size_t i, j; - if(!dst) return EINVAL; - if(elem == 0) return EINVAL; + if(!dst) return MSVCRT_EINVAL; + if(elem == 0) return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } for(i = 0; i < elem; i++) @@ -201,7 +200,7 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) } /* Set the first element to 0, not the first element after the skipped part */ dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } /*********************************************************************

1 0