May 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Add explicit 32- and 64-bit versions of the time functions.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 8408e3a9551475a06e25b470ca5201935bf03478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8408e3a9551475a06e25b470c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:06:29 2009 +0200 msvcrt: Add explicit 32- and 64-bit versions of the time functions. --- dlls/msvcrt/msvcrt.h | 18 ++-- dlls/msvcrt/msvcrt.spec | 16 +++ dlls/msvcrt/tests/headers.c | 15 ++- dlls/msvcrt/time.c | 245 +++++++++++++++++++++++++++++++++++++++---- include/msvcrt/crtdefs.h | 14 ++- include/msvcrt/sys/timeb.h | 22 ++++- include/msvcrt/time.h | 49 ++++++++-- include/msvcrt/wchar.h | 13 ++- 8 files changed, 346 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8408e3a9551475a06e25b…

1 0

Alexandre Julliard : msvcrt: Add explicit 32- and 64-bit versions of the utime functions.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 4a7b3460ef6eacc895e13b1bb35c8e6518f96fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7b3460ef6eacc895e13b1bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:10:05 2009 +0200 msvcrt: Add explicit 32- and 64-bit versions of the utime functions. --- dlls/msvcrt/file.c | 117 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.h | 12 +++- dlls/msvcrt/msvcrt.spec | 6 ++ dlls/msvcrt/tests/headers.c | 9 ++- include/msvcrt/sys/utime.h | 29 ++++++++++- 5 files changed, 147 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7e1210c..dd15b5d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -141,6 +141,16 @@ static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct buf->st_ctime = buf64->st_ctime; } +static void time_to_filetime( MSVCRT___time64_t time, FILETIME *ft ) +{ + /* 1601 to 1970 is 369 years plus 89 leap days */ + static const __int64 secs_1601_to_1970 = ((369 * 365 + 89) * (__int64)86400); + + __int64 ticks = (time + secs_1601_to_1970) * 10000000; + ft->dwHighDateTime = ticks >> 32; + ft->dwLowDateTime = ticks; +} + static inline BOOL msvcrt_is_valid_fd(int fd) { return fd >= 0 && fd < MSVCRT_fdend && (MSVCRT_fdesc[fd].wxflag & WX_OPEN); @@ -1213,27 +1223,22 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) } /********************************************************************* - * _futime (MSVCRT.@) + * _futime64 (MSVCRT.@) */ -int CDECL _futime(int fd, struct MSVCRT__utimbuf *t) +int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) { HANDLE hand = msvcrt_fdtoh(fd); FILETIME at, wt; if (!t) { - MSVCRT_time_t currTime; - MSVCRT_time(&currTime); - RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); - wt = at; + time_to_filetime( MSVCRT__time64(NULL), &at ); + wt = at; } else { - RtlSecondsSince1970ToTime(t->actime, (LARGE_INTEGER *)&at); - if (t->actime == t->modtime) - wt = at; - else - RtlSecondsSince1970ToTime(t->modtime, (LARGE_INTEGER *)&wt); + time_to_filetime( t->actime, &at ); + time_to_filetime( t->modtime, &wt ); } if (!SetFileTime(hand, NULL, &at, &wt)) @@ -1245,6 +1250,32 @@ int CDECL _futime(int fd, struct MSVCRT__utimbuf *t) } /********************************************************************* + * _futime32 (MSVCRT.@) + */ +int CDECL _futime32(int fd, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _futime64( fd, &t64 ); +} + +/********************************************************************* + * _futime (MSVCRT.@) + */ +#ifdef _WIN64 +int CDECL _futime(int fd, struct MSVCRT___utimbuf64 *t) +{ + return _futime64( fd, t ); +} +#else +int CDECL _futime(int fd, struct MSVCRT___utimbuf32 *t) +{ + return _futime32( fd, t ); +} +#endif + +/********************************************************************* * _get_osfhandle (MSVCRT.@) */ MSVCRT_intptr_t CDECL _get_osfhandle(int fd) @@ -2053,15 +2084,15 @@ int CDECL MSVCRT__umask(int umask) } /********************************************************************* - * _utime (MSVCRT.@) + * _utime64 (MSVCRT.@) */ -int CDECL _utime(const char* path, struct MSVCRT__utimbuf *t) +int CDECL _utime64(const char* path, struct MSVCRT___utimbuf64 *t) { int fd = MSVCRT__open(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = _futime64(fd, t); MSVCRT__close(fd); return retVal; } @@ -2069,15 +2100,41 @@ int CDECL _utime(const char* path, struct MSVCRT__utimbuf *t) } /********************************************************************* - * _wutime (MSVCRT.@) + * _utime32 (MSVCRT.@) + */ +int CDECL _utime32(const char* path, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _utime64( path, &t64 ); +} + +/********************************************************************* + * _utime (MSVCRT.@) */ -int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT__utimbuf *t) +#ifdef _WIN64 +int CDECL _utime(const char* path, struct MSVCRT___utimbuf64 *t) +{ + return _utime64( path, t ); +} +#else +int CDECL _utime(const char* path, struct MSVCRT___utimbuf32 *t) +{ + return _utime32( path, t ); +} +#endif + +/********************************************************************* + * _wutime64 (MSVCRT.@) + */ +int CDECL _wutime64(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) { int fd = _wopen(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = _futime64(fd, t); MSVCRT__close(fd); return retVal; } @@ -2085,6 +2142,32 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT__utimbuf *t) } /********************************************************************* + * _wutime32 (MSVCRT.@) + */ +int CDECL _wutime32(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) +{ + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _wutime64( path, &t64 ); +} + +/********************************************************************* + * _wutime (MSVCRT.@) + */ +#ifdef _WIN64 +int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) +{ + return _wutime64( path, t ); +} +#else +int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) +{ + return _wutime32( path, t ); +} +#endif + +/********************************************************************* * _write (MSVCRT.@) */ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 70ad8e2..c10c8d3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -335,10 +335,16 @@ struct MSVCRT__wfinddatai64_t { MSVCRT_wchar_t name[260]; }; -struct MSVCRT__utimbuf +struct MSVCRT___utimbuf32 { - MSVCRT_time_t actime; - MSVCRT_time_t modtime; + MSVCRT___time32_t actime; + MSVCRT___time32_t modtime; +}; + +struct MSVCRT___utimbuf64 +{ + MSVCRT___time64_t actime; + MSVCRT___time64_t modtime; }; /* for FreeBSD */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 759d0c0..b56aba0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -272,6 +272,8 @@ @ cdecl -ret64 _ftol() ntdll._ftol @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) +@ cdecl _futime32(long ptr) +@ cdecl _futime64(long ptr) @ cdecl _gcvt(double long str) @ cdecl _get_osfhandle(long) @ cdecl _get_sbh_threshold() @@ -521,6 +523,8 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) +@ cdecl _utime32(str ptr) +@ cdecl _utime64(str ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) @ cdecl _vscwprintf(wstr ptr) @@ -608,6 +612,8 @@ @ cdecl _wtol(wstr) ntdll._wtol @ cdecl _wunlink(wstr) @ cdecl _wutime(wstr ptr) +@ cdecl _wutime32(wstr ptr) +@ cdecl _wutime64(wstr ptr) @ cdecl _y0(double) @ cdecl _y1(double) @ cdecl _yn(long double ) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 603134f..b9fdbd7 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -219,9 +219,12 @@ static void test_structs(void) CHECK_FIELD(_wfinddatai64_t, time_write); CHECK_FIELD(_wfinddatai64_t, size); CHECK_FIELD(_wfinddatai64_t, name[260]); - CHECK_STRUCT(_utimbuf); - CHECK_FIELD(_utimbuf, actime); - CHECK_FIELD(_utimbuf, modtime); + CHECK_STRUCT(__utimbuf32); + CHECK_FIELD(__utimbuf32, actime); + CHECK_FIELD(__utimbuf32, modtime); + CHECK_STRUCT(__utimbuf64); + CHECK_FIELD(__utimbuf64, actime); + CHECK_FIELD(__utimbuf64, modtime); CHECK_STRUCT(_stat); CHECK_FIELD(_stat, st_dev); CHECK_FIELD(_stat, st_ino); diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h index 95b1f9b..014351b 100644 --- a/include/msvcrt/sys/utime.h +++ b/include/msvcrt/sys/utime.h @@ -31,15 +31,38 @@ struct _utimbuf time_t actime; time_t modtime; }; +struct __utimbuf32 +{ + __time32_t actime; + __time32_t modtime; +}; +struct __utimbuf64 +{ + __time64_t actime; + __time64_t modtime; +}; #endif /* _UTIMBUF_DEFINED */ #ifdef __cplusplus extern "C" { #endif -int __cdecl _futime(int,struct _utimbuf*); -int __cdecl _utime(const char*,struct _utimbuf*); -int __cdecl _wutime(const wchar_t*,struct _utimbuf*); +int __cdecl _futime32(int,struct __utimbuf32*); +int __cdecl _futime64(int,struct __utimbuf64*); +int __cdecl _utime32(const char*,struct __utimbuf32*); +int __cdecl _utime64(const char*,struct __utimbuf64*); +int __cdecl _wutime32(const wchar_t*,struct __utimbuf32*); +int __cdecl _wutime64(const wchar_t*,struct __utimbuf64*); + +#ifdef _USE_32BIT_TIME_T +static inline int _futime(int fd, struct _utimbuf *buf) { return _futime32(fd, (struct __utimbuf32*)buf); } +static inline int _utime(const char *s, struct _utimbuf *buf) { return _utime32(s, (struct __utimbuf32*)buf); } +static inline int _wutime(const wchar_t *s, struct _utimbuf *buf) { return _wutime32(s, (struct __utimbuf32*)buf); } +#else +static inline int _futime(int fd, struct _utimbuf *buf) { return _futime64(fd, (struct __utimbuf64*)buf); } +static inline int _utime(const char *s, struct _utimbuf *buf) { return _utime64(s, (struct __utimbuf64*)buf); } +static inline int _wutime(const wchar_t *s, struct _utimbuf *buf) { return _wutime64(s, (struct __utimbuf64*)buf); } +#endif #ifdef __cplusplus }

1 0

Huw Davies : ole32/tests: Fix tests on systems without IE installed.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 628a8743d271403c208c9e9cd2732e5f18fd603c URL: http://source.winehq.org/git/wine.git/?a=commit;h=628a8743d271403c208c9e9cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 14:53:21 2009 +0100 ole32/tests: Fix tests on systems without IE installed. --- dlls/ole32/tests/compobj.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7363f30..d9d684d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -253,6 +253,13 @@ static void test_CoCreateInstance(void) OleInitialize(NULL); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + if(hr == REGDB_E_CLASSNOTREG) + { + skip("IE not installed so can't test CoCreateInstance\n"); + OleUninitialize(); + return; + } + ok_ole_success(hr, "CoCreateInstance"); if(pUnk) IUnknown_Release(pUnk); OleUninitialize(); @@ -325,8 +332,13 @@ static void test_CoGetClassObject(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); + if(hr == REGDB_E_CLASSNOTREG) + skip("IE not installed so can't test CoGetClassObject\n"); + else + { + ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + } SetEvent(info.stop); WaitForSingleObject(thread, INFINITE); @@ -1030,7 +1042,7 @@ static void test_CoFreeUnusedLibraries(void) hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pUnk); if (hr == REGDB_E_CLASSNOTREG) { - trace("IE not installed so can't run CoFreeUnusedLibraries test\n"); + skip("IE not installed so can't run CoFreeUnusedLibraries test\n"); CoUninitialize(); return; }

1 0

Huw Davies : comdlg32/tests: PrintDlgExW returns E_NOTIMPL on some versions of winME.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 7ac3fe280f8f22ba0dc3fe4315bded6fbdc2d7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac3fe280f8f22ba0dc3fe431… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 15:13:15 2009 +0100 comdlg32/tests: PrintDlgExW returns E_NOTIMPL on some versions of winME. --- dlls/comdlg32/tests/printdlg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index ec63da9..4e189ee 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -246,6 +246,11 @@ static void test_PrintDlgExW(void) PrintDlg(NULL); SetLastError(0xdeadbeef); res = pPrintDlgExW(NULL); + if(res == E_NOTIMPL) + { + win_skip("PrintDlgExW returns not implemented\n"); + return; + } ok( (res == E_INVALIDARG), "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", res, GetLastError(), CommDlgExtendedError());

1 0

Aric Stewart : msctf: Implement ITextStoreACPSink::OnStatusChange.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 6117ea47b32b77a488e3fbbd89ba310218e6cc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6117ea47b32b77a488e3fbbd8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 22 14:49:30 2009 -0500 msctf: Implement ITextStoreACPSink::OnStatusChange. Requires changes in the way document locking is implemented and tested. --- dlls/msctf/context.c | 43 +++++++++++++++++++++++++++++------- dlls/msctf/tests/inputprocessor.c | 37 +++++++++++++++---------------- 2 files changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 8e14a72..35838c9 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -70,6 +70,7 @@ typedef struct tagContext { TfClientId tidOwner; TfEditCookie defaultCookie; + TS_STATUS documentStatus; ITextStoreACP *pITextStoreACP; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; @@ -223,7 +224,6 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, HRESULT hr; Context *This = (Context *)iface; DWORD dwLockFlags = 0x0; - TS_STATUS status; TRACE("(%p) %i %p %x %p\n",This, tid, pes, dwFlags, phrSession); @@ -248,10 +248,10 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, else if (dwFlags & TF_ES_READ) dwLockFlags |= TS_LF_READ; - /* TODO: cache this */ - ITextStoreACP_GetStatus(This->pITextStoreACP, &status); + if (!This->documentStatus.dwDynamicFlags) + ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); - if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (status.dwDynamicFlags & TS_SD_READONLY)) + if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (This->documentStatus.dwDynamicFlags & TS_SD_READONLY)) { *phrSession = TS_E_READONLY; return S_OK; @@ -263,7 +263,6 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, return E_INVALIDARG; } - hr = ITextStoreACP_RequestLock(This->pITextStoreACP, dwLockFlags, phrSession); return hr; @@ -739,8 +738,28 @@ static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, DWORD dwFlags) { TextStoreACPSink *This = (TextStoreACPSink *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HRESULT hr, hrSession; + + TRACE("(%p) %x\n",This, dwFlags); + + if (!This->pContext) + { + ERR("No context?\n"); + return E_FAIL; + } + + if (!This->pContext->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + hr = ITextStoreACP_RequestLock(This->pContext->pITextStoreACP, TS_LF_READ, &hrSession); + + if(SUCCEEDED(hr) && SUCCEEDED(hrSession)) + This->pContext->documentStatus.dwDynamicFlags = dwFlags; + + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnAttrsChange(ITextStoreACPSink *iface, @@ -761,12 +780,18 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, TRACE("(%p) %x\n",This, dwLockFlags); - if (!This->pContext || !This->pContext->currentEditSession) + if (!This->pContext) { - ERR("OnLockGranted called on a context without a current edit session\n"); + ERR("OnLockGranted called without a context\n"); return E_FAIL; } + if (!This->pContext->currentEditSession) + { + FIXME("OnLockGranted called for something other than an EditSession\n"); + return S_OK; + } + cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); if (!cookie) return E_OUTOFMEMORY; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 5884a30..bdb9a62 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -38,6 +38,8 @@ static ITfDocumentMgr *g_dm = NULL; static TfClientId cid = 0; static TfClientId tid = 0; +static ITextStoreACPSink *ACPSink; + #define SINK_UNEXPECTED 0 #define SINK_EXPECTED 1 #define SINK_FIRED 2 @@ -47,6 +49,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static DWORD documentStatus; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static INT test_OnSetFocus = SINK_UNEXPECTED; @@ -70,7 +73,6 @@ typedef struct tagTextStoreACP const ITextStoreACPVtbl *TextStoreACPVtbl; LONG refCount; - ITextStoreACPSink *sink; } TextStoreACP; static void TextStoreACP_Destructor(TextStoreACP *This) @@ -117,13 +119,12 @@ static ULONG WINAPI TextStoreACP_Release(ITextStoreACP *iface) static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { - TextStoreACP *This = (TextStoreACP *)iface; HRESULT hr; ok(test_ACP_AdviseSink == SINK_EXPECTED, "Unexpected TextStoreACP_AdviseSink sink\n"); test_ACP_AdviseSink = SINK_FIRED; - hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&This->sink)); + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&ACPSink)); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); return S_OK; } @@ -138,28 +139,17 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, DWORD dwLockFlags, HRESULT *phrSession) { - TextStoreACP *This = (TextStoreACP *)iface; - ok(test_ACP_RequestLock == SINK_EXPECTED,"Unexpected TextStoreACP_RequestLock\n"); test_ACP_RequestLock = SINK_FIRED; - test_DoEditSession = SINK_EXPECTED; - *phrSession = ITextStoreACPSink_OnLockGranted(This->sink, TS_LF_READWRITE); - ok(test_DoEditSession = SINK_FIRED,"expected DoEditSession not fired\n"); - ok(*phrSession == 0xdeadcafe,"Unexpected return from ITextStoreACPSink_OnLockGranted\n"); + *phrSession = ITextStoreACPSink_OnLockGranted(ACPSink, dwLockFlags); return S_OK; } static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - static UINT count = 0; - count ++; - - if (count == 1) - ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); - else - todo_wine ok(count == 1,"GetStatus called too many times\n"); + ok(test_ACP_GetStatus == SINK_EXPECTED, "Unexpected TextStoreACP_GetStatus\n"); test_ACP_GetStatus = SINK_FIRED; - pdcs->dwDynamicFlags = TS_SD_READONLY; + pdcs->dwDynamicFlags = documentStatus; return S_OK; } static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, @@ -1483,6 +1473,7 @@ static void test_TStoApplicationText(void) ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); + documentStatus = TS_SD_READONLY; hrSession = 0xfeedface; test_ACP_GetStatus = SINK_EXPECTED; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); @@ -1490,13 +1481,21 @@ static void test_TStoApplicationText(void) ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%x)\n",hrSession); ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); - test_ACP_GetStatus = SINK_UNEXPECTED; + /* signal a change to allow readwrite sessions */ + documentStatus = 0; test_ACP_RequestLock = SINK_EXPECTED; + ITextStoreACPSink_OnStatusChange(ACPSink,documentStatus); + ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); + + test_ACP_GetStatus = SINK_EXPECTED; + test_ACP_RequestLock = SINK_EXPECTED; + test_DoEditSession = SINK_EXPECTED; hrSession = 0xfeedface; - hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READ, &hrSession); + hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); ok(test_ACP_RequestLock == SINK_FIRED," expected RequestLock not fired\n"); ok(test_DoEditSession == SINK_FIRED," expected DoEditSession not fired\n"); + ok(test_ACP_GetStatus == SINK_FIRED," expected GetStatus not fired\n"); ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); ITfContext_Release(cxt);

1 0

Alexandre Julliard : msvcrt/tests: Make all msvcrt function pointers cdecl.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 7e082f66082cba5a54e03f996c84e04dcd1990be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e082f66082cba5a54e03f996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 23 11:21:28 2009 +0200 msvcrt/tests: Make all msvcrt function pointers cdecl. --- dlls/msvcrt/tests/cpp.c | 16 ++++++++-------- dlls/msvcrt/tests/data.c | 6 +++--- dlls/msvcrt/tests/heap.c | 10 +++++----- dlls/msvcrt/tests/printf.c | 6 +++--- dlls/msvcrt/tests/string.c | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 9c9158d..d640d67 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -55,10 +55,10 @@ typedef struct __type_info /* Function pointers. We need to use these to call these funcs as __thiscall */ static HMODULE hMsvcrt; -static void* (*poperator_new)(unsigned int); -static void (*poperator_delete)(void*); -static void* (*pmalloc)(unsigned int); -static void (*pfree)(void*); +static void* (__cdecl *poperator_new)(unsigned int); +static void (__cdecl *poperator_delete)(void*); +static void* (__cdecl *pmalloc)(unsigned int); +static void (__cdecl *pfree)(void*); /* exception */ static void (WINAPI *pexception_ctor)(exception*,LPCSTR*); @@ -113,12 +113,12 @@ static int (WINAPI *ptype_info_opequals_equals)(type_info*,type_info*); static int (WINAPI *ptype_info_opnot_equals)(type_info*,type_info*); /* RTTI */ -static type_info* (*p__RTtypeid)(void*); -static void* (*p__RTCastToVoid)(void*); -static void* (*p__RTDynamicCast)(void*,int,void*,void*,int); +static type_info* (__cdecl *p__RTtypeid)(void*); +static void* (__cdecl *p__RTCastToVoid)(void*); +static void* (__cdecl *p__RTDynamicCast)(void*,int,void*,void*,int); /*Demangle*/ -static char* (*p__unDName)(char*,const char*,int,void*,void*,unsigned short int); +static char* (__cdecl *p__unDName)(char*,const char*,int,void*,void*,unsigned short int); /* _very_ early native versions have serious RTTI bugs, so we check */ diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 01704ac..a27ca27 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -31,12 +31,12 @@ #include <process.h> #include <errno.h> -typedef void (*_INITTERMFUN)(void); -static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +typedef void (__cdecl *_INITTERMFUN)(void); +static void (__cdecl *p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static int callbacked; -static void initcallback(void) +static void __cdecl initcallback(void) { callbacked++; } diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 7d3db23..3587e0e 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -23,11 +23,11 @@ #include <errno.h> #include "wine/test.h" -static void (*p_aligned_free)(void*) = NULL; -static void * (*p_aligned_malloc)(size_t,size_t) = NULL; -static void * (*p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; -static void * (*p_aligned_realloc)(void*,size_t,size_t) = NULL; -static void * (*p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; +static void (__cdecl *p_aligned_free)(void*) = NULL; +static void * (__cdecl *p_aligned_malloc)(size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t) = NULL; +static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; static void test_aligned_malloc(unsigned int size, unsigned int alignment) { diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 66bab15..cea4db3 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -782,7 +782,7 @@ static void test_xcvt(void) } } -static int _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -810,8 +810,8 @@ static void test_vsnwprintf(void) ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); } -static int (*p__vscprintf)(const char *format, __ms_va_list valist); -static int (*p__vscwprintf)(const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); +static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int __cdecl _vscprintf_wrapper(const char *format, ...) { diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3286e91..96bcb7f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -45,12 +45,12 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } #define expect_bin(buf, value, len) { ok(memcmp((buf), value, len) == 0, "Binary buffer mismatch - expected %s, got %s\n", buf_to_string((unsigned char *)value, len, 1), buf_to_string((buf), len, 0)); } -static void* (*pmemcpy)(void *, const void *, size_t n); -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); +static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); +static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); +static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); +static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); +static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int *p__mb_cur_max; static unsigned char *p_mbctype;

1 0

Maik Schulz : website: german translation of release 1.1.22 news item
by Maik Schulz May 23, 2009

May 23, 2009

Module: website Branch: master Commit: 81a0877541b107e3fda5fba11adf98ee5f7ff07e URL: http://source.winehq.org/git/website.git/?a=commit;h=81a0877541b107e3fda5fb… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat May 23 13:59:42 2009 +0200 website: german translation of release 1.1.22 news item --- news/de/2009052201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009052201.xml b/news/de/2009052201.xml new file mode 100644 index 0000000..ca7784b --- /dev/null +++ b/news/de/2009052201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. Mai 2009</date> +<title>Wine 1.1.22 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Verbesserungen am OLE Kopieren/Einfügen.</li> + <li>Erste Behandlung von x86_64 Exceptions.</li> + <li>Korrekturen am Direct3D Locking.</li> + <li>Verbesserungen an ARB Shadern.</li> + <li>Bessere Unterstützung des OpenGL Pixel Formats.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.22.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.22
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: website Branch: master Commit: 64947efc104df3c1a7ff89e76954f2baf7fba6dd URL: http://source.winehq.org/git/website.git/?a=commit;h=64947efc104df3c1a7ff89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 18:04:46 2009 +0200 Wine release 1.1.22 --- news/en/2009052201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009052201.xml b/news/en/2009052201.xml new file mode 100644 index 0000000..932d60a --- /dev/null +++ b/news/en/2009052201.xml @@ -0,0 +1,17 @@ +<news> +<date>May 22, 2009</date> +<title>Wine 1.1.22 Released</title> +<body> + The Wine development release 1.1.22 is now available. + <a href="{$root}/announce/1.1.22">What's new</a> in this release: +<ul> + <li>More improvements to OLE copy/paste.</li> + <li>Beginnings of x86_64 exception handling.</li> + <li>Direct3D locking fixes.</li> + <li>ARB shaders improvements.</li> + <li>Better OpenGL pixel format support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.22.
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: master Commit: b175a43fb8439a33a686512935597d4c43c19733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b175a43fb8439a33a68651293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 17:58:14 2009 +0200 Release 1.1.22. --- ANNOUNCE | 950 ++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 517 insertions(+), 453 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b175a43fb8439a33a6865…

1 0

Tag wine-1.1.22 : Alexandre Julliard : Release 1.1.22
by Alexandre Julliard May 22, 2009

May 22, 2009

Module: wine Branch: refs/tags/wine-1.1.22 Tag: 0639eb72b6aa4ae2cce3be392f301a553a7e777e URL: http://source.winehq.org/git/wine.git/?a=tag;h=0639eb72b6aa4ae2cce3be392f30… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 17:58:15 2009 +0200 Release 1.1.22

1 0