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

Owen Rudge : shell32: Ensure extraPmts is a valid pointer before checking it.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 5e289b91c0c0b2c68988c45d8ab55825ef0c8d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e289b91c0c0b2c68988c45d8… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 21 23:24:40 2009 -0300 shell32: Ensure extraPmts is a valid pointer before checking it. --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index e2f8b89..e7c7d95 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -783,7 +783,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } /* Now check if there had been a numerical value in the extra params */ - if ((*extraPmts == '@') && (sp == -1)) { + if ((extraPmts) && (*extraPmts == '@') && (sp == -1)) { sp = atoiW(extraPmts + 1); }

1 0

Dylan Smith : richedit: Scrollinfo stored as 16-bit values externally.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 0deb3d04ede7ff1316b86c319ac0b8a6112e0a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0deb3d04ede7ff1316b86c319… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 21 21:06:00 2009 -0400 richedit: Scrollinfo stored as 16-bit values externally. The application Blitzin2 was sending WM_VSCROLL messages to the richedit control directly, when normally this message is supposed to be a notification sent after the scrollinfo is set. Native richedit controls always use the 16-bit value passed to this message to set the scroll position for SB_THUMBPOSITION, rather than trying to find a 32-bit value through GetScrollInfo like I had previously done. --- dlls/riched20/editor.c | 31 +++++++++++++------------------ dlls/riched20/paint.c | 20 ++++++++++++++++++-- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c3cd187..1e18c10 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3587,6 +3587,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, POINT *point = (POINT *)lParam; point->x = editor->horz_si.nPos; point->y = editor->vert_si.nPos; + /* 16-bit scaled value is returned as stored in scrollinfo */ + if (editor->horz_si.nMax > 0xffff) + point->x = MulDiv(point->x, 0xffff, editor->horz_si.nMax); + if (editor->vert_si.nMax > 0xffff) + point->y = MulDiv(point->y, 0xffff, editor->vert_si.nMax); return 1; } case EM_GETTEXTRANGE: @@ -4012,15 +4017,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case SB_THUMBTRACK: case SB_THUMBPOSITION: { - SCROLLINFO sbi; - sbi.cbSize = sizeof(sbi); - sbi.fMask = SIF_TRACKPOS; - /* Try to get 32-bit track position value. */ - if (!GetScrollInfo(editor->hWnd, SB_HORZ, &sbi)) - /* GetScrollInfo failed, settle for 16-bit value in wParam. */ - sbi.nTrackPos = HIWORD(wParam); - - ME_HScrollAbs(editor, sbi.nTrackPos); + int pos = HIWORD(wParam); + if (editor->horz_si.nMax > 0xffff) + pos = MulDiv(pos, editor->horz_si.nMax, 0xffff); + ME_HScrollAbs(editor, pos); break; } } @@ -4064,15 +4064,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case SB_THUMBTRACK: case SB_THUMBPOSITION: { - SCROLLINFO sbi; - sbi.cbSize = sizeof(sbi); - sbi.fMask = SIF_TRACKPOS; - /* Try to get 32-bit track position value. */ - if (!GetScrollInfo(editor->hWnd, SB_VERT, &sbi)) - /* GetScrollInfo failed, settle for 16-bit value in wParam. */ - sbi.nTrackPos = HIWORD(wParam); - - ME_VScrollAbs(editor, sbi.nTrackPos); + int pos = HIWORD(wParam); + if (editor->vert_si.nMax > 0xffff) + pos = MulDiv(pos, editor->vert_si.nMax, 0xffff); + ME_VScrollAbs(editor, pos); break; } } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4b5fed1..a5be178 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1036,17 +1036,21 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) if (editor->horz_si.nPos != x) { x = min(x, editor->horz_si.nMax); x = max(x, editor->horz_si.nMin); - ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, x, TRUE); scrollX = editor->horz_si.nPos - x; editor->horz_si.nPos = x; + if (editor->horz_si.nMax > 0xFFFF) /* scale to 16-bit value */ + x = MulDiv(x, 0xFFFF, editor->horz_si.nMax); + ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, x, TRUE); } if (editor->vert_si.nPos != y) { y = min(y, editor->vert_si.nMax - (int)editor->vert_si.nPage); y = max(y, editor->vert_si.nMin); - ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, y, TRUE); scrollY = editor->vert_si.nPos - y; editor->vert_si.nPos = y; + if (editor->vert_si.nMax > 0xFFFF) /* scale to 16-bit value */ + y = MulDiv(y, 0xFFFF, editor->vert_si.nMax); + ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, y, TRUE); } if (abs(scrollX) > editor->sizeWindow.cx || @@ -1170,6 +1174,12 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && editor->styleFlags & WS_HSCROLL) { + if (si.nMax > 0xFFFF) + { + /* Native scales the scrollbar info to 16-bit external values. */ + si.nPos = MulDiv(si.nPos, 0xFFFF, si.nMax); + si.nMax = 0xFFFF; + } if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); } else { @@ -1219,6 +1229,12 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && editor->styleFlags & WS_VSCROLL) { + if (si.nMax > 0xFFFF) + { + /* Native scales the scrollbar info to 16-bit external values. */ + si.nPos = MulDiv(si.nPos, 0xFFFF, si.nMax); + si.nMax = 0xFFFF; + } if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); } else {

1 0

Juan Lang : winhttp: If the default proxy settings are not found, delete the bogus ones after test.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: e5f4c802dcf94ef8b608ee683354bd7d6ae4834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f4c802dcf94ef8b608ee683… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 12:23:04 2009 -0700 winhttp: If the default proxy settings are not found, delete the bogus ones after test. --- dlls/winhttp/tests/winhttp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bce91fe..76e08e0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -867,7 +867,10 @@ static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) KEY_WRITE, NULL, &key, NULL ); if (!l) { - RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); + if (len) + RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); + else + RegDeleteValueW( key, WinHttpSettings ); RegCloseKey( key ); } }

1 0

Juan Lang : winhttp: Check environment if the registry settings are present but bogus.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 09ee823399a29b24a69cb35beb6fe49950058400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ee823399a29b24a69cb35be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 11:38:54 2009 -0700 winhttp: Check environment if the registry settings are present but bogus. --- dlls/winhttp/session.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2ed53b0..683a6fb 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -851,7 +851,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) { LONG l; HKEY key; - BOOL direct = TRUE; + BOOL got_from_reg = FALSE, direct = TRUE; char *envproxy; TRACE("%p\n", info); @@ -913,6 +913,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } if (sane) { + got_from_reg = TRUE; direct = FALSE; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; @@ -927,7 +928,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } - else if ((envproxy = getenv( "http_proxy" ))) + if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) { char *colon, *http_proxy;

1 0

Juan Lang : winhttp: Strip scheme from http_proxy environment variable.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 68fdc5cb2e8a17cebfcd2e3d0b02c8033612db0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fdc5cb2e8a17cebfcd2e3d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 11:36:52 2009 -0700 winhttp: Strip scheme from http_proxy environment variable. --- dlls/winhttp/session.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 227354d..2ed53b0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -929,19 +929,44 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } else if ((envproxy = getenv( "http_proxy" ))) { - WCHAR *envproxyW; - int len; + char *colon, *http_proxy; - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if ((envproxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) + if ((colon = strchr( envproxy, ':' ))) { - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); - direct = FALSE; - info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - info->lpszProxy = envproxyW; - info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", - debugstr_w(info->lpszProxy)); + if (*(colon + 1) == '/' && *(colon + 2) == '/') + { + static const char http[] = "http://"; + + /* It's a scheme, check that it's http */ + if (!strncmp( envproxy, http, strlen( http ) )) + http_proxy = envproxy + strlen( http ); + else + { + WARN("unsupported scheme in $http_proxy: %s\n", envproxy); + http_proxy = NULL; + } + } + else + http_proxy = envproxy; + } + else + http_proxy = envproxy; + if (http_proxy) + { + WCHAR *http_proxyW; + int len; + + len = MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, NULL, 0 ); + if ((http_proxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) + { + MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, http_proxyW, len ); + direct = FALSE; + info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info->lpszProxy = http_proxyW; + info->lpszProxyBypass = NULL; + TRACE("http proxy (from environment) = %s\n", + debugstr_w(info->lpszProxy)); + } } } if (direct)

1 0

Juan Lang : winhttp: Fix crash when proxy bypass is unset.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 2b460a6c5ac63ee9bcd7eff34e2a5a77b13ba574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b460a6c5ac63ee9bcd7eff34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 11:22:03 2009 -0700 winhttp: Fix crash when proxy bypass is unset. --- dlls/winhttp/session.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e1a2b4b..227354d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -291,6 +291,7 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) LPCWSTR ptr; BOOL ret = FALSE; + if (!session->proxy_bypass) return FALSE; ptr = session->proxy_bypass; do { LPCWSTR tmp = ptr;

1 0

Jacek Caban : msctf.idl: Added more interfaces.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 330590089496555ab6a0052367ec75b024efe676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330590089496555ab6a005236… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 17:31:34 2009 +0200 msctf.idl: Added more interfaces. --- include/msctf.idl | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 332 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index b9890f2..bcd2587 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -33,9 +33,16 @@ cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") +cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") +cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);") +cpp_quote("EXTERN_C const GUID GUID_PROP_LANGID;") +cpp_quote("EXTERN_C const GUID GUID_PROP_READING;") +cpp_quote("EXTERN_C const GUID GUID_PROP_COMPOSING;") + cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") +cpp_quote("DEFINE_GUID(CLSID_TF_DisplayAttributeMgr,0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53);") /* GUIDs for Compartments */ cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_DISABLED;") @@ -150,6 +157,17 @@ interface ITfThreadMgr: IUnknown [out] ITfCompartmentMgr **ppCompMgr); }; +[ + object, + uuid(d7540241-f9a1-4364-befc-dbcd2c4395b7), + pointer_default(unique) +] +interface ITfCompositionView : IUnknown +{ + HRESULT GetOwnerClsid([out] CLSID *pclsid); + + HRESULT GetRange([out] ITfRange **ppRange); +} [ object, @@ -401,6 +419,109 @@ interface ITfInputProcessorProfiles : IUnknown [in] HKL hKL); }; +typedef [uuid(c4cc07f1-80cc-4a7b-bc54-98512782cbe3)] +enum { + TF_LS_NONE = 0, + TF_LS_SOLID = 1, + TF_LS_DOT = 2, + TF_LS_DASH = 3, + TF_LS_SQUIGGLE = 4 +} TF_DA_LINESTYLE; + +typedef [uuid(d9b92e21-084a-401b-9c64-1e6dad91a1ab)] +enum { + TF_CT_NONE = 0, + TF_CT_SYSCOLOR = 1, + TF_CT_COLORREF = 2 +} TF_DA_COLORTYPE; + +typedef [uuid(90d0cb5e-6520-4a0f-b47c-c39bd955f0d6)] +struct TF_DA_COLOR { + TF_DA_COLORTYPE type; + [switch_type(TF_DA_COLORTYPE), switch_is(type)] + union { + [case(TF_CT_SYSCOLOR)] int nIndex; + [case(TF_CT_COLORREF)] COLORREF cr; + }; +} TF_DA_COLOR; + +typedef [uuid(33d2fe4b-6c24-4f67-8d75-3bc1819e4126)] +enum { + TF_ATTR_INPUT = 0, + TF_ATTR_TARGET_CONVERTED = 1, + TF_ATTR_CONVERTED = 2, + TF_ATTR_TARGET_NOTCONVERTED = 3, + TF_ATTR_INPUT_ERROR = 4, + TF_ATTR_FIXEDCONVERTED = 5, + TF_ATTR_OTHER = -1 +} TF_DA_ATTR_INFO; + +typedef [uuid(1bf1c305-419b-4182-a4d2-9bfadc3f021f)] +struct TF_DISPLAYATTRIBUTE { + TF_DA_COLOR crText; + TF_DA_COLOR crBk; + TF_DA_LINESTYLE lsStyle; + BOOL fBoldLine; + TF_DA_COLOR crLine; + TF_DA_ATTR_INFO bAttr; +} TF_DISPLAYATTRIBUTE; + +[ + object, + uuid(70528852-2f26-4aea-8c96-215150578932), + pointer_default(unique) +] +interface ITfDisplayAttributeInfo : IUnknown +{ + HRESULT GetGUID([out] GUID *pguid); + + HRESULT GetDescription([out] BSTR *pbstrDesc); + + HRESULT GetAttributeInfo([out] TF_DISPLAYATTRIBUTE *pda); + + HRESULT SetAttributeInfo([in] const TF_DISPLAYATTRIBUTE *pda); + + HRESULT Reset(); +} + +[ + object, + uuid(7cef04d7-cb75-4e80-a7ab-5f5bc7d332de), + pointer_default(unique) +] +interface IEnumTfDisplayAttributeInfo : IUnknown +{ + HRESULT Clone([out] IEnumTfDisplayAttributeInfo **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfDisplayAttributeInfo **rgInfo, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip([in] ULONG ulCount); +} + +[ + object, + local, + uuid(8ded7393-5db1-475c-9e71-a39111b0ff67), + pointer_default(unique) +] +interface ITfDisplayAttributeMgr : IUnknown +{ + HRESULT OnUpdateInfo(); + + HRESULT EnumDisplayAttributeInfo([out] IEnumTfDisplayAttributeInfo **ppEnum); + + HRESULT GetDisplayAttributeInfo( + [in] REFGUID guid, + [out] ITfDisplayAttributeInfo **ppInfo, + [out] CLSID *pclsidOwner); + +} + [ object, local, @@ -886,6 +1007,20 @@ interface ITfRange : IUnknown [ object, + uuid(057a6296-029b-4154-b79a-0d461d4ea94c), + pointer_default(unique) +] +interface ITfRangeACP : ITfRange +{ + HRESULT GetExtent([out] LONG *pacpAnchor, + [out] LONG *pcch); + + HRESULT SetExtent([in] LONG acpAnchor, + [in] LONG cch); +} + +[ + object, uuid(55ce16ba-3014-41c1-9ceb-fade1446ac6c), pointer_default(unique) ] @@ -910,6 +1045,203 @@ interface ITfInsertAtSelection : IUnknown }; [ + object, + uuid(6834b120-88cb-11d2-bf45-00105a2799b5), + pointer_default(unique) +] +interface ITfPropertyStore : IUnknown +{ + const DWORD TF_TU_CORRECTION = 0x1; + + HRESULT GetType([out] GUID *pguid); + + HRESULT GetDataType([out] DWORD *pdwReserved); + + HRESULT GetData([out] VARIANT *pvarValue); + + HRESULT OnTextUpdated( + [in] DWORD dwFlags, + [in] ITfRange *pRangeNew, + [out] BOOL *pfAccept); + + HRESULT Shrink( + [in] ITfRange *pRangeNew, + [out] BOOL *pfFree); + + HRESULT Divide( + [in] ITfRange *pRangeThis, + [in] ITfRange *pRangeNew, + [out] ITfPropertyStore **ppPropStore); + + HRESULT Clone( + [out] ITfPropertyStore **pPropStore); + + HRESULT GetPropertyRangeCreator( + [out] CLSID *pclsid); + + HRESULT Serialize( + [in] IStream *pStream, + [out] ULONG *pcb); +} + +[ + object, + uuid(f99d3f40-8e32-11d2-bf46-00105a2799b5), + pointer_default(unique) +] +interface IEnumTfRanges : IUnknown +{ + HRESULT Clone([out] IEnumTfRanges **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfRange **ppRange, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip(ULONG ulCount); +} + +[ + object, + uuid(5efd22Ba-7838-46cb-88e2-cadb14124f8f), + pointer_default(unique) +] +interface IEnumITfCompositionView : IUnknown +{ + HRESULT Clone([out] IEnumITfCompositionView **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfCompositionView **rgCompositionView, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip([in] ULONG ulCount); +} + +[ + object, + uuid(20168d64-5a8f-4a5a-b7bd-cfa29f4D0fd9), + pointer_default(unique) +] +interface ITfComposition : IUnknown +{ + HRESULT GetRange([out] ITfRange **ppRange); + + HRESULT ShiftStart( + [in] TfEditCookie ecWrite, + [in] ITfRange *pNewStart); + + HRESULT ShiftEnd( + [in] TfEditCookie ecWrite, + [in] ITfRange *pNewEnd); + + HRESULT EndComposition([in] TfEditCookie ecWrite); +} + +[ + object, + uuid(a781718c-579a-4b15-a280-32b8577acc5e), + pointer_default(unique) +] +interface ITfCompositionSink : IUnknown +{ + HRESULT OnCompositionTerminated( + [in] TfEditCookie ecWrite, + [in] ITfComposition *pComposition); +} + +[ + object, + uuid(d40C8aae-aC92-4fc7-9a11-0ee0e23aa39b), + pointer_default(unique) +] +interface ITfContextComposition : IUnknown +{ + HRESULT StartComposition( + [in] TfEditCookie ecWrite, + [in] ITfRange *pCompositionRange, + [in] ITfCompositionSink *pSink, + [out] ITfComposition **ppComposition); + + HRESULT EnumCompositions([out] IEnumITfCompositionView **ppEnum); + + HRESULT FindComposition( + [in] TfEditCookie ecRead, + [in] ITfRange *pTestRange, + [out] IEnumITfCompositionView **ppEnum); + + HRESULT TakeOwnership( + [in] TfEditCookie ecWrite, + [in] ITfCompositionView *pComposition, + [in] ITfCompositionSink *pSink, + [out] ITfComposition **ppComposition); +} + +[ + object, + uuid(86462810-593b-4916-9764-19c08e9ce110), + pointer_default(unique) +] +interface ITfContextOwnerCompositionServices : ITfContextComposition +{ + HRESULT TerminateComposition([in] ITfCompositionView *pComposition); +} + +[ + object, + uuid(17d49a3d-f8b8-4b2f-b254-52319dd64c53), + pointer_default(unique) +] +interface ITfReadOnlyProperty : IUnknown +{ + HRESULT GetType([out] GUID *pguid); + + HRESULT EnumRanges( + [in] TfEditCookie ec, + [out] IEnumTfRanges **ppEnum, + [in] ITfRange *pTargetRange); + + HRESULT GetValue( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [out] VARIANT *pvarValue); + + HRESULT GetContext([out] ITfContext **ppContext); +} + +[ + object, + uuid(e2449660-9542-11d2-bf46-00105a2799b5), + pointer_default(unique) +] +interface ITfProperty : ITfReadOnlyProperty +{ + HRESULT FindRange( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [out] ITfRange **ppRange, + [in] TfAnchor aPos); + + HRESULT SetValueStore( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [in] ITfPropertyStore *pPropStore); + + HRESULT SetValue( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [in] const VARIANT *pvarValue); + + HRESULT Clear( + [in] TfEditCookie ec, + [in] ITfRange *pRange); +} + +[ object, uuid(bb08f7a9-607a-4384-8623-056892b64371), pointer_default(unique)

1 0

André Hentschel : shell32: Fix German folder names.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: a261137593a475eb2a5d2e2169d151c06f231f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a261137593a475eb2a5d2e216… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:41:26 2009 +0200 shell32: Fix German folder names. --- dlls/shell32/shell32_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 75980ec..828f56d 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -276,9 +276,9 @@ STRINGTABLE IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" IDS_COMMON_DOCUMENTS "Dokumente" IDS_ADMINTOOLS "Startmenü\\Programme\\Verwaltung" - IDS_COMMON_MUSIC "Dokumente\\Eigene Musik" - IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" - IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" + IDS_COMMON_MUSIC "Musik" + IDS_COMMON_PICTURES "Bilder" + IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" IDS_NEWFOLDER "Neuer Ordner"

1 0

André Hentschel : jscript: Add German translation.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 6bc0f13e992db9b758a0bac44f13ccc0e282d248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc0f13e992db9b758a0bac44… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:41:21 2009 +0200 jscript: Add German translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_De.rc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 20a5ba1..4324896 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -6,6 +6,7 @@ MODULE = jscript.dll IMPORTS = oleaut32 user32 advapi32 kernel32 RC_SRCS = \ + jscript_De.rc \ jscript_En.rc \ jscript_Fr.rc \ jscript_Lt.rc \ diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc new file mode 100644 index 0000000..3eb27cc --- /dev/null +++ b/dlls/jscript/jscript_De.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2009 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" + IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" + IDS_ARG_NOT_OPT "Argument nicht optional" + IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" + IDS_NOT_NUM "Nummer erwartet" + IDS_NOT_BOOL "Boolisches Objekt erwartet" + IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" +}

1 0

Aurimas Fišeras : jscript: Add Lithuanian translation.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: fc3a59460c48c60100e556e357dff2de99e62194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3a59460c48c60100e556e35… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jul 21 18:17:47 2009 +0300 jscript: Add Lithuanian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Lt.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index aaaf0f9..20a5ba1 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = oleaut32 user32 advapi32 kernel32 RC_SRCS = \ jscript_En.rc \ jscript_Fr.rc \ + jscript_Lt.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc new file mode 100644 index 0000000..f29ed63 --- /dev/null +++ b/dlls/jscript/jscript_Lt.rc @@ -0,0 +1,35 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" + IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" + IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" + IDS_NOT_DATE "„[objektas]“ nėra datos objektas" + IDS_NOT_NUM "Tikėtasi skaičiaus" + IDS_NOT_BOOL "Tikėtasi loginio objekto" + IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" +}

1 0