September 2013 - Wine-commits

Rico Schüller : d3dx9: Use struct d3dx_object for objects.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: f7ba8e1472d3db3043ed2abf034a92de03640c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ba8e1472d3db3043ed2abf0… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 24 22:50:20 2013 +0200 d3dx9: Use struct d3dx_object for objects. --- dlls/d3dx9_36/effect.c | 248 ++++++++++++++++++----------------------------- 1 files changed, 95 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ba8e1472d3db3043ed2…

1 0

Alistair Leslie-Hughes : oledb32: Correct DataLinks interface for win64.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 3d193930ab33ab521fff8028fc309d605432e2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d193930ab33ab521fff8028f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 16 09:44:39 2013 +1000 oledb32: Correct DataLinks interface for win64. --- dlls/oledb32/dslocator.c | 6 +++--- include/msdasc.idl | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index dcc2fe3..f8a98f5 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -135,7 +135,7 @@ static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdM return E_NOTIMPL; } -static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndParent) +static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG *phwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); @@ -144,11 +144,11 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndP return E_NOTIMPL; } -static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, LONG phwndParent) +static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%d)\n",This, phwndParent); + FIXME("(%p)->(%p)\n",This, (HWND)hwndParent); return E_NOTIMPL; } diff --git a/include/msdasc.idl b/include/msdasc.idl index 25610e5..e3efb1d 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -26,6 +26,8 @@ import "oledb.idl"; #define vi_progid(str) #endif +typedef LONG_PTR COMPATIBLE_LONG; + [ uuid(2206CEB0-19C1-11D1-89E0-00C04FD7A829), version(1.0) @@ -56,10 +58,10 @@ library MSDASC interface IDataSourceLocator : IDispatch { [id(0x60020000), propget] - HRESULT hWnd([out, retval] long* phwndParent); + HRESULT hWnd([out, retval] COMPATIBLE_LONG* phwndParent); [id(0x60020000), propput] - HRESULT hWnd([in] long phwndParent); + HRESULT hWnd([in] COMPATIBLE_LONG hwndParent); [id(0x60020002), helpstring("PromptNew")] HRESULT PromptNew([out, retval] IDispatch** ppADOConnection);

1 0

Lu Jiashu : winmm: Clone the whole adwInfo array in MMIO_Open.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: a0ed65f5937e6eb13f6b2b345d8d27fbd4616c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ed65f5937e6eb13f6b2b345… Author: Lu Jiashu <lujiashu(a)163.com> Date: Tue Sep 24 11:40:54 2013 +0800 winmm: Clone the whole adwInfo array in MMIO_Open. --- dlls/winmm/mmio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 73cad60..c8f3745 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -664,7 +664,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, wm->bBufferLoaded = TRUE; /* see mmioDosIOProc for that one */ - wm->info.adwInfo[0] = refmminfo->adwInfo[0]; + memcpy( wm->info.adwInfo, refmminfo->adwInfo, sizeof(wm->info.adwInfo) ); /* call IO proc to actually open file */ refmminfo->wErrorRet = send_message(wm->ioProc, &wm->info, MMIOM_OPEN,

1 0

Piotr Caban : msvcrt: Fix internal LONG_MAX and ULONG_MAX definitions.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: b01f8881293cc9661d3d5ba919b13f1a2fbc9687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01f8881293cc9661d3d5ba91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:30 2013 +0200 msvcrt: Fix internal LONG_MAX and ULONG_MAX definitions. --- dlls/msvcrt/msvcrt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 98922af..4e41a7d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -41,9 +41,9 @@ #include "windef.h" #include "winbase.h" -#define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MAX 0x7fffffff #define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) -#define MSVCRT_ULONG_MAX 0xffffffffUL +#define MSVCRT_ULONG_MAX 0xffffffff #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)

1 0

Piotr Caban : msvcrt: Call MSVCRT_strtoi64_l in strtol implementation.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: c3c44544ff0e2446979117daebddb70124a0afe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c44544ff0e2446979117dae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:40 2013 +0200 msvcrt: Call MSVCRT_strtoi64_l in strtol implementation. --- dlls/msvcrt/string.c | 52 +++++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d3bde66..cdce4a2 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -727,40 +727,6 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, } /****************************************************************** - * strtol (MSVCRT.@) - */ -MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) -{ - /* wrapper to forward libc error code to msvcrt's error codes */ - long ret; - - errno = 0; - ret = strtol(nptr, end, base); - switch (errno) - { - case ERANGE: *MSVCRT__errno() = MSVCRT_ERANGE; break; - case EINVAL: *MSVCRT__errno() = MSVCRT_EINVAL; break; - default: - /* cope with the fact that we may use 64bit long integers on libc - * while msvcrt always uses 32bit long integers - */ - if (ret > MSVCRT_LONG_MAX) - { - ret = MSVCRT_LONG_MAX; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - else if (ret < -MSVCRT_LONG_MAX - 1) - { - ret = -MSVCRT_LONG_MAX - 1; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - break; - } - - return ret; -} - -/****************************************************************** * strtoul (MSVCRT.@) */ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) @@ -934,6 +900,24 @@ int __cdecl MSVCRT_atoi(const char *str) return minus ? -ret : ret; } +/****************************************************************** + * strtol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) +{ + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + + return ret; +} + /********************************************************************* * _strtoui64_l (MSVCRT.@) *

1 0

Piotr Caban : msvcrt: Call MSVCRT_strtoi64_l in strtoul implementation.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: a449b2d57b6ad84f11c90346e01b8acef546b4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a449b2d57b6ad84f11c90346e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:52 2013 +0200 msvcrt: Call MSVCRT_strtoi64_l in strtoul implementation. --- dlls/msvcrt/string.c | 47 ++++++++++++++++--------------------------- dlls/msvcrt/tests/string.c | 20 ++++++++++++++++++ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cdce4a2..861389b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -726,35 +726,6 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, return 0; } -/****************************************************************** - * strtoul (MSVCRT.@) - */ -MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) -{ - /* wrapper to forward libc error code to msvcrt's error codes */ - unsigned long ret; - - errno = 0; - ret = strtoul(nptr, end, base); - switch (errno) - { - case ERANGE: *MSVCRT__errno() = MSVCRT_ERANGE; break; - case EINVAL: *MSVCRT__errno() = MSVCRT_EINVAL; break; - default: - /* cope with the fact that we may use 64bit long integers on libc - * while msvcrt always uses 32bit long integers - */ - if (ret > MSVCRT_ULONG_MAX) - { - ret = MSVCRT_ULONG_MAX; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - break; - } - - return ret; -} - /********************************************************************* * strlen (MSVCRT.@) */ @@ -918,6 +889,24 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) return ret; } +/****************************************************************** + * strtoul (MSVCRT.@) + */ +MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) +{ + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + + if(ret > MSVCRT_ULONG_MAX) { + ret = MSVCRT_ULONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + }else if(ret < -(__int64)MSVCRT_ULONG_MAX) { + ret = 1; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + + return ret; +} + /********************************************************************* * _strtoui64_l (MSVCRT.@) * diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dc90b38..3877d18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1341,6 +1341,26 @@ static void test_strtol(void) ul = strtoul("9223372036854775807L", &e, 0); ok(ul==4294967295ul, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-2", NULL, 0); + ok(ul == -2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967294", NULL, 0); + ok(ul == 2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967295", NULL, 0); + ok(ul==1, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967296", NULL, 0); + ok(ul == 1, "wrong value %u\n", ul); + ok(errno == ERANGE, "wrong errno %d\n", errno); } static void test_strnlen(void)

1 0

Jacek Caban : mshtml: Wine Gecko 2.24 release.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 0be56d27d2d4b22367313fa4c6f1e65865c90438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be56d27d2d4b22367313fa4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 14:17:08 2013 +0200 mshtml: Wine Gecko 2.24 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlelem.c | 24 +++--- dlls/mshtml/htmlwindow.c | 7 ++- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsiface.idl | 180 +++++++++++++++++++++++++++------------------- 5 files changed, 127 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0be56d27d2d4b22367313…

1 0

Frédéric Delanoy : advapi32: Use BOOL type where appropriate.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: ce88fd16ae985e1a114298ec10352f674d40bde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce88fd16ae985e1a114298ec1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 25 15:01:43 2013 +0200 advapi32: Use BOOL type where appropriate. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e4f7586..e999ce6 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -79,7 +79,7 @@ static const WCHAR * const root_key_names[] = static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; static BOOL hkcu_cache_disabled; -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */ static inline int is_string( DWORD type )

1 0

Frédéric Delanoy : windowscodecs: Use BOOL type where appropriate.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 2413841ecb8c845591e0c8173cd22a724dd82bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=2413841ecb8c845591e0c8173… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 25 15:01:44 2013 +0200 windowscodecs: Use BOOL type where appropriate. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index d245031..682f5f5 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -232,7 +232,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; IWICBitmapSource *source; - int has_alpha=FALSE; /* if TRUE, alpha data might be in the image data */ + BOOL has_alpha=FALSE; /* if TRUE, alpha data might be in the image data */ WICRect rc; hr = IcoDibDecoder_CreateInstance(&bmp_decoder);

1 0

Dmitry Timoshkov : ntdll: Perform the offset checks in NtWriteFile also for a serial device.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 2ffd28cff7012c15ed3e181120fcb96148d0398d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffd28cff7012c15ed3e18112… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 25 13:03:25 2013 +0900 ntdll: Perform the offset checks in NtWriteFile also for a serial device. --- dlls/kernel32/tests/comm.c | 10 ---------- dlls/ntdll/file.c | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 242b599..4e7fee5 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -830,9 +830,7 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, NULL); -todo_wine ok(!res, "WriteFile on an overlapped handle without ovl structure should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); S(U(ovl_write)).Offset = 0; @@ -2057,20 +2055,15 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(hcom, atz, 0, &bytes, NULL); -todo_wine ok(!ret, "WriteFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); iob.Status = -1; iob.Information = -1; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, 0, NULL, NULL); -todo_wine ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); -todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); for (i = -20; i < 20; i++) @@ -2087,11 +2080,8 @@ todo_wine } else { -todo_wine ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); -todo_wine ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status); -todo_wine ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information); } } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 75ce35c..1cc8f87 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1016,6 +1016,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } } + else if (type == FD_TYPE_SERIAL) + { + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } for (;;) {

1 0