December 2012 - Wine-Commits

Piotr Caban : msvcrt: Fixed mktime and _mktime64 implementation.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: a66ed048a32fd1cd4e8afebd262b7b1b1eabfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66ed048a32fd1cd4e8afebd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:13 2012 +0100 msvcrt: Fixed mktime and _mktime64 implementation. --- dlls/msvcrt/time.c | 165 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 142 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 27f93b1..e484bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -52,20 +52,6 @@ static inline int IsLeapYear(int Year) return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } -static inline void msvcrt_tm_to_unix( struct tm *dest, const struct MSVCRT_tm *src ) -{ - memset( dest, 0, sizeof(*dest) ); - dest->tm_sec = src->tm_sec; - dest->tm_min = src->tm_min; - dest->tm_hour = src->tm_hour; - dest->tm_mday = src->tm_mday; - dest->tm_mon = src->tm_mon; - dest->tm_year = src->tm_year; - dest->tm_wday = src->tm_wday; - dest->tm_yday = src->tm_yday; - dest->tm_isdst = src->tm_isdst; -} - static inline void unix_tm_to_msvcrt( struct MSVCRT_tm *dest, const struct tm *src ) { memset( dest, 0, sizeof(*dest) ); @@ -177,6 +163,57 @@ void CDECL MSVCRT__tzset(void) _munlock(_TIME_LOCK); } +static void _tzset_init(void) +{ + static BOOL init = FALSE; + + if(!init) { + _mlock(_TIME_LOCK); + if(!init) { + MSVCRT__tzset(); + init = TRUE; + } + _munlock(_TIME_LOCK); + } +} + +static BOOL is_dst(const SYSTEMTIME *st) +{ + TIME_ZONE_INFORMATION tmp; + SYSTEMTIME out; + + if(!MSVCRT___daylight) + return FALSE; + + if(tzi.DaylightDate.wMonth) { + tmp = tzi; + }else if(st->wYear >= 2007) { + memset(&tmp, 0, sizeof(tmp)); + tmp.StandardDate.wMonth = 11; + tmp.StandardDate.wDay = 1; + tmp.StandardDate.wHour = 2; + tmp.DaylightDate.wMonth = 3; + tmp.DaylightDate.wDay = 2; + tmp.DaylightDate.wHour = 2; + }else { + memset(&tmp, 0, sizeof(tmp)); + tmp.StandardDate.wMonth = 10; + tmp.StandardDate.wDay = 5; + tmp.StandardDate.wHour = 2; + tmp.DaylightDate.wMonth = 4; + tmp.DaylightDate.wDay = 1; + tmp.DaylightDate.wHour = 2; + } + + tmp.Bias = 0; + tmp.StandardBias = 0; + tmp.DaylightBias = MSVCRT__dstbias/60; + if(!SystemTimeToTzSpecificLocalTime(&tmp, st, &out)) + return FALSE; + + return memcmp(st, &out, sizeof(SYSTEMTIME)); +} + #define SECSPERDAY 86400 /* 1601 to 1970 is 369 years plus 89 leap days */ #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) @@ -184,19 +221,100 @@ void CDECL MSVCRT__tzset(void) #define TICKSPERMSEC 10000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) +static MSVCRT___time64_t mktime_helper(struct MSVCRT_tm *mstm, BOOL local) +{ + SYSTEMTIME st; + FILETIME ft; + MSVCRT___time64_t ret = 0; + int i; + BOOL use_dst = FALSE; + + ret = mstm->tm_year + mstm->tm_mon/12; + mstm->tm_mon %= 12; + if(mstm->tm_mon < 0) { + mstm->tm_mon += 12; + ret--; + } + + if(ret<70 || ret>1100) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + memset(&st, 0, sizeof(SYSTEMTIME)); + st.wDay = 1; + st.wMonth = mstm->tm_mon+1; + st.wYear = ret+1900; + + if(!SystemTimeToFileTime(&st, &ft)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime; + ret += (MSVCRT___time64_t)mstm->tm_sec*TICKSPERSEC; + ret += (MSVCRT___time64_t)mstm->tm_min*60*TICKSPERSEC; + ret += (MSVCRT___time64_t)mstm->tm_hour*60*60*TICKSPERSEC; + ret += (MSVCRT___time64_t)(mstm->tm_mday-1)*SECSPERDAY*TICKSPERSEC; + + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &st); + + if(local) { + _tzset_init(); + use_dst = is_dst(&st); + if((mstm->tm_isdst<=-1 && use_dst) || (mstm->tm_isdst>=1)) { + SYSTEMTIME tmp; + + ret += (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &tmp); + + if(!is_dst(&tmp)) { + st = tmp; + use_dst = FALSE; + }else { + use_dst = TRUE; + } + }else if(mstm->tm_isdst==0 && use_dst) { + ret -= (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + ft.dwLowDateTime = ret & 0xffffffff; + ft.dwHighDateTime = ret >> 32; + FileTimeToSystemTime(&ft, &st); + ret += (MSVCRT___time64_t)MSVCRT__dstbias*TICKSPERSEC; + } + ret += (MSVCRT___time64_t)MSVCRT___timezone*TICKSPERSEC; + } + + mstm->tm_sec = st.wSecond; + mstm->tm_min = st.wMinute; + mstm->tm_hour = st.wHour; + mstm->tm_mday = st.wDay; + mstm->tm_mon = st.wMonth-1; + mstm->tm_year = st.wYear-1900; + mstm->tm_wday = st.wDayOfWeek; + for(i=mstm->tm_yday=0; i<st.wMonth-1; i++) + mstm->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + mstm->tm_yday += st.wDay-1; + mstm->tm_isdst = use_dst ? 1 : 0; + + if(ret < TICKS_1601_TO_1970) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC; + return ret; +} + /********************************************************************** * _mktime64 (MSVCRT.@) */ MSVCRT___time64_t CDECL MSVCRT__mktime64(struct MSVCRT_tm *mstm) { - time_t secs; - struct tm tm; - - msvcrt_tm_to_unix( &tm, mstm ); - secs = mktime( &tm ); - unix_tm_to_msvcrt( mstm, &tm ); - - return secs < 0 ? -1 : secs; + return mktime_helper(mstm, TRUE); } /********************************************************************** @@ -204,7 +322,8 @@ MSVCRT___time64_t CDECL MSVCRT__mktime64(struct MSVCRT_tm *mstm) */ MSVCRT___time32_t CDECL MSVCRT__mktime32(struct MSVCRT_tm *mstm) { - return MSVCRT__mktime64( mstm ); + MSVCRT___time64_t ret = MSVCRT__mktime64( mstm ); + return ret == (MSVCRT___time32_t)ret ? ret : -1; } /**********************************************************************

1 0

Jacek Caban : atl100: Added AtlAddTermFunc implementation (based on atl. dll version).
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 264f6dfe14d40e15b1acc196e8fcb307813f483f URL: http://source.winehq.org/git/wine.git/?a=commit;h=264f6dfe14d40e15b1acc196e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:27:29 2012 +0100 atl100: Added AtlAddTermFunc implementation (based on atl.dll version). --- dlls/atl100/atl.c | 21 ++++++++++++++++++++- dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 88cdce4..69a6e9e 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(atl); +WINE_DEFAULT_DEBUG_CHANNEL(atl100); /*********************************************************************** * AtlAdvise [atl100.@] @@ -227,6 +227,25 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, } /*********************************************************************** + * AtlModuleAddTermFunc [atl100.@] + */ +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) +{ + _ATL_TERMFUNC_ELEM *termfunc_elem; + + TRACE("(%p %p %ld)\n", pM, pFunc, dw); + + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; + + pM->m_pTermFuncs = termfunc_elem; + + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index efe6c19..7ba8154 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -39,7 +39,7 @@ 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface 56 stub AtlLoadTypeLib -58 stub AtlModuleAddTermFunc +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 519bdd0..c674ed2 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -45,7 +45,7 @@ 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx -58 stdcall AtlModuleAddTermFunc(ptr) atl.AtlModuleAddTermFunc # don't forward to atl100.dll +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar diff --git a/include/atlbase.h b/include/atlbase.h index 794a099..fbf1479 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -195,7 +195,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib);

1 0

Jacek Caban : atl: Allow version-based differences in struct layouts.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: f1e41255e3cef650740948d0be1d81d6578cbe61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e41255e3cef650740948d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:27:03 2012 +0100 atl: Allow version-based differences in struct layouts. --- dlls/atl/Makefile.in | 1 + dlls/atl/atl_main.c | 2 +- dlls/atl/tests/Makefile.in | 1 + dlls/atl100/Makefile.in | 5 +++-- dlls/atl100/atl.c | 2 +- dlls/atl80/Makefile.in | 4 +++- dlls/atl80/atl80.c | 3 ++- dlls/kernel32/except.c | 2 +- include/atlbase.h | 26 ++++++++++++++++++++++++++ 9 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 350db90..8af9e8b 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,6 +1,7 @@ MODULE = atl.dll IMPORTLIB = atl IMPORTS = uuid atl100 oleaut32 ole32 user32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_30 C_SRCS = \ atl_main.c \ diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index f215151..eee6fee 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -478,5 +478,5 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return 0x0300; + return _ATL_VER; } diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in index b397c85..b573713 100644 --- a/dlls/atl/tests/Makefile.in +++ b/dlls/atl/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = atl.dll IMPORTS = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_30 C_SRCS = \ atl_ax.c \ diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 65cae11..19cfcad 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -1,6 +1,7 @@ -MODULE = atl100.dll +MODULE = atl100.dll IMPORTLIB = atl100 -IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ atl.c \ diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index f1b76a5..88cdce4 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -231,5 +231,5 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return 0x0a00; + return _ATL_VER; } diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index c310fdb..70f416f 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,4 +1,6 @@ -MODULE = atl80.dll +MODULE = atl80.dll +EXTRADEFS = -D_ATL_VER=_ATL_VER_80 + C_SRCS = atl80.c diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index ec9a515..b250d32 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -19,11 +19,12 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "atlbase.h" /*********************************************************************** * AtlGetVersion [atl80.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return 0x0800; + return _ATL_VER; } diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 54be105..49e5c25 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -154,7 +154,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in len = snprintf( buffer, size, "Unhandled PIC return in vm86 mode"); break; default: - len = snprintf( buffer, size, "Unhandled exception 0x%08x", rec->ExceptionCode); + len = snprintf( buffer, size, "Unhandled exception 0x%08x in thread %x", rec->ExceptionCode, GetCurrentThreadId()); break; } if ((len<0) || (len>=size)) diff --git a/include/atlbase.h b/include/atlbase.h index 4033f9a..794a099 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -23,6 +23,16 @@ #include <atliface.h> +/* Wine extention: we (ab)use _ATL_VER to handle truct layout differences between ATL versions. */ +#define _ATL_VER_30 0x0300 +#define _ATL_VER_70 0x0700 +#define _ATL_VER_80 0x0800 +#define _ATL_VER_100 0x0a00 + +#ifndef _ATL_VER +#define _ATL_VER _ATL_VER_100 +#endif + typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); @@ -31,6 +41,8 @@ typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef CRITICAL_SECTION CComCriticalSection; + typedef struct _ATL_OBJMAP_ENTRYA_V1_TAG { const CLSID* pclsid; @@ -148,6 +160,20 @@ typedef struct _ATL_MODULEW_TAG _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct _ATL_MODULE70 +{ + UINT cbSize; + LONG m_nLockCnt; + _ATL_TERMFUNC_ELEM *m_pTermFuncs; + CComCriticalSection m_csStaticDataInitAndTypeInfo; +} _ATL_MODULE70; + +#if _ATL_VER >= _ATL_VER_70 +typedef _ATL_MODULE70 _ATL_MODULE; +#else +typedef _ATL_MODULEW _ATL_MODULE; +#endif + typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid;

1 0

Piotr Caban : msvcrt: Fixed _localtime64 implementation.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: d3ecfe059960440f95ce8c25f13b4b0070952c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ecfe059960440f95ce8c25f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:48:07 2012 +0100 msvcrt: Fixed _localtime64 implementation. --- dlls/msvcrt/dir.c | 1 - dlls/msvcrt/file.c | 1 - dlls/msvcrt/time.c | 66 ++++++++++++++++++++++++--------------------------- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index a504fee..82824e9 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -25,7 +25,6 @@ #include "wine/port.h" #include <stdarg.h> -#include <time.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1b87dd2..bca17d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -29,7 +29,6 @@ #include "config.h" #include "wine/port.h" -#include <time.h> #include <stdarg.h> #include <stdio.h> #ifdef HAVE_UNISTD_H diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 263c035..4c21380 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -25,12 +25,6 @@ #include "config.h" #include <stdlib.h> -#define _POSIX_PTHREAD_SEMANTICS /* switch to a 2 arg style asctime_r on Solaris */ -#include <time.h> -#ifdef HAVE_SYS_TIMES_H -# include <sys/times.h> -#endif -#include <limits.h> #include "msvcrt.h" #include "mtdll.h" @@ -52,20 +46,6 @@ static inline int IsLeapYear(int Year) return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } -static inline void unix_tm_to_msvcrt( struct MSVCRT_tm *dest, const struct tm *src ) -{ - memset( dest, 0, sizeof(*dest) ); - dest->tm_sec = src->tm_sec; - dest->tm_min = src->tm_min; - dest->tm_hour = src->tm_hour; - dest->tm_mday = src->tm_mday; - dest->tm_mon = src->tm_mon; - dest->tm_year = src->tm_year; - dest->tm_wday = src->tm_wday; - dest->tm_yday = src->tm_yday; - dest->tm_isdst = src->tm_isdst; -} - static inline void write_invalid_msvcrt_tm( struct MSVCRT_tm *tm ) { tm->tm_sec = -1; @@ -378,32 +358,48 @@ MSVCRT___time32_t CDECL MSVCRT__mkgmtime(struct MSVCRT_tm *time) /********************************************************************* * _localtime64_s (MSVCRT.@) */ -int CDECL _localtime64_s(struct MSVCRT_tm *time, const MSVCRT___time64_t *secs) +int CDECL _localtime64_s(struct MSVCRT_tm *res, const MSVCRT___time64_t *secs) { - struct tm *tm; - time_t seconds; + int i; + FILETIME ft; + SYSTEMTIME st; + ULONGLONG time; - if (!time || !secs || *secs < 0 || *secs > _MAX__TIME64_T) + if (!res || !secs || *secs < 0 || *secs > _MAX__TIME64_T) { - if (time) - write_invalid_msvcrt_tm(time); + if (res) + write_invalid_msvcrt_tm(res); *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - seconds = *secs; + _tzset_init(); + time = (*secs - MSVCRT___timezone) * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - _mlock(_TIME_LOCK); - if (!(tm = localtime(&seconds))) - { - _munlock(_TIME_LOCK); - *MSVCRT__errno() = MSVCRT_EINVAL; - return MSVCRT_EINVAL; + ft.dwHighDateTime = (UINT)(time >> 32); + ft.dwLowDateTime = (UINT)time; + FileTimeToSystemTime(&ft, &st); + + res->tm_isdst = is_dst(&st) ? 1 : 0; + if(res->tm_isdst) { + time -= MSVCRT__dstbias * (ULONGLONG)TICKSPERSEC; + ft.dwHighDateTime = (UINT)(time >> 32); + ft.dwLowDateTime = (UINT)time; + FileTimeToSystemTime(&ft, &st); } - unix_tm_to_msvcrt(time, tm); - _munlock(_TIME_LOCK); + res->tm_sec = st.wSecond; + res->tm_min = st.wMinute; + res->tm_hour = st.wHour; + res->tm_mday = st.wDay; + res->tm_year = st.wYear - 1900; + res->tm_mon = st.wMonth - 1; + res->tm_wday = st.wDayOfWeek; + for (i = res->tm_yday = 0; i < st.wMonth - 1; i++) + res->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + res->tm_yday += st.wDay - 1; + return 0; }

1 0

Piotr Caban : msvcrt: Improved input parameter range check in _gmtime64_s.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: acac63663a2b4d910ad7d3acbb5dc161dd94c15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acac63663a2b4d910ad7d3acb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:40 2012 +0100 msvcrt: Improved input parameter range check in _gmtime64_s. --- dlls/msvcrt/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 60c7120..05980a5 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -488,7 +488,7 @@ int CDECL MSVCRT__gmtime64_s(struct MSVCRT_tm *res, const MSVCRT___time64_t *sec SYSTEMTIME st; ULONGLONG time; - if (!res || !secs || *secs < 0) { + if (!res || !secs || *secs < 0 || *secs > _MAX__TIME64_T) { if (res) { write_invalid_msvcrt_tm(res); }

1 0

Jacek Caban : atl100: Added AtlCallTermFunc implementation ( based on AtlModuleTerm).
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 0a0b2ff01983e040285028d3ec2987b75214d285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0b2ff01983e040285028d3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:27:47 2012 +0100 atl100: Added AtlCallTermFunc implementation (based on AtlModuleTerm). --- dlls/atl100/atl.c | 19 +++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 69a6e9e..dd08867 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -246,6 +246,25 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD } /*********************************************************************** + * AtlCallTermFunc [atl100.@] + */ +void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) +{ + _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; + + TRACE("(%p)\n", pM); + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } + + pM->m_pTermFuncs = NULL; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 7ba8154..47e3c56 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -45,7 +45,7 @@ 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stub AtlCallTermFunc +64 stdcall AtlCallTermFunc(ptr) 65 stub AtlWinModuleInit 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index c674ed2..6756776 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -51,6 +51,6 @@ 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA -64 stub AltCallTermFunc +64 stdcall AltCallTermFunc(ptr) atl100.AltCallTermFunc 65 stub AltWinModuleInit 66 stub AltWinModuleTerm diff --git a/include/atlbase.h b/include/atlbase.h index fbf1479..1e48f58 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -196,6 +196,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* p HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib);

1 0

André Hentschel : winedbg: Add load/store dual/ exclusive and table branch operators to Thumb2 disassembler.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 785bdb6412dcabbfd38b7292e173bb5f4306a501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785bdb6412dcabbfd38b7292e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 10 15:16:29 2012 +0100 winedbg: Add load/store dual/exclusive and table branch operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index c3963c4..a6f57f7 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1147,6 +1147,73 @@ static UINT thumb2_disasm_ldrstrmul(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_ldrstrextbr(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x03; + WORD op2 = (inst >> 20) & 0x03; + WORD op3 = (inst >> 4) & 0x0f; + WORD indexing = (inst >> 24) & 0x01; + WORD direction = (inst >> 23) & 0x01; + WORD writeback = (inst >> 21) & 0x01; + WORD load = (inst >> 20) & 0x01; + short offset = (inst & 0xff) << 2; + + if (op1 == 1 && op2 == 1 && op3 < 2) + { + WORD halfword = (inst >> 4) & 0x01; + if (halfword) + dbg_printf("\n\ttbh\t [%s, %s, lsl #1]", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\ttbb\t [%s, %s]", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + if (op1 == 0 && op2 < 2) + { + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tldrex\t %s, [%s, #%u]", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tstrex\t %s, %s, [%s, #%u]", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], offset); + return 0; + } + + if (op1 == 1 && op2 < 2) + { + WORD halfword = (inst >> 4) & 0x01; + if (get_nibble(inst, 0) == 15) + dbg_printf("\n\tldrex%s\t %s, [%s]", halfword ? "h" : "b", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + else + dbg_printf("\n\tstrex%s\t %s, %s, [%s]", halfword ? "h" : "b", + tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)]); + return 0; + } + + if (!direction) offset *= -1; + dbg_printf("\n\t%s\t", load ? "ldrd" : "strd"); + if (indexing) + { + if (load && get_nibble(inst, 4) == 15) + { + dbg_printf("%s, %s, ", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 2)]); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("%s, %s, [%s, #%d]%s", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], offset, + writeback?"!":""); + } + else + dbg_printf("%s, %s, [%s], #%d", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], offset); + return 0; +} + struct inst_arm { UINT mask; @@ -1226,6 +1293,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 }, { 0xee000000, 0xec000000, thumb2_disasm_coprocdatatrans }, { 0xfe402000, 0xe8000000, thumb2_disasm_ldrstrmul }, + { 0xfe400000, 0xe8400000, thumb2_disasm_ldrstrextbr }, { 0x00000000, 0x00000000, NULL } };

1 0

Piotr Caban : msvcrt: Fixed get_this_pointer implementation.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: b9c71ffd42ee4021fea363661d65170994482c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c71ffd42ee4021fea363661… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 16:13:50 2012 +0100 msvcrt: Fixed get_this_pointer implementation. --- dlls/msvcrt/cppexcept.h | 17 +++++++++-------- dlls/msvcrt/tests/cpp.c | 12 ++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index d9ed2fa..7947a17 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -133,20 +133,21 @@ static inline const char *dbgstr_type_info( const type_info *info ) /* compute the this pointer for a base class of a given type */ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object ) { - void *this_ptr; - int *offset_ptr; - if (!object) return NULL; - this_ptr = (char *)object + off->this_offset; + if (off->vbase_descr >= 0) { + int *offset_ptr; + /* move this ptr to vbase descriptor */ - this_ptr = (char *)this_ptr + off->vbase_descr; + object = (char *)object + off->vbase_descr; /* and fetch additional offset from vbase descriptor */ - offset_ptr = (int *)(*(char **)this_ptr + off->vbase_offset); - this_ptr = (char *)this_ptr + *offset_ptr; + offset_ptr = (int *)(*(char **)object + off->vbase_offset); + object = (char *)object + *offset_ptr; } - return this_ptr; + + object = (char *)object + off->this_offset; + return object; } #ifndef __x86_64__ diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 8baf9b6..88f8225 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -901,6 +901,12 @@ static void test_rtti(void) { {RTTI_REF(child_class_rtti, base_descriptor[0]), RTTI_REF(child_class_rtti, base_descriptor[1])} }, {0, 0, 2, RTTI_REF(child_class_rtti, base_array)}, {1, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} + }, virtual_base_class_rtti = { + { {NULL, NULL, "simple_class"}, {NULL, NULL, "child_class"} }, + { {RTTI_REF(virtual_base_class_rtti, type_info[1]), 0, {0x10, sizeof(void*), sizeof(int)}, 0}, {RTTI_REF(virtual_base_class_rtti, type_info[0]), 0, {8, -1, 0}, 0} }, + { {RTTI_REF(virtual_base_class_rtti, base_descriptor[0]), RTTI_REF(virtual_base_class_rtti, base_descriptor[1])} }, + {0, 0, 2, RTTI_REF(virtual_base_class_rtti, base_array)}, + {1, 0, 0, RTTI_REF(virtual_base_class_rtti, type_info[1]), RTTI_REF(virtual_base_class_rtti, object_hierarchy), RTTI_REF(virtual_base_class_rtti, object_locator)} }; static struct rtti_data simple_class_sig0_rtti, child_class_sig0_rtti; @@ -912,6 +918,9 @@ static void test_rtti(void) void *simple_class_sig0 = &simple_class_sig0_vtbl[1]; void *child_class_sig0_vtbl[2] = {&child_class_sig0_rtti.object_locator}; void *child_class_sig0 = &child_class_sig0_vtbl[1]; + void *virtual_base_class_vtbl[2] = {&virtual_base_class_rtti.object_locator}; + int virtual_base_class_vbtbl[2] = {0, 0x100}; + void *virtual_base_class[2] = {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl}; static const char* e_name = "name"; type_info *ti,*bti; @@ -1026,6 +1035,9 @@ static void test_rtti(void) casted = p__RTDynamicCast(&child_class, 0, &child_class_rtti.type_info[0], &child_class_rtti.type_info[1], 0); ok(casted == (char*)&child_class+4, "failed cast to child class (%p %p)\n", casted, &child_class); + + casted = p__RTDynamicCast(&virtual_base_class, 0, &virtual_base_class_rtti.type_info[0], &virtual_base_class_rtti.type_info[1], 0); + ok(casted == (char*)&virtual_base_class+0x110+sizeof(void*), "failed cast to child class (%p %p)\n", casted, &virtual_base_class); } struct _demangle {

1 0

Piotr Caban : msvcrt: Fixed mkgmtime and _mkgmtime64 implementation.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: c9a7436812560b612f83b9d44388ff2de8682780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a7436812560b612f83b9d44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 10 12:47:26 2012 +0100 msvcrt: Fixed mkgmtime and _mkgmtime64 implementation. --- dlls/msvcrt/time.c | 30 +++--------------------------- 1 files changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e484bf4..60c7120 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -348,32 +348,7 @@ MSVCRT___time32_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm) */ MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time) { - SYSTEMTIME st; - FILETIME ft; - MSVCRT___time64_t ret; - int i; - - st.wMilliseconds = 0; - st.wSecond = time->tm_sec; - st.wMinute = time->tm_min; - st.wHour = time->tm_hour; - st.wDay = time->tm_mday; - st.wMonth = time->tm_mon+1; - st.wYear = time->tm_year+1900; - - if(!SystemTimeToFileTime(&st, &ft)) - return -1; - - FileTimeToSystemTime(&ft, &st); - time->tm_wday = st.wDayOfWeek; - - for(i=time->tm_yday=0; i<st.wMonth-1; i++) - time->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; - time->tm_yday += st.wDay-1; - - ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime; - ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC; - return ret; + return mktime_helper(time, FALSE); } /********************************************************************** @@ -381,7 +356,8 @@ MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time) */ MSVCRT___time32_t CDECL MSVCRT__mkgmtime32(struct MSVCRT_tm *time) { - return MSVCRT__mkgmtime64(time); + MSVCRT___time64_t ret = MSVCRT__mkgmtime64(time); + return ret == (MSVCRT___time32_t)ret ? ret : -1; } /**********************************************************************

1 0

Andrew Talbot : windowscodecs: Remove unneeded address-of operator from array name.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: c31909e894f539223852e17811536ccf4f186d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31909e894f539223852e1781… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 8 18:36:33 2012 +0000 windowscodecs: Remove unneeded address-of operator from array name. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 84838e2..8ebcf3d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1140,7 +1140,7 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p seek.QuadPart = 0; IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - IStream_Read(pIStream, &This->LSD_data, sizeof(This->LSD_data), NULL); + IStream_Read(pIStream, This->LSD_data, sizeof(This->LSD_data), NULL); This->initialized = TRUE;

1 0