November 2015 - Wine-commits

Nikolay Sivov : usp10: Remove unused helper (Clang).
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: f47f8d2acdca96d2bcd970e54a6065bf485560d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47f8d2acdca96d2bcd970e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 27 21:51:59 2015 +0300 usp10: Remove unused helper (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f3fb369..f0bbafe 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -719,11 +719,6 @@ static inline void *heap_alloc_zero(SIZE_T size) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc_zero(LPVOID mem, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - static inline BOOL heap_free(LPVOID mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Sebastian Lackner : winex11.drv: Fix specfile entry for X11DRV_ScrollDC.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: 7ffbd0e1f447ace03a1708ebbe32be82a48a611f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffbd0e1f447ace03a1708ebb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 06:04:04 2015 +0100 winex11.drv: Fix specfile entry for X11DRV_ScrollDC. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/winex11.drv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 182b351..7cdce52 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -36,7 +36,7 @@ @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) X11DRV_MsgWaitForMultipleObjectsEx @ cdecl ReleaseDC(long long) X11DRV_ReleaseDC -@ cdecl ScrollDC(long long long) X11DRV_ScrollDC +@ cdecl ScrollDC(long long long long) X11DRV_ScrollDC @ cdecl SetClipboardData(long long long) X11DRV_SetClipboardData @ cdecl SetCapture(long long) X11DRV_SetCapture @ cdecl SetFocus(long) X11DRV_SetFocus

1 0

Sebastian Lackner : winemac.drv: Fix specfile entry for ImeGetRegisterWordStyle.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: 0ef9d775f0e9405396976c9532d132b694523e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef9d775f0e9405396976c953… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 06:05:20 2015 +0100 winemac.drv: Fix specfile entry for ImeGetRegisterWordStyle. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/winemac.drv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a97177d..aed05d9 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -60,7 +60,7 @@ @ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr) @ stdcall ImeEscape(long long ptr) @ stdcall ImeGetImeMenuItems(long long long ptr ptr long) -@ stdcall ImeGetRegisterWordStyle(wstr long wstr) +@ stdcall ImeGetRegisterWordStyle(long ptr) @ stdcall ImeInquire(ptr wstr wstr) @ stdcall ImeProcessKey(long long long ptr) @ stdcall ImeRegisterWord(wstr long wstr)

1 0

Sebastian Lackner : wined3d: Fix specfile entry for wined3d_swapchain_get_back_buffer.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: 0df64fc3943dd2037c033a78c55dcd6697deb087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df64fc3943dd2037c033a78c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 06:06:27 2015 +0100 wined3d: Fix specfile entry for wined3d_swapchain_get_back_buffer. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d70a0c4..7df80fb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -243,7 +243,7 @@ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) -@ cdecl wined3d_swapchain_get_back_buffer(ptr long long) +@ cdecl wined3d_swapchain_get_back_buffer(ptr long) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long)

1 0

Sebastian Lackner : msvcrt: Fix specfile entry for $I10_OUTPUT and _wcstod_l.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: e00999ccf48112af4a5c23db4d4e7e6d675b451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00999ccf48112af4a5c23db4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 06:07:50 2015 +0100 msvcrt: Fix specfile entry for $I10_OUTPUT and _wcstod_l. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bd854a4..c1f41da 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1,6 +1,6 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) MSVCRT_I10_OUTPUT @ cdecl -arch=arm ??0__non_rtti_object(a)std@@QAA(a)ABV01@@Z(ptr ptr) MSVCRT___non_rtti_object_copy_ctor @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)ABV0@@Z(ptr ptr) MSVCRT___non_rtti_object_copy_ctor @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA(a)AEBV0@@Z(ptr ptr) MSVCRT___non_rtti_object_copy_ctor @@ -1121,7 +1121,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 368e8a1..ef76adf 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -773,7 +773,7 @@ @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)Z @ thiscall -arch=win32 ?xsputn(a)streambuf@@UAEHPBDH(a)Z(ptr ptr long) msvcirt.?xsputn(a)streambuf@@UAEHPBDH(a)Z @ cdecl -arch=win64 ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z(ptr ptr long) msvcirt.?xsputn(a)streambuf@@UEAAHPEBDH(a)Z -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos @ cdecl -arch=i386 _CIasin() msvcrt._CIasin @ cdecl -arch=i386 _CIatan() msvcrt._CIatan diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 828165c..2e20f80 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -847,7 +847,7 @@ @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)Z @ thiscall -arch=win32 ?xsputn(a)streambuf@@UAEHPBDH(a)Z(ptr ptr long) msvcirt.?xsputn(a)streambuf@@UAEHPBDH(a)Z @ cdecl -arch=win64 ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z(ptr ptr long) msvcirt.?xsputn(a)streambuf@@UEAAHPEBDH(a)Z -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos @ cdecl -arch=i386 _CIasin() msvcrt._CIasin @ cdecl -arch=i386 _CIatan() msvcrt._CIatan diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1076a9d..91a6090 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -1,6 +1,6 @@ # msvcrtd.dll - MS VC++ Run Time Library -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) msvcrt.$I10_OUTPUT @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)ABV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)ABV0@@Z @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA(a)AEBV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA(a)AEBV0@@Z @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)PBD@Z

1 0

Sebastian Lackner : ntoskrnl.exe: Fix specfile entry for MmMapIoSpace.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: ecfaecd272a03066f5fcfb77dc9e7eba6c50519c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfaecd272a03066f5fcfb77d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 28 06:19:20 2015 +0100 ntoskrnl.exe: Fix specfile entry for MmMapIoSpace. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f59cade..db15265 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -688,7 +688,7 @@ @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection @ stdcall MmLockPagableSectionByHandle(ptr) -@ stdcall MmMapIoSpace(long long long long) +@ stdcall MmMapIoSpace(int64 long long) @ stub MmMapLockedPages @ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) @ stub MmMapLockedPagesWithReservedMapping

1 0

Nikolay Sivov : avifil32: Use __ms_va* varargs variant for AVISave[A, W].
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: 82a9faae2c4f00d177971bd1e830dc89117e6607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a9faae2c4f00d177971bd1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 28 21:24:54 2015 +0300 avifil32: Use __ms_va* varargs variant for AVISave[A,W]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 4612611..cc7e55d 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2278,7 +2278,7 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile) HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2300,13 +2300,13 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, void *); options[i] = va_arg(vl, void *); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); @@ -2321,7 +2321,7 @@ error: HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2343,13 +2343,13 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, void *); options[i] = va_arg(vl, void *); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]);

1 0

Nikolay Sivov : odbc32: Fix SQLBindCol prototype.
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: bd4cb88e6b1ad784747548145cf7c7931a20757d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4cb88e6b1ad784747548145… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 29 01:26:37 2015 +0300 odbc32: Fix SQLBindCol prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 4 ++-- include/sql.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 66b3a65..d7ebf10 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -56,7 +56,7 @@ static SQLRETURN (*pSQLAllocEnv)(SQLHENV*); static SQLRETURN (*pSQLAllocHandle)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*); static SQLRETURN (*pSQLAllocHandleStd)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*); static SQLRETURN (*pSQLAllocStmt)(SQLHDBC,SQLHSTMT*); -static SQLRETURN (*pSQLBindCol)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); +static SQLRETURN (*pSQLBindCol)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLLEN*); static SQLRETURN (*pSQLBindParam)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER*); static SQLRETURN (*pSQLBindParameter)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); static SQLRETURN (*pSQLBrowseConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); @@ -800,7 +800,7 @@ SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType, SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLPOINTER TargetValue, SQLINTEGER BufferLength, - SQLINTEGER *StrLen_or_Ind) + SQLLEN *StrLen_or_Ind) { TRACE("\n"); diff --git a/include/sql.h b/include/sql.h index 3140fcf..423fb40 100644 --- a/include/sql.h +++ b/include/sql.h @@ -507,7 +507,7 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLPOINTER TargetValue, SQLINTEGER BufferLength, - SQLINTEGER *StrLen_or_Ind); + SQLLEN *StrLen_or_Ind); #if (ODBCVER >= 0x0300) SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle,

1 0

Matteo Bruni : msctf: Add a partial implementation of ITfThreadMgrEx_ActivateEx().
by Alexandre Julliard 30 Nov '15

30 Nov '15

Module: wine Branch: master Commit: a977484765160b7326fc65665e842148eb1c5ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a977484765160b7326fc65665… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:30 2015 +0100 msctf: Add a partial implementation of ITfThreadMgrEx_ActivateEx(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 20 ++++++++--------- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/tests/inputprocessor.c | 16 +++++++++++-- dlls/msctf/threadmgr.c | 47 +++++++++++++++++++++------------------ 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 85d2540..a5cfc35 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -53,7 +53,7 @@ typedef struct typedef struct { TF_LANGUAGEPROFILE LanguageProfile; ITfTextInputProcessor *pITfTextInputProcessor; - ITfThreadMgr *pITfThreadMgr; + ITfThreadMgrEx *pITfThreadMgrEx; ITfKeyEventSink *pITfKeyEventSink; TfClientId tid; } ActivatedTextService; @@ -287,7 +287,7 @@ DWORD enumerate_Cookie(DWORD magic, DWORD *index) /***************************************************************************** * Active Text Service Management *****************************************************************************/ -static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) +static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgrEx *tm) { HRESULT hr; @@ -299,7 +299,7 @@ static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) &IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor); if (FAILED(hr)) return hr; - hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, tm, actsvr->tid); + hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, (ITfThreadMgr *)tm, actsvr->tid); if (FAILED(hr)) { ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); @@ -307,8 +307,8 @@ static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) return hr; } - actsvr->pITfThreadMgr = tm; - ITfThreadMgr_AddRef(tm); + actsvr->pITfThreadMgrEx = tm; + ITfThreadMgrEx_AddRef(tm); return hr; } @@ -320,9 +320,9 @@ static HRESULT deactivate_given_ts(ActivatedTextService *actsvr) { hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor); ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); - ITfThreadMgr_Release(actsvr->pITfThreadMgr); + ITfThreadMgrEx_Release(actsvr->pITfThreadMgrEx); actsvr->pITfTextInputProcessor = NULL; - actsvr->pITfThreadMgr = NULL; + actsvr->pITfThreadMgrEx = NULL; } return hr; @@ -351,7 +351,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) ActivatedTextService *actsvr; ITfCategoryMgr *catmgr; AtsEntry *entry; - ITfThreadMgr *tm = TlsGetValue(tlsIndex); + ITfThreadMgrEx *tm = TlsGetValue(tlsIndex); ITfClientId *clientid; if (!tm) return E_UNEXPECTED; @@ -359,7 +359,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); if (!actsvr) return E_OUTOFMEMORY; - ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); + ITfThreadMgrEx_QueryInterface(tm, &IID_ITfClientId, (void **)&clientid); ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); ITfClientId_Release(clientid); @@ -426,7 +426,7 @@ BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *profile) return FALSE; } -HRESULT activate_textservices(ITfThreadMgr *tm) +HRESULT activate_textservices(ITfThreadMgrEx *tm) { HRESULT hr = S_OK; AtsEntry *ats; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 03370bd..06244ea 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -58,7 +58,7 @@ extern DWORD enumerate_Cookie(DWORD magic, DWORD *index) DECLSPEC_HIDDEN; /* activated text services functions */ extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; -extern HRESULT activate_textservices(ITfThreadMgr *tm) DECLSPEC_HIDDEN; +extern HRESULT activate_textservices(ITfThreadMgrEx *tm) DECLSPEC_HIDDEN; extern HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN; extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index c01d5bc..58d4d26 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1409,6 +1409,7 @@ static void test_startSession(void) ITfContext *cxt,*cxt2,*cxt3,*cxtTest; ITextStoreACP *ts; TfClientId cid2 = 0; + ITfThreadMgrEx *tmex; hr = ITfThreadMgr_Deactivate(g_tm); ok(hr == E_UNEXPECTED,"Deactivate should have failed with E_UNEXPECTED\n"); @@ -1421,10 +1422,21 @@ static void test_startSession(void) test_ShouldActivate = FALSE; hr = ITfThreadMgr_Activate(g_tm,&cid2); ok(SUCCEEDED(hr),"Failed to Activate\n"); - ok (cid == cid2, "Second activate client ID does not match\n"); + ok(cid == cid2, "Second activate client ID does not match\n"); + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex); + ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n"); + + hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); + ok(SUCCEEDED(hr), "Failed to Activate\n"); + ok(cid == cid2, "ActivateEx client ID does not match\n"); + + ITfThreadMgrEx_Release(tmex); hr = ITfThreadMgr_Deactivate(g_tm); - ok(SUCCEEDED(hr),"Failed to Deactivate\n"); + ok(SUCCEEDED(hr), "Failed to Deactivate\n"); + hr = ITfThreadMgr_Deactivate(g_tm); + ok(SUCCEEDED(hr), "Failed to Deactivate\n"); test_EnumDocumentMgr(g_tm,NULL,NULL); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index d997cda..3f0e7f6 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -327,29 +327,15 @@ static ULONG WINAPI ThreadMgr_Release(ITfThreadMgrEx *iface) * ITfThreadMgr functions *****************************************************/ -static HRESULT WINAPI ThreadMgr_fnActivate(ITfThreadMgrEx *iface, TfClientId *ptid) +static HRESULT WINAPI ThreadMgr_Activate(ITfThreadMgrEx *iface, TfClientId *id) { ThreadMgr *This = impl_from_ITfThreadMgrEx(iface); - TRACE("(%p) %p\n",This, ptid); - - if (!ptid) - return E_INVALIDARG; - - if (!processId) - { - GUID guid; - CoCreateGuid(&guid); - ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId); - } - - activate_textservices((ITfThreadMgr *)iface); - This->activationCount++; - *ptid = processId; - return S_OK; + TRACE("(%p) %p\n", This, id); + return ITfThreadMgrEx_ActivateEx(iface, id, 0); } -static HRESULT WINAPI ThreadMgr_fnDeactivate(ITfThreadMgrEx *iface) +static HRESULT WINAPI ThreadMgr_Deactivate(ITfThreadMgrEx *iface) { ThreadMgr *This = impl_from_ITfThreadMgrEx(iface); TRACE("(%p)\n",This); @@ -597,8 +583,25 @@ static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id { ThreadMgr *This = impl_from_ITfThreadMgrEx(iface); - FIXME("STUB:(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p) %p, %#x\n", This, id, flags); + + if (!id) + return E_INVALIDARG; + + if (flags) + FIXME("Unimplemented flags %#x\n", flags); + + if (!processId) + { + GUID guid; + CoCreateGuid(&guid); + ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId); + } + + activate_textservices(iface); + This->activationCount++; + *id = processId; + return S_OK; } static HRESULT WINAPI ThreadMgr_GetActiveFlags(ITfThreadMgrEx *iface, DWORD *flags) @@ -614,8 +617,8 @@ static const ITfThreadMgrExVtbl ThreadMgrExVtbl = ThreadMgr_QueryInterface, ThreadMgr_AddRef, ThreadMgr_Release, - ThreadMgr_fnActivate, - ThreadMgr_fnDeactivate, + ThreadMgr_Activate, + ThreadMgr_Deactivate, ThreadMgr_CreateDocumentMgr, ThreadMgr_EnumDocumentMgrs, ThreadMgr_GetFocus,

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8-rc2
by Jeremy Newman 30 Nov '15

30 Nov '15

Module: website Branch: master Commit: 6d82372c71ec57738af9fe07fb0cbcd37254eb7a URL: http://source.winehq.org/git/website.git/?a=commit;h=6d82372c71ec57738af9fe… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Nov 29 08:56:08 2015 +0100 Polish translation for release 1.8-rc2 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015112701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/pl/2015112701.xml b/news/pl/2015112701.xml new file mode 100644 index 0000000..30234b3 --- /dev/null +++ b/news/pl/2015112701.xml @@ -0,0 +1,12 @@ +<news> +<date>Listopad 27, 2015</date> +<title>Wydano Wine 1.8-rc2</title> +<body> + Wydanie rozwojowe Wine 1.8-rc2 jest już dostępne. + <a href="{$root}/announce/1.8-rc2">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0