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

Frédéric Delanoy : jscript: Add French translation.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: a2e5c0b7b22c42636444c6d105e0cf90cdebad72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e5c0b7b22c42636444c6d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 21 17:15:59 2009 +0200 jscript: Add French translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Fr.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index c76bed0..aaaf0f9 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = oleaut32 user32 advapi32 kernel32 RC_SRCS = \ jscript_En.rc \ + jscript_Fr.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc new file mode 100644 index 0000000..04d19ed --- /dev/null +++ b/dlls/jscript/jscript_Fr.rc @@ -0,0 +1,37 @@ +/* + * French resources for jscript + * + * Copyright 2009 Frédéric Delanoy + * + * 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_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" + IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" + IDS_ARG_NOT_OPT "Argument non optionnel" + IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" + IDS_NOT_NUM "Nombre attendu" + IDS_NOT_BOOL "Booléen attendu" + IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" +}

1 0

Vincent Beers : winecfg: Fixed Dutch translation.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: faa2efc8cedb5154824b172f332c0f35a57a5123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa2efc8cedb5154824b172f3… Author: Vincent Beers <vincentbeers(a)gmail.com> Date: Mon Jul 20 19:21:28 2009 +0200 winecfg: Fixed Dutch translation. --- programs/winecfg/Nl.rc | 81 ++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faa2efc8cedb5154824b1…

1 0

Alexandre Julliard : mountmgr: Create volumes for non-removable volumes reported by HAL/Disk Arbitration.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 19e2d0cd5d244569827b8604f42dc031a6f4409a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e2d0cd5d244569827b8604f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 20:33:17 2009 +0200 mountmgr: Create volumes for non-removable volumes reported by HAL/Disk Arbitration. --- dlls/mountmgr.sys/diskarb.c | 20 ++++++++++---------- dlls/mountmgr.sys/hal.c | 15 ++++++++------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 2e5c121..0c188ff 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -47,10 +47,6 @@ static void appeared_callback( DADiskRef disk, void *context ) if (!dict) return; - /* ignore non-removable devices */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) goto done; - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumeUUID") ))) { CFUUIDBytes bytes = CFUUIDGetUUIDBytes( ref ); @@ -78,7 +74,11 @@ static void appeared_callback( DADiskRef disk, void *context ) TRACE( "got mount notification for '%s' on '%s' uuid %s\n", device, mount_point, wine_dbgstr_guid(guid_ptr) ); - add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) + add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + else + if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + done: CFRelease( dict ); } @@ -96,10 +96,6 @@ static void disappeared_callback( DADiskRef disk, void *context ) if (!dict) return; - /* ignore non-removable devices */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) goto done; - /* get device name */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); @@ -107,7 +103,11 @@ static void disappeared_callback( DADiskRef disk, void *context ) TRACE( "got unmount notification for '%s'\n", device ); - remove_dos_device( -1, device ); + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) + remove_dos_device( -1, device ); + else + remove_volume( device ); + done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 5ccb95d..82a70e9 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -156,9 +156,6 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) goto done; - if (!p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) - goto done; - if (!(uuid_str = p_libhal_device_get_property_string( ctx, udi, "volume.uuid", &error ))) p_dbus_error_free( &error ); /* ignore error */ else @@ -171,10 +168,13 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); - - /* add property watch for mount point */ - p_libhal_device_add_property_watch( ctx, udi, &error ); + if (p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) + { + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + /* add property watch for mount point */ + p_libhal_device_add_property_watch( ctx, udi, &error ); + } + else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); done: if (type) p_libhal_free_string( type ); @@ -198,6 +198,7 @@ static void removed_device( LibHalContext *ctx, const char *udi ) p_libhal_device_remove_property_watch( ctx, udi, &error ); p_dbus_error_free( &error ); } + else remove_volume( udi ); } /* HAL callback for property changes */

1 0

Alexandre Julliard : mountmgr: Add support for creating volumes without an associated drive.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 22f58341dc2a46cd8380c7e7cd797b81d608a6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f58341dc2a46cd8380c7e7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 20:30:43 2009 +0200 mountmgr: Add support for creating volumes without an associated drive. --- dlls/mountmgr.sys/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.h | 3 + 2 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 56c6446..efbbb33 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -84,6 +84,7 @@ struct dos_drive }; static struct list drives_list = LIST_INIT(drives_list); +static struct list volumes_list = LIST_INIT(volumes_list); static DRIVER_OBJECT *harddisk_driver; @@ -300,6 +301,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo } if (!(status = create_disk_device( type, &volume->device ))) { + list_add_tail( &volumes_list, &volume->entry ); *volume_ret = volume; } else @@ -313,6 +315,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo /* delete a volume and the corresponding disk device */ static void delete_volume( struct volume *volume ) { + list_remove( &volume->entry ); if (volume->mount) delete_mount_point( volume->mount ); delete_disk_device( volume->device ); RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); @@ -348,6 +351,60 @@ static void delete_dos_device( struct dos_drive *drive ) RtlFreeHeap( GetProcessHeap(), 0, drive ); } +/* change the information for an existing volume */ +static NTSTATUS set_volume_info( struct volume *volume, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ) +{ + struct disk_device *disk_device = volume->device; + NTSTATUS status; + + if (type != disk_device->type) + { + if ((status = create_disk_device( type, &disk_device ))) return status; + if (volume->mount) + { + delete_mount_point( volume->mount ); + volume->mount = NULL; + } + delete_disk_device( volume->device ); + volume->device = disk_device; + } + else + { + RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_device ); + RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_mount ); + } + disk_device->unix_device = strdupA( device ); + disk_device->unix_mount = strdupA( mount_point ); + + if (memcmp( &volume->guid, guid, sizeof(volume->guid) )) + { + volume->guid = *guid; + if (volume->mount) + { + delete_mount_point( volume->mount ); + volume->mount = NULL; + } + } + + if (!volume->mount) + volume->mount = add_volume_mount_point( disk_device->dev_obj, &disk_device->name, &volume->guid ); + + if (volume->mount) + { + void *id = NULL; + unsigned int id_len = 0; + + if (disk_device->unix_mount) + { + id = disk_device->unix_mount; + id_len = strlen( disk_device->unix_mount ) + 1; + } + set_mount_point_id( volume->mount, id, id_len ); + } + return STATUS_SUCCESS; +} + /* set or change the drive letter for an existing drive */ static void set_drive_letter( struct dos_drive *drive, int letter ) { @@ -551,6 +608,40 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, path ); } +/* create a new disk volume */ +NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ) +{ + struct volume *volume; + NTSTATUS status; + + TRACE( "adding %s device %s mount %s type %u uuid %s\n", debugstr_a(udi), + debugstr_a(device), debugstr_a(mount_point), type, debugstr_guid(guid) ); + + LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) + if (volume->udi && !strcmp( udi, volume->udi )) goto found; + + if ((status = create_volume( udi, type, &volume ))) return status; + +found: + return set_volume_info( volume, device, mount_point, type, guid ); +} + +/* create a new disk volume */ +NTSTATUS remove_volume( const char *udi ) +{ + struct volume *volume; + + LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) + { + if (!volume->udi || strcmp( udi, volume->udi )) continue; + delete_volume( volume ); + return STATUS_SUCCESS; + } + return STATUS_NO_SUCH_DEVICE; +} + + /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index d61bb7d..0ba1086 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -51,6 +51,9 @@ enum device_type DEVICE_RAMDISK }; +extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ); +extern NTSTATUS remove_volume( const char *udi ); extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ); extern NTSTATUS remove_dos_device( int letter, const char *udi );

1 0

Paul Vriens : transl: Don't show untranslated English (US) resources.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: c0a88aac79917d02df2bf1a268ef64c143c4ab3f URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0a88aac79917d02df2bf1a2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 22 15:00:13 2009 +0200 transl: Don't show untranslated English (US) resources. --- transl/scripts/checkmakefile.pl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 4dcf5ac..66a0909 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -261,6 +261,8 @@ sub mycheck next if ($lang eq $basic_lang); + next if (($lang eq "009:01") && ($transl_count{$lang} == 0)); + open(LANGOUT, ">>$workdir/langs/$lang"); print LANGOUT "FILE STAT $dir ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; @@ -291,7 +293,7 @@ sub mycheck foreach my $lang (keys %languages) { - next if (exists $transl_count{"009:01"} && $transl_count{"009:01"} == 0); + next if ($transl_count{"009:01"} == 0); my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) {

1 0

Alexandre Julliard : transl: Remove the no longer needed SCRIPTSDIR parameter.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 75bf08b6b6b57d5327c5ba9c74730a7b9723d678 URL: http://source.winehq.org/git/tools.git/?a=commit;h=75bf08b6b6b57d5327c5ba9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 16:03:49 2009 +0200 transl: Remove the no longer needed SCRIPTSDIR parameter. --- transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 5 +---- transl/scripts/config-example | 3 --- winetest/make-winetest | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index b08383e..4a0df39 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -46,7 +46,7 @@ mkdir $WORKDIR/dumps mkdir $WORKDIR/dumps/res # Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index ca62dae..4dcf5ac 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -8,7 +8,7 @@ use Cwd; use File::Basename; # configuration parameters -my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $scriptsdir, $wrc); +my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $wrc); sub shell($) { @@ -326,7 +326,6 @@ while (@ARGV && $ARGV[0] =~ /^-/) my $opt = shift @ARGV; if ($opt eq "-S") { $srcdir = shift @ARGV; } elsif ($opt eq "-T") { $objdir = shift @ARGV; } - elsif ($opt eq "-s") { $scriptsdir = shift @ARGV; } elsif ($opt eq "-t") { $toolsdir = shift @ARGV; } elsif ($opt eq "-w") { $workdir = shift @ARGV; } else @@ -335,7 +334,6 @@ while (@ARGV && $ARGV[0] =~ /^-/) print STDERR " -S dir Set the top of the Wine source tree\n"; print STDERR " -T dir Set the top of the Wine build tree\n"; print STDERR " -t dir Set the Wine tools directory\n"; - print STDERR " -s dir Set the scripts directory\n"; print STDERR " -w dir Set the work directory\n"; exit 1; } @@ -345,7 +343,6 @@ $srcdir ||= $CONFIG{"SOURCEROOT"}; $objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; $toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; $workdir ||= $CONFIG{"WORKDIR"}; -$scriptsdir ||= $CONFIG{"SCRIPTSDIR"} || "."; $wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") diff --git a/transl/scripts/config-example b/transl/scripts/config-example index 47cc4c5..2409d13 100644 --- a/transl/scripts/config-example +++ b/transl/scripts/config-example @@ -9,9 +9,6 @@ BUILDROOT=/path/to/wine-src # Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src -# Directory containing the various scripts -SCRIPTSDIR=. - # The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. DESTDIR=../php diff --git a/winetest/make-winetest b/winetest/make-winetest index 15833b9..50903f6 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -132,7 +132,7 @@ umask 022 rm -rf work mkdir work work/langs work/dumps work/dumps/res - $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log + $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work 2>>work/run.log mv -f $transldir/langs $transldir/langs.old mv -f $transldir/dumps $transldir/dumps.old mv -f work/langs $transldir/langs

1 0

Alexandre Julliard : transl: Remove references to no longer used directories.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 1f32a5c55ce03ace51402e89ea96f6bb28d6e5bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f32a5c55ce03ace51402e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:38:38 2009 +0200 transl: Remove references to no longer used directories. --- transl/scripts/Master.sh | 11 ----------- winetest/make-winetest | 9 +-------- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index a1e1747..b08383e 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -41,22 +41,13 @@ fi # Do cleanup for new run rm -Rf $WORKDIR/langs rm -Rf $WORKDIR/dumps -rm -Rf $WORKDIR/new-langs mkdir $WORKDIR/langs mkdir $WORKDIR/dumps mkdir $WORKDIR/dumps/res -mkdir $WORKDIR/new-langs # Analyze all the Makefiles $SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit -# Check for a new languages -for i in $WORKDIR/new-langs/*; do - if [ -f "$i" ]; then - echo "note: New language:" `basename "$i"` | tee -a $WORKDIR/run.log - fi -done - # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log @@ -67,8 +58,6 @@ mv -f $WORKDIR/langs $DESTDIR/langs mv -f $WORKDIR/dumps $DESTDIR/dumps cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log -rsync -r --delete $SCRIPTSDIR/conf $DESTDIR - # Deleting can take a bit longer so we do it after the new version is set up rm -Rf $DESTDIR/langs.old rm -Rf $DESTDIR/dumps.old diff --git a/winetest/make-winetest b/winetest/make-winetest index 3b492ce..15833b9 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -131,15 +131,8 @@ umask 022 # update the translations status rm -rf work - mkdir work work/langs work/dumps work/dumps/res work/new-langs + mkdir work work/langs work/dumps work/dumps/res $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log - for i in work/new-langs/* - do - if [ -f "$i" ] - then - echo "note: New language:" `basename "$i"` | tee -a work/run.log - fi - done mv -f $transldir/langs $transldir/langs.old mv -f $transldir/dumps $transldir/dumps.old mv -f work/langs $transldir/langs

1 0

André Hentschel : transl: Add doctype header.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: aeb156e9b26f81203f302197119462762b50e8b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aeb156e9b26f81203f302197… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:48:16 2009 +0200 transl: Add doctype header. --- transl/php/lang.php | 1 + transl/php/resfile.php | 1 + transl/php/resource.php | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 5ee2ca8..21b2dea 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -78,6 +78,7 @@ function dump_table($table) } ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 4614755..8245e26 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -8,6 +8,7 @@ $resfile = validate_resfile($_REQUEST['resfile']); $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/transl/php/resource.php b/transl/php/resource.php index f048a2d..68a9e55 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -10,6 +10,7 @@ $id = validate_id($_REQUEST['id']); $compare = isset($_REQUEST['compare']); ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css">

1 0

André Hentschel : transl: Remove the slash from tags.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 815e7569c49c82bc50796371853382494aa89188 URL: http://source.winehq.org/git/tools.git/?a=commit;h=815e7569c49c82bc50796371… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:41:17 2009 +0200 transl: Remove the slash from tags. --- transl/php/index.php | 2 +- transl/php/resfile.php | 2 +- transl/php/resource.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 6cd0c7e..4e37347 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -23,7 +23,7 @@ while ($line = fgets($summary, 1024)) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 71e3c19..4614755 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -10,7 +10,7 @@ $msgs = array(); ?> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Module <?php echo $resfile?> - Wine translations</title> </head> diff --git a/transl/php/resource.php b/transl/php/resource.php index b88e30d..f048a2d 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -12,7 +12,7 @@ $compare = isset($_REQUEST['compare']); ?> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head>

1 0

Paul Vriens : transl: Remove conf files.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 155c545672d538685bb299e0831b3cc4469b7bea URL: http://source.winehq.org/git/tools.git/?a=commit;h=155c545672d538685bb299e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 18:11:13 2009 +0200 transl: Remove conf files. --- transl/.gitignore | 1 - transl/scripts/conf/002:01 | 1 - transl/scripts/conf/003:01 | 1 - transl/scripts/conf/004:01 | 1 - transl/scripts/conf/004:02 | 1 - transl/scripts/conf/005:00 | 1 - transl/scripts/conf/006:01 | 1 - transl/scripts/conf/007:00 | 1 - transl/scripts/conf/008:01 | 1 - transl/scripts/conf/009:00 | 1 - transl/scripts/conf/009:01 | 1 - transl/scripts/conf/00a:00 | 1 - transl/scripts/conf/00b:01 | 1 - transl/scripts/conf/00c:00 | 1 - transl/scripts/conf/00e:00 | 1 - transl/scripts/conf/010:00 | 1 - transl/scripts/conf/011:00 | 1 - transl/scripts/conf/012:00 | 1 - transl/scripts/conf/013:00 | 1 - transl/scripts/conf/014:01 | 1 - transl/scripts/conf/015:00 | 1 - transl/scripts/conf/016:00 | 1 - transl/scripts/conf/016:01 | 1 - transl/scripts/conf/016:02 | 1 - transl/scripts/conf/017:01 | 1 - transl/scripts/conf/018:00 | 1 - transl/scripts/conf/019:00 | 1 - transl/scripts/conf/01b:00 | 1 - transl/scripts/conf/01d:00 | 1 - transl/scripts/conf/01e:01 | 1 - transl/scripts/conf/01f:01 | 1 - transl/scripts/conf/022:01 | 1 - transl/scripts/conf/024:00 | 1 - transl/scripts/conf/027:00 | 1 - transl/scripts/conf/08f:00 | 1 - transl/scripts/conf/090:01 | 1 - 36 files changed, 0 insertions(+), 36 deletions(-) diff --git a/transl/.gitignore b/transl/.gitignore index af334cb..9e6aaf8 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -2,6 +2,5 @@ /scripts/config /scripts/local-posthook.sh /scripts/local-prehook.sh -/php/conf /php/dumps /php/langs \ No newline at end of file diff --git a/transl/scripts/conf/002:01 b/transl/scripts/conf/002:01 deleted file mode 100644 index 956bbd8..0000000 --- a/transl/scripts/conf/002:01 +++ /dev/null @@ -1 +0,0 @@ -Bulgarian \ No newline at end of file diff --git a/transl/scripts/conf/003:01 b/transl/scripts/conf/003:01 deleted file mode 100644 index 86d394c..0000000 --- a/transl/scripts/conf/003:01 +++ /dev/null @@ -1 +0,0 @@ -Catalan \ No newline at end of file diff --git a/transl/scripts/conf/004:01 b/transl/scripts/conf/004:01 deleted file mode 100644 index 849d939..0000000 --- a/transl/scripts/conf/004:01 +++ /dev/null @@ -1 +0,0 @@ -Chinese (Traditional) \ No newline at end of file diff --git a/transl/scripts/conf/004:02 b/transl/scripts/conf/004:02 deleted file mode 100644 index bb1d20d..0000000 --- a/transl/scripts/conf/004:02 +++ /dev/null @@ -1 +0,0 @@ -Chinese (Simplified) \ No newline at end of file diff --git a/transl/scripts/conf/005:00 b/transl/scripts/conf/005:00 deleted file mode 100644 index ba26bf3..0000000 --- a/transl/scripts/conf/005:00 +++ /dev/null @@ -1 +0,0 @@ -Czech[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/006:01 b/transl/scripts/conf/006:01 deleted file mode 100644 index fa9fc5f..0000000 --- a/transl/scripts/conf/006:01 +++ /dev/null @@ -1 +0,0 @@ -Danish \ No newline at end of file diff --git a/transl/scripts/conf/007:00 b/transl/scripts/conf/007:00 deleted file mode 100644 index 36ffaed..0000000 --- a/transl/scripts/conf/007:00 +++ /dev/null @@ -1 +0,0 @@ -German \ No newline at end of file diff --git a/transl/scripts/conf/008:01 b/transl/scripts/conf/008:01 deleted file mode 100644 index 721b5e7..0000000 --- a/transl/scripts/conf/008:01 +++ /dev/null @@ -1 +0,0 @@ -Greek \ No newline at end of file diff --git a/transl/scripts/conf/009:00 b/transl/scripts/conf/009:00 deleted file mode 100644 index 7ab7830..0000000 --- a/transl/scripts/conf/009:00 +++ /dev/null @@ -1 +0,0 @@ -English (Neutral) \ No newline at end of file diff --git a/transl/scripts/conf/009:01 b/transl/scripts/conf/009:01 deleted file mode 100644 index 1d682ab..0000000 --- a/transl/scripts/conf/009:01 +++ /dev/null @@ -1 +0,0 @@ -English (US) \ No newline at end of file diff --git a/transl/scripts/conf/00a:00 b/transl/scripts/conf/00a:00 deleted file mode 100644 index f52eec4..0000000 --- a/transl/scripts/conf/00a:00 +++ /dev/null @@ -1 +0,0 @@ -Spanish \ No newline at end of file diff --git a/transl/scripts/conf/00b:01 b/transl/scripts/conf/00b:01 deleted file mode 100644 index 9a417fa..0000000 --- a/transl/scripts/conf/00b:01 +++ /dev/null @@ -1 +0,0 @@ -Finnish \ No newline at end of file diff --git a/transl/scripts/conf/00c:00 b/transl/scripts/conf/00c:00 deleted file mode 100644 index d098706..0000000 --- a/transl/scripts/conf/00c:00 +++ /dev/null @@ -1 +0,0 @@ -French \ No newline at end of file diff --git a/transl/scripts/conf/00e:00 b/transl/scripts/conf/00e:00 deleted file mode 100644 index d83d763..0000000 --- a/transl/scripts/conf/00e:00 +++ /dev/null @@ -1 +0,0 @@ -Hungarian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/010:00 b/transl/scripts/conf/010:00 deleted file mode 100644 index 0c26025..0000000 --- a/transl/scripts/conf/010:00 +++ /dev/null @@ -1 +0,0 @@ -Italian \ No newline at end of file diff --git a/transl/scripts/conf/011:00 b/transl/scripts/conf/011:00 deleted file mode 100644 index 7123dbe..0000000 --- a/transl/scripts/conf/011:00 +++ /dev/null @@ -1 +0,0 @@ -Japanese[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/012:00 b/transl/scripts/conf/012:00 deleted file mode 100644 index 060827f..0000000 --- a/transl/scripts/conf/012:00 +++ /dev/null @@ -1 +0,0 @@ -Korean[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/013:00 b/transl/scripts/conf/013:00 deleted file mode 100644 index cc3acaa..0000000 --- a/transl/scripts/conf/013:00 +++ /dev/null @@ -1 +0,0 @@ -Dutch \ No newline at end of file diff --git a/transl/scripts/conf/014:01 b/transl/scripts/conf/014:01 deleted file mode 100644 index 0a62430..0000000 --- a/transl/scripts/conf/014:01 +++ /dev/null @@ -1 +0,0 @@ -Norwegian (Bokmal) \ No newline at end of file diff --git a/transl/scripts/conf/015:00 b/transl/scripts/conf/015:00 deleted file mode 100644 index f8e03c0..0000000 --- a/transl/scripts/conf/015:00 +++ /dev/null @@ -1 +0,0 @@ -Polish[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/016:00 b/transl/scripts/conf/016:00 deleted file mode 100644 index edbd93f..0000000 --- a/transl/scripts/conf/016:00 +++ /dev/null @@ -1 +0,0 @@ -Portuguese (Neutral) diff --git a/transl/scripts/conf/016:01 b/transl/scripts/conf/016:01 deleted file mode 100644 index 5cd7cf5..0000000 --- a/transl/scripts/conf/016:01 +++ /dev/null @@ -1 +0,0 @@ -Portugese (Brazilian) \ No newline at end of file diff --git a/transl/scripts/conf/016:02 b/transl/scripts/conf/016:02 deleted file mode 100644 index 2701fef..0000000 --- a/transl/scripts/conf/016:02 +++ /dev/null @@ -1 +0,0 @@ -Portugese (Portugal) \ No newline at end of file diff --git a/transl/scripts/conf/017:01 b/transl/scripts/conf/017:01 deleted file mode 100644 index 9d0ddbd..0000000 --- a/transl/scripts/conf/017:01 +++ /dev/null @@ -1 +0,0 @@ -Romansh (Switzerland) \ No newline at end of file diff --git a/transl/scripts/conf/018:00 b/transl/scripts/conf/018:00 deleted file mode 100644 index 8258690..0000000 --- a/transl/scripts/conf/018:00 +++ /dev/null @@ -1 +0,0 @@ -Romanian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/019:00 b/transl/scripts/conf/019:00 deleted file mode 100644 index 74ecec6..0000000 --- a/transl/scripts/conf/019:00 +++ /dev/null @@ -1 +0,0 @@ -Russian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/01b:00 b/transl/scripts/conf/01b:00 deleted file mode 100644 index 399b1c9..0000000 --- a/transl/scripts/conf/01b:00 +++ /dev/null @@ -1 +0,0 @@ -Slovak[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/01d:00 b/transl/scripts/conf/01d:00 deleted file mode 100644 index 8c590c4..0000000 --- a/transl/scripts/conf/01d:00 +++ /dev/null @@ -1 +0,0 @@ -Swedish \ No newline at end of file diff --git a/transl/scripts/conf/01e:01 b/transl/scripts/conf/01e:01 deleted file mode 100644 index d0333f5..0000000 --- a/transl/scripts/conf/01e:01 +++ /dev/null @@ -1 +0,0 @@ -Thai \ No newline at end of file diff --git a/transl/scripts/conf/01f:01 b/transl/scripts/conf/01f:01 deleted file mode 100644 index aa73ef2..0000000 --- a/transl/scripts/conf/01f:01 +++ /dev/null @@ -1 +0,0 @@ -Turkish \ No newline at end of file diff --git a/transl/scripts/conf/022:01 b/transl/scripts/conf/022:01 deleted file mode 100644 index a782714..0000000 --- a/transl/scripts/conf/022:01 +++ /dev/null @@ -1 +0,0 @@ -Ukrainian \ No newline at end of file diff --git a/transl/scripts/conf/024:00 b/transl/scripts/conf/024:00 deleted file mode 100644 index fde8a50..0000000 --- a/transl/scripts/conf/024:00 +++ /dev/null @@ -1 +0,0 @@ -Slovenian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/027:00 b/transl/scripts/conf/027:00 deleted file mode 100644 index dc243c5..0000000 --- a/transl/scripts/conf/027:00 +++ /dev/null @@ -1 +0,0 @@ -Lithuanian diff --git a/transl/scripts/conf/08f:00 b/transl/scripts/conf/08f:00 deleted file mode 100644 index 8c90610..0000000 --- a/transl/scripts/conf/08f:00 +++ /dev/null @@ -1 +0,0 @@ -Esperanto[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/090:01 b/transl/scripts/conf/090:01 deleted file mode 100644 index b7743ee..0000000 --- a/transl/scripts/conf/090:01 +++ /dev/null @@ -1 +0,0 @@ -Walon \ No newline at end of file

1 0

Paul Vriens : transl: Remove last references to the conf directory.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 9f08477739cfe9dbb3765092929789a1465c09a7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9f08477739cfe9dbb3765092… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 18:01:03 2009 +0200 transl: Remove last references to the conf directory. --- transl/php/lib.php | 25 ------------------------- transl/php/lib_res.php | 4 ++-- transl/php/resource.php | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 48f1b65..4255905 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -93,19 +93,6 @@ function validate_id($id) return $id; } -function get_raw_lang_name($id) -{ - static $lang_cache = array(); - if (empty($lang_cache[$id])) - { - global $DATAROOT; - - $name = file_get_contents("$DATAROOT/conf/$id"); - $lang_cache[$id] = $name; - } - return $lang_cache[$id]; -} - function get_lang_name($id) { return get_locale_name($id); @@ -154,18 +141,6 @@ function show_sublangs($id) echo "</div>"; } -function has_lang_flag($id, $flag) -{ - return is_int(strpos(get_raw_lang_name($id), "[".$flag."]")); -} - -function is_lang_ignore_sublang($lang) -{ - if (!preg_match("/:00/", $lang)) - return FALSE; - return has_lang_flag($lang, "ignore-sublang"); -} - function get_lang_binid($lang) { if (!preg_match("/([0-9a-f]{3}):([0-9a-f]{2})/", $lang, $m)) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index c62e3ce..c19087f 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -305,7 +305,7 @@ class ResFile return FALSE; } - function loadResource($type, $name, $language, $ignore_sublang = FALSE) + function loadResource($type, $name, $language) { fseek($this->file, 0); $pos = 0; @@ -336,7 +336,7 @@ class ResFile $data = substr($data, $strpos); $header = unpack("VdataVersion/vmemoryOptions/vlanguage/Vversion/Vcharacteristics", $data); - $curr_lang = ($ignore_sublang ? ($header["language"] & 0x3ff) : $header["language"]); /* check the ignore_sublang */ + $curr_lang = $header["language"]; if ($curr_lang == $language) { fseek($this->file, $pos + $headerSize); diff --git a/transl/php/resource.php b/transl/php/resource.php index 656d5bf..b88e30d 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -27,7 +27,7 @@ $compare = isset($_REQUEST['compare']); function load_resource(&$resources, $type, $id, $langid, &$res) { $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ - $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid), is_lang_ignore_sublang($langid)); + $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid)); if (!$resdata) die("Resource not found in *.res file\n"); switch ($type)

1 0

Paul Vriens : transl: Add (Neutral) to the neutral languages.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: cd1392893db4844c06e1c460c1161107f033c4f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cd1392893db4844c06e1c460… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:53:40 2009 +0200 transl: Add (Neutral) to the neutral languages. --- transl/php/lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 7fc4ae5..48f1b65 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -42,7 +42,7 @@ function res_enum($header, $f) else if ($header["name"] == 257) { $baseid = get_lang_base($langid); - $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1)); + $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1))." (Neutral)"; } }

1 0

Paul Vriens : transl: Remove unused file.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 84895677e96f2839cf9ec8ebcd54790b85f39824 URL: http://source.winehq.org/git/tools.git/?a=commit;h=84895677e96f2839cf9ec8eb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:52:47 2009 +0200 transl: Remove unused file. --- transl/php/lib_res.php | 20 -------------------- transl/php/resource.php | 2 -- transl/php/stopwatch.php | 46 ---------------------------------------------- 3 files changed, 0 insertions(+), 68 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index cbb60a8..c62e3ce 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -305,27 +305,8 @@ class ResFile return FALSE; } - function load_resource_helper($header, $f, $params) - { - $curr_lang = ($params[5] ? ($header["language"] & 0x3ff) : $header["language"]); /* check the ignore_sublang */ - if ($header["type"] == $params[0] && $header["name"] == $params[1] && $curr_lang == $params[2]) - { - $params[3] = $header; - $params[4] = fread($f, $header["resSize"]); - return TRUE; - } - return FALSE; - } - function loadResource($type, $name, $language, $ignore_sublang = FALSE) { -// $sw = new Stopwatch(); -/* too slow - if ($this->enumResources(array($this, 'load_resource_helper'), array($type, $name, $language, &$header, &$out, $ignore_sublang))) - { - return array($header, $out); - }*/ - fseek($this->file, 0); $pos = 0; @@ -360,7 +341,6 @@ class ResFile { fseek($this->file, $pos + $headerSize); $out = fread($this->file, $resSize); -// $sw->stop(); return array($header, $out); } } diff --git a/transl/php/resource.php b/transl/php/resource.php index 493e9f1..656d5bf 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -24,8 +24,6 @@ $compare = isset($_REQUEST['compare']); <?php -//include_once("stopwatch.php"); - function load_resource(&$resources, $type, $id, $langid, &$res) { $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ diff --git a/transl/php/stopwatch.php b/transl/php/stopwatch.php deleted file mode 100644 index ba227c9..0000000 --- a/transl/php/stopwatch.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php - -class Stopwatch -{ - function Stopwatch($name = "") - { - $this->time = 0; - $this->name = ""; - $this->running = TRUE; - $this->time = $this->get_microtime(); - } - - function get_microtime() - { - $time = split(" ", microtime()); - return $time[0] + $time[1]; - } - - function pause() - { - if (!$this->running) - die("illegal stopwatch stop"); - $this->running = FALSE; - $this->time = $this->get_microtime() - $this->time; - } - - function resume() - { - if ($this->running) - die("illegal stopwatch stop"); - $this->running = TRUE; - $this->time = $this->get_microtime() - $this->time; - } - - function stop() - { - $this->pause(); - echo "Stopwatch ".$this->name." run for ".$this->time."<br/>"; - } - - var $time; - var $running; - var $name; -} - -?> \ No newline at end of file

1 0

Paul Vriens : transl: Fix some php warnings while trying to deal with non-existing files.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: a5a9aac761af96eff4a3b6d5d77a1dad94ab1e66 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a5a9aac761af96eff4a3b6d5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:29:52 2009 +0200 transl: Fix some php warnings while trying to deal with non-existing files. --- transl/php/lang.php | 85 ++++++++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 2dfb7c7..5ee2ca8 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -4,55 +4,56 @@ include_once("lib.php"); $lang = validate_lang($_REQUEST['lang']); -$file = fopen("$DATAROOT/langs/$lang", "r"); $transl = array(); $notransl = array(); $partial = array(); -$curr_file = ""; -while ($line = fgets($file, 4096)) + +function parse_file($lang) { - if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) + global $transl, $partial, $notransl; + global $DATAROOT; + if (!file_exists("$DATAROOT/langs/$lang")) + return; + + $file = fopen("$DATAROOT/langs/$lang", "r"); + $curr_file = ""; + while ($line = fgets($file, 4096)) { - $curr_file = $m[2]; - if ($m[1] == "NONE") + if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { - $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); - continue; + $curr_file = $m[2]; + if ($m[1] == "NONE") + { + $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); + continue; + } + + if ($m[4]>0 || $m[5]>0) + { + $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); + continue; + } + + $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); } - - if ($m[4]>0 || $m[5]>0) + if (preg_match(",$curr_file: Warning: ,", $line, $m)) { - $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); - continue; - } - - $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); - } - if (preg_match(",$curr_file: Warning: ,", $line, $m)) - { - if (array_key_exists($curr_file, $transl)) - { - $partial[$curr_file] = $transl[$curr_file]; - unset($transl[$curr_file]); - } + if (array_key_exists($curr_file, $transl)) + { + $partial[$curr_file] = $transl[$curr_file]; + unset($transl[$curr_file]); + } - if (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ - $partial[$curr_file][3]++; + if (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ + $partial[$curr_file][3]++; + } } + fclose($file); + ksort($transl); + ksort($partial); + ksort($notransl); } -fclose($file); -ksort($transl); -ksort($partial); -ksort($notransl); -?> -<html> -<head> - <link rel="stylesheet" href="style.css" type="text/css"/> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> -</head> -<?php function dump_table($table) { global $lang; @@ -75,13 +76,21 @@ function dump_table($table) } echo "</table>\n"; } - ?> + +<html> +<head> + <link rel="stylesheet" href="style.css" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> +</head> + <p><?php dump_menu_root() ?> > <?php dump_menu_lang($lang, FALSE)?> </p> <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> <?php +parse_file($lang); $translations = count($partial) + count($transl); if (preg_match("/:00/", $lang) && $translations == 0) {

1 0

Alexander Nicolaysen Sørnes : objectManager: Show a note when the parent entry as an id of 0
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 561682cd231bdc676d822f7c3b1497de007007ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=561682cd231bdc676d822f7c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:14:19 2009 +0200 objectManager: Show a note when the parent entry as an id of 0 --- include/objectManager.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index d8ad2e2..0e1f0df 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1217,10 +1217,11 @@ class ObjectManager if($sLinkText == 'default') { $oParent = $oObject->objectGetParent(); - if(!$oParent) + if(!$oParent || !$oParent->objectGetId()) { echo html_note('Failed to find parent entry', 'No parent entry could be found, even though it is supposed to exist.'); - } else + } + if($oParent) { $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false);

1 0

Alexander Nicolaysen Sørnes : version: Make sure we always return a valid object in objectGetParent()
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 8f6927f603e260b403f9153324ad688336b4d940 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6927f603e260b403f91533… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:11:57 2009 +0200 version: Make sure we always return a valid object in objectGetParent() --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index b1bceae..ae0bc3e 100644 --- a/include/version.php +++ b/include/version.php @@ -786,7 +786,7 @@ class version { public function objectGetParent($sClass = '') { /* No id so we can't query the DB, but perhaps an entry is cached? */ - if(!$this->iAppId) + if(!$this->iAppId && $this->oApp) return $this->oApp; return new application($this->iAppId);

1 0

Alexander Nicolaysen Sørnes : objectManager: Show a note if a parent entry is missing
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 00f9a20596bf14a5b72b697016a999fbaced0318 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=00f9a20596bf14a5b72b6970… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:04:11 2009 +0200 objectManager: Show a note if a parent entry is missing --- include/objectManager.php | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 5153941..d8ad2e2 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1217,12 +1217,18 @@ class ObjectManager if($sLinkText == 'default') { $oParent = $oObject->objectGetParent(); - $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); - $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false); - if($sClassName) - $sLinkText = "Move to another $sClassName"; - else - $sLinkText = 'Move to another parent entry'; + if(!$oParent) + { + echo html_note('Failed to find parent entry', 'No parent entry could be found, even though it is supposed to exist.'); + } else + { + $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); + $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false); + if($sClassName) + $sLinkText = "Move to another $sClassName"; + else + $sLinkText = 'Move to another parent entry'; + } } echo "<a href=\"".$this->makeUrl("showChangeParent", $this->iId, "Move to another parent entry")."\">$sLinkText</a>\n";

1 0

Rein Klazes : user32/tests: Fix for a test failure on win98/NT4.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: da86ab71fa5d21ef3d6d8e358005df757b79f3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da86ab71fa5d21ef3d6d8e358… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jul 21 15:28:45 2009 +0200 user32/tests: Fix for a test failure on win98/NT4. --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 878decf..7382ec0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3057,7 +3057,7 @@ static void test_menu_circref(void) ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); todo_wine ok( !ret || - broken( 0), /* win98, NT */ + broken( ret), /* win98, NT */ "ModifyMenu should have failed.\n"); if( !ret) { /* will probably stack fault if the ModifyMenu succeeded */ ret = GetMenuState( menu1, 123, 0);

1 0

Paul Vriens : wordpad: Align resources with the English ones.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: a607df2b69cfac125f856648f3224c42453446fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607df2b69cfac125f856648f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 13:03:21 2009 +0200 wordpad: Align resources with the English ones. --- programs/wordpad/Nl.rc | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c9ce64a..10729e4 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -180,10 +180,14 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_ALL_FILES, "Alle documenten (*.*)" STRING_TEXT_FILES_TXT, "Tekst documenten (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekst document (*.txt)" - STRING_ALL_FILES, "Alle documenten (*.*)" + STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich tekst document" + STRING_NEWFILE_TXT, "Tekst document" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" + STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END STRINGTABLE DISCARDABLE @@ -195,18 +199,6 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_NEWFILE_RICHTEXT, "Rich tekst document" - STRING_NEWFILE_TXT, "Tekst document" - STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_VIEWPROPS_TITLE, "Opties" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Rich tekst"

1 0

Paul Vriens : shdoclc: Fix Portuguese (Portugal) translation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bd999ee48940870a202a9fc3931176311eb95b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd999ee48940870a202a9fc39… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 12:47:17 2009 +0200 shdoclc: Fix Portuguese (Portugal) translation. --- dlls/shdoclc/Pt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index d0bd1b7..7377473 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -192,8 +192,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Adicionar aos &Favoritos...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM "I&niciar", IDM_DYNSRCPLAY - MENUITEM "&Parar", IDM_DYNSRCSTOP + MENUITEM "I&niciar", IDM_IMGARTPLAY + MENUITEM "&Parar", IDM_IMGARTSTOP MENUITEM "&Recomeçar", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR

1 0

Paul Vriens : winecfg: Fix Portuguese (Portugal) translation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 5e6b3078627f1c7b6de7c2f42a92feec59a87dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6b3078627f1c7b6de7c2f42… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 12:41:15 2009 +0200 winecfg: Fix Portuguese (Portugal) translation. --- programs/winecfg/Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index e3b02a1..322d3cf 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -260,7 +260,7 @@ BEGIN PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,190,98,56,14 /* editing drive details */ - LTEXT "&Localização:",IDC_STATIC,15,123,20,9 + LTEXT "&Localização:",IDC_STATIC_PATH,15,123,20,9 EDITTEXT IDC_EDIT_PATH,41,120,160,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&Procurar...",IDC_BUTTON_BROWSE_PATH,206,120,40,13

1 0

Henri Verbeet : wined3d: Remove the useless lastThread field from IWineD3DDeviceImpl.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: c114b04016bfde36933f3b2395f2b5c711b0bde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c114b04016bfde36933f3b239… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:12 2009 +0200 wined3d: Remove the useless lastThread field from IWineD3DDeviceImpl. --- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/device.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c625674..de428cd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1551,7 +1551,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: /* FBOs do not need a different context. Stay with whatever context is active at the moment */ - if(This->activeContext && tid == This->lastThread) { + if (This->activeContext && This->activeContext->tid == tid) + { context = This->activeContext; } else { /* This may happen if the app jumps straight into offscreen rendering @@ -1600,7 +1601,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf case ORM_BACKBUFFER: /* Stay with the currently active context for back buffer rendering */ - if(This->activeContext && tid == This->lastThread) { + if (This->activeContext && This->activeContext->tid == tid) + { context = This->activeContext; } else { /* This may happen if the app jumps straight into offscreen rendering @@ -1763,12 +1765,11 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if (!target) target = This->activeContext->current_rt; - if (This->activeContext->current_rt != target || tid != This->lastThread) + if (This->activeContext->current_rt != target || This->activeContext->tid != tid) { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; context->current_rt = target; - This->lastThread = tid; } else { /* Stick to the old context */ context = This->activeContext; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 422dbf8..94000df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2165,7 +2165,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, } IWineD3DSurface_AddRef(This->render_targets[0]); This->activeContext = swapchain->context[0]; - This->lastThread = GetCurrentThreadId(); /* Depth Stencil support */ This->stencilBufferTarget = This->auto_depth_stencil_buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8d95e7..b7085c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1584,7 +1584,6 @@ struct IWineD3DDeviceImpl /* Context management */ WineD3DContext **contexts; /* Dynamic array containing pointers to context structures */ WineD3DContext *activeContext; - DWORD lastThread; UINT numContexts; WineD3DContext *pbufferContext; /* The context that has a pbuffer as drawable */ DWORD pbufferWidth, pbufferHeight; /* Size of the buffer drawable */

1 0

Henri Verbeet : wined3d: Get rid of lastActiveRenderTarget.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 2d7500600bf2f109001597bd8d36724c1b551d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7500600bf2f109001597bd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:11 2009 +0200 wined3d: Get rid of lastActiveRenderTarget. --- dlls/wined3d/context.c | 15 ++++++--------- dlls/wined3d/device.c | 2 -- dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b92cc99..c625674 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -503,10 +503,8 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource /* Implicit render target destroyed, that means the * device is being destroyed whatever we set here, it * shouldn't matter. */ - TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); - - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; - This->activeContext->current_rt = This->lastActiveRenderTarget; + TRACE("Device is being destroyed, setting current_rt to 0xdeadbabe.\n"); + This->activeContext->current_rt = (IWineD3DSurface *)0xdeadbabe; } } else @@ -514,8 +512,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource WARN("Render target set, but swapchain does not exist!\n"); /* May happen during ddraw uninitialization. */ - This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; - This->activeContext->current_rt = This->lastActiveRenderTarget; + This->activeContext->current_rt = (IWineD3DSurface *)0xdeadcafe; } } else if (This->d3d_initialized) @@ -1764,13 +1761,13 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - if (!target) target = This->lastActiveRenderTarget; + if (!target) target = This->activeContext->current_rt; - if(This->lastActiveRenderTarget != target || tid != This->lastThread) { + if (This->activeContext->current_rt != target || tid != This->lastThread) + { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; context->current_rt = target; - This->lastActiveRenderTarget = target; This->lastThread = tid; } else { /* Stick to the old context */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00c0a78..422dbf8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2158,12 +2158,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(swapchain->backBuffer && swapchain->backBuffer[0]) { TRACE("Setting rendertarget to %p\n", swapchain->backBuffer); This->render_targets[0] = swapchain->backBuffer[0]; - This->lastActiveRenderTarget = swapchain->backBuffer[0]; } else { TRACE("Setting rendertarget to %p\n", swapchain->frontBuffer); This->render_targets[0] = swapchain->frontBuffer; - This->lastActiveRenderTarget = swapchain->frontBuffer; } IWineD3DSurface_AddRef(This->render_targets[0]); This->activeContext = swapchain->context[0]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c76db79..d8d95e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1535,9 +1535,6 @@ struct IWineD3DDeviceImpl IWineD3DSurface *auto_depth_stencil_buffer; IWineD3DSurface *stencilBufferTarget; - /* Caches to avoid unneeded context changes */ - IWineD3DSurface *lastActiveRenderTarget; - /* palettes texture management */ UINT NumberOfPalettes; PALETTEENTRY **palettes;

1 0

Henri Verbeet : wined3d: Get rid of lastActiveRenderTarget in FindContext() .
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 223b9d5c015e430a123a6387872ac4158efc3f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223b9d5c015e430a123a63878… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:10 2009 +0200 wined3d: Get rid of lastActiveRenderTarget in FindContext(). --- dlls/wined3d/context.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 78ef374..b92cc99 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1667,7 +1667,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf * After that, the outer ActivateContext(which calls PreLoad) can activate the new * target for the new thread */ - if (readTexture && This->lastActiveRenderTarget != target) { + if (readTexture && context->current_rt != target) + { BOOL oldInDraw = This->isInDraw; /* PreLoad requires a context to load the texture, thus it will call ActivateContext. @@ -1679,15 +1680,15 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf /* Do that before switching the context: * Read the back buffer of the old drawable into the destination texture */ - if (((IWineD3DSurfaceImpl *)This->lastActiveRenderTarget)->texture_name_srgb) + if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) { - surface_internal_preload(This->lastActiveRenderTarget, SRGB_BOTH); + surface_internal_preload(context->current_rt, SRGB_BOTH); } else { - surface_internal_preload(This->lastActiveRenderTarget, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); } /* Assume that the drawable will be modified by some other things now */ - IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, FALSE); + IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); This->isInDraw = oldInDraw; }

1 0

Henri Verbeet : wined3d: Call ModifyLocation on "target" in IWineD3DDeviceImpl_ClearSurface().
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 8402519c7a39f9a0984cf21b1f159e9b8b01f411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8402519c7a39f9a0984cf21b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:09 2009 +0200 wined3d: Call ModifyLocation on "target" in IWineD3DDeviceImpl_ClearSurface(). This is the same pointer, but lastActiveRenderTarget will go away. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ddc4c70..00c0a78 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5065,7 +5065,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it */ - IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); } if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */

1 0

Henri Verbeet : wined3d: Keep track of a context's current render target.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 6c0c1671b209cc91f7b1c3c4d6e246e1f34a7278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0c1671b209cc91f7b1c3c4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:08 2009 +0200 wined3d: Keep track of a context's current render target. --- dlls/wined3d/context.c | 36 ++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 48b8e09..78ef374 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { - if ((IWineD3DSurface *)resource == This->lastActiveRenderTarget) + if (This->activeContext && (IWineD3DSurface *)resource == This->activeContext->current_rt) { IWineD3DSwapChainImpl *swapchain; @@ -506,6 +506,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + This->activeContext->current_rt = This->lastActiveRenderTarget; } } else @@ -514,6 +515,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource /* May happen during ddraw uninitialization. */ This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; + This->activeContext->current_rt = This->lastActiveRenderTarget; } } else if (This->d3d_initialized) @@ -1019,6 +1021,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; + ret->current_rt = (IWineD3DSurface *)target; ret->isPBuffer = create_pbuffer; ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { @@ -1515,22 +1518,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; WineD3DContext *context = This->activeContext; BOOL oldRenderOffscreen = This->render_offscreen; - const struct GlPixelFormatDesc *old = ((IWineD3DSurfaceImpl *)This->lastActiveRenderTarget)->resource.format_desc; - const struct GlPixelFormatDesc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; const struct StateEntry *StateTable = This->StateTable; - - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers - * the alpha blend state changes with different render target formats - */ - if (old->format != new->format) - { - /* Disable blending when the alpha mask has changed and when a format doesn't support blending */ - if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) - || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - { - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); - } - } + const struct GlPixelFormatDesc *old, *new; if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1638,6 +1627,20 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } } + /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers + * the alpha blend state changes with different render target formats. */ + old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; + new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + if (old->format != new->format) + { + /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ + if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) + || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } + } + /* When switching away from an offscreen render target, and we're not using FBOs, * we have to read the drawable into the texture. This is done via PreLoad(and * SFLAG_INDRAWABLE set on the surface). There are some things that need care though. @@ -1765,6 +1768,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(This->lastActiveRenderTarget != target || tid != This->lastThread) { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; + context->current_rt = target; This->lastActiveRenderTarget = target; This->lastThread = tid; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59b91b3..c76db79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1203,6 +1203,7 @@ struct WineD3DContext DWORD isStateDirty[STATE_HIGHEST/32 + 1]; /* Bitmap to find out quickly if a state is dirty */ IWineD3DSurface *surface; + IWineD3DSurface *current_rt; DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */

1 0

Henri Verbeet : wined3d: Pass NULL to ActivateContext() when we don' t need a specific target.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: ee4d18cc836ab0361ac1296f884e53b63b54e514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4d18cc836ab0361ac1296f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:07 2009 +0200 wined3d: Pass NULL to ActivateContext() when we don't need a specific target. Once we keep track of the wined3d context for each thread, lastActiveRenderTarget won't do what we want here. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/buffer.c | 10 +++++----- dlls/wined3d/context.c | 5 ++++- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++------------ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- 11 files changed, 43 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee4d18cc836ab0361ac12…

1 0

Alexandre Julliard : kernel32: Try to load a 32-bit builtin in WinExec16 if the file doesn't exist.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: a9c33bbc4aa254e72e5c2876387718e285b43e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c33bbc4aa254e72e5c28763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 12:22:01 2009 +0200 kernel32: Try to load a 32-bit builtin in WinExec16 if the file doesn't exist. --- dlls/kernel32/ne_module.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 4b45e7b..87a1a86 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -119,6 +119,15 @@ static inline void patch_code_segment( NE_MODULE *pModule ) /*********************************************************************** + * contains_path + */ +static inline int contains_path( LPCSTR name ) +{ + return ((*name && (name[1] == ':')) || strchr(name, '/') || strchr(name, '\\')); +} + + +/*********************************************************************** * NE_strcasecmp * * locale-independent case conversion for module lookups @@ -1674,6 +1683,8 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow ) int arglen; HINSTANCE16 ret; char buffer[MAX_PATH]; + LOADPARAMS16 params; + WORD showCmd[2]; if (*lpCmdLine == '"') /* has to be only one and only at beginning ! */ { @@ -1722,23 +1733,29 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow ) TRACE("name: '%s', cmdline: '%.*s'\n", name, cmdline[0], &cmdline[1]); - if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL )) - { - LOADPARAMS16 params; - WORD showCmd[2]; - showCmd[0] = 2; - showCmd[1] = nCmdShow; + showCmd[0] = 2; + showCmd[1] = nCmdShow; - params.hEnvironment = 0; - params.cmdLine = MapLS( cmdline ); - params.showCmd = MapLS( showCmd ); - params.reserved = 0; + params.hEnvironment = 0; + params.cmdLine = MapLS( cmdline ); + params.showCmd = MapLS( showCmd ); + params.reserved = 0; + if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL )) + { ret = LoadModule16( buffer, &params ); - UnMapLS( params.cmdLine ); - UnMapLS( params.showCmd ); } - else ret = GetLastError(); + else if (!contains_path( name )) /* try 16-bit builtin */ + { + lstrcpynA( buffer, name, sizeof(buffer) ); + if (strlen( buffer ) < sizeof(buffer) - 4 && !strchr( buffer, '.' )) strcat( buffer, ".exe" ); + ret = LoadModule16( buffer, &params ); + if (ret == ERROR_FILE_NOT_FOUND) ret = 21; /* it might be a 32-bit builtin too */ + } + else ret = ERROR_FILE_NOT_FOUND; + + UnMapLS( params.cmdLine ); + UnMapLS( params.showCmd ); HeapFree( GetProcessHeap(), 0, cmdline ); if (name != lpCmdLine) HeapFree( GetProcessHeap(), 0, name );

1 0

Piotr Caban : jscript: Add Error_number handling to constructor and error throwing functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: a77e369cfee850caed24b6e527b65b906a6caa60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77e369cfee850caed24b6e52… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:22 2009 +0200 jscript: Add Error_number handling to constructor and error throwing functions. --- dlls/jscript/error.c | 43 ++++++++++++++++++++++++++++++++++++++----- dlls/jscript/tests/api.js | 27 ++++++++++++++++++--------- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 076215f..d160dd6 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -15,6 +15,10 @@ * 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 "config.h" +#include "wine/port.h" + +#include <math.h> #include "jscript.h" @@ -213,7 +217,7 @@ static HRESULT alloc_error(script_ctx_t *ctx, BOOL error_prototype, } static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, - const WCHAR *msg, DispatchEx **ret) + const UINT *number, const WCHAR *msg, DispatchEx **ret) { ErrorInstance *err; HRESULT hres; @@ -222,10 +226,17 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, if(FAILED(hres)) return hres; + if(number) { + V_VT(&err->number) = VT_I4; + V_I4(&err->number) = *number; + } + V_VT(&err->message) = VT_BSTR; if(msg) V_BSTR(&err->message) = SysAllocString(msg); else V_BSTR(&err->message) = SysAllocStringLen(NULL, 0); + VariantCopy(&err->description, &err->message); + if(!V_BSTR(&err->message)) { heap_free(err); return E_OUTOFMEMORY; @@ -238,11 +249,28 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, DispatchEx *constr) { DispatchEx *err; + VARIANT numv; + UINT num; BSTR msg = NULL; HRESULT hres; + V_VT(&numv) = VT_NULL; + if(arg_cnt(dp)) { - hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &msg); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &numv); + if(FAILED(hres) || (V_VT(&numv)==VT_R8 && isnan(V_R8(&numv)))) + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &msg); + else if(V_VT(&numv) == VT_I4) + num = V_I4(&numv); + else + num = V_R8(&numv); + + if(FAILED(hres)) + return hres; + } + + if(arg_cnt(dp)>1 && !msg) { + hres = to_string(dispex->ctx, get_arg(dp, 1), ei, &msg); if(FAILED(hres)) return hres; } @@ -250,7 +278,11 @@ static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - hres = create_error(dispex->ctx, constr, msg, &err); + if(V_VT(&numv) == VT_NULL) + hres = create_error(dispex->ctx, constr, NULL, msg, &err); + else + hres = create_error(dispex->ctx, constr, &num, msg, &err); + if(FAILED(hres)) return hres; @@ -394,7 +426,8 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH memcpy(pos, str, len*sizeof(WCHAR)); } - hres = create_error(ctx, constr, buf, &err); + id |= 0x800A0000; + hres = create_error(ctx, constr, &id, buf, &err); if(FAILED(hres)) return hres; @@ -404,7 +437,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH V_VT(&ei->var) = VT_DISPATCH; V_DISPATCH(&ei->var) = (IDispatch*)_IDispatchEx_(err); - return 0x800A0000+id; + return id; } HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4cf5bb6..c20cd8b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1287,22 +1287,31 @@ ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); - -function exception_test(func, type) { +err = new Error(123); +ok(err.number === 123, "err.number = " + err.number); +err = new Error(0, "message"); +ok(err.number === 0, "err.number = " + err.number); +ok(err.message === "message", "err.message = " + err.message); +ok(err.description === "message", "err.description = " + err.description); + +function exception_test(func, type, number) { ret = ""; + num = ""; try { func(); } catch(e) { ret = e.name; + num = e.number; } ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); + ok(num === number, "Exception test, num = " + num + ", expected " + number + ". Executed function: " + func.toString()); } -exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {Array(-3);}, "RangeError"); -exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {date.setTime();}, "TypeError"); -exception_test(function() {arr.test();}, "TypeError"); -exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {(new Number(3)).toString(1);}, "TypeError"); +exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError", -2146823282); +exception_test(function() {Array(-3);}, "RangeError", -2146823259); +exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError", -2146823278); +exception_test(function() {date.setTime();}, "TypeError", -2146827839); +exception_test(function() {arr.test();}, "TypeError", -2146827850); +exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); +exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); reportSuccess();

1 0

Piotr Caban : jscript: Added Error_number and Error_description implementation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f3eef0d4c8e1f019894cc77e0cd51d55753a87d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eef0d4c8e1f019894cc77e0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:19 2009 +0200 jscript: Added Error_number and Error_description implementation. --- dlls/jscript/error.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index a9bcb55..076215f 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -42,15 +42,37 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->number); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->number, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->description); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->description, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } /* ECMA-262 3rd Edition 15.11.4.3 */ @@ -123,6 +145,8 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; + VariantClear(&This->number); + VariantClear(&This->description); VariantClear(&This->message); heap_free(This); }

1 0

Piotr Caban : jscript: Added Error_description and Error_number stubs.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 7c0a702001704cf0a0bb257d807d63536d39289e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0a702001704cf0a0bb257d8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:17 2009 +0200 jscript: Added Error_description and Error_number stubs. --- dlls/jscript/error.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 422412a..a9bcb55 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -25,16 +25,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + VARIANT number; + VARIANT description; VARIANT message; } ErrorInstance; +static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; +static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + /* ECMA-262 3rd Edition 15.11.4.3 */ static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -110,9 +128,11 @@ static void Error_destructor(DispatchEx *dispex) } static const builtin_prop_t Error_props[] = { + {descriptionW, Error_description, 0}, {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, + {numberW, Error_number, 0}, {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -127,9 +147,11 @@ static const builtin_info_t Error_info = { }; static const builtin_prop_t ErrorInst_props[] = { + {descriptionW, Error_description, 0}, {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, + {numberW, Error_number, 0}, {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD} };

1 0

Piotr Caban : jscript: Throw errors in Number functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 3afc444e7f8365fc407e28435917fe82279d1d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afc444e7f8365fc407e28435… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:15 2009 +0200 jscript: Throw errors in Number functions. --- dlls/jscript/jscript_En.rc | 2 ++ dlls/jscript/number.c | 18 ++++++------------ dlls/jscript/resource.h | 2 ++ dlls/jscript/tests/api.js | 2 ++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 40b64c9..8a0a9a9 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,9 +22,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" + IDS_NOT_NUM "Number expected" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 5399c91..28049a9 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -54,10 +54,8 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA TRACE("\n"); - if(!is_class(dispex, JSCLASS_NUMBER)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_NUMBER)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_NUM, NULL); number = (NumberInstance*)dispex; @@ -66,10 +64,8 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(FAILED(hres)) return hres; - if(radix<2 || radix>36) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(radix<2 || radix>36) + return throw_type_error(dispex->ctx, ei, IDS_INVALID_CALL_ARG, NULL); } if(V_VT(&number->num) == VT_I4) @@ -208,10 +204,8 @@ static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR { TRACE("\n"); - if(!is_class(dispex, JSCLASS_NUMBER)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_NUMBER)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_NUM, NULL); if(retv) { NumberInstance *number = (NumberInstance*)dispex; diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 44c04a8..8caff6a 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,8 +18,10 @@ #include <windef.h> +#define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E +#define IDS_NOT_NUM 0x1389 #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d0e5995..4cf5bb6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1302,5 +1302,7 @@ exception_test(function() {Array(-3);}, "RangeError"); exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {date.setTime();}, "TypeError"); exception_test(function() {arr.test();}, "TypeError"); +exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {(new Number(3)).toString(1);}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw TypeError in call_expression_eval.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f89fbb9b48817123419958d77f1fb621f2168f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89fbb9b48817123419958d77… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:12 2009 +0200 jscript: Throw TypeError in call_expression_eval. --- dlls/jscript/engine.c | 7 ++----- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3ea33f..10004a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1539,11 +1539,8 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(SUCCEEDED(hres)) { switch(exprval.type) { case EXPRVAL_VARIANT: - if(V_VT(&exprval.u.var) != VT_DISPATCH) { - FIXME("throw TypeError\n"); - hres = E_NOTIMPL; - break; - } + if(V_VT(&exprval.u.var) != VT_DISPATCH) + return throw_type_error(ctx->var_disp->ctx, ei, IDS_NO_PROPERTY, NULL); hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index f54cffb..40b64c9 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_BOOL "Boolean object expected" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 05b693d..44c04a8 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,7 @@ #include <windef.h> +#define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E #define IDS_NOT_BOOL 0x1392 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cae853b..d0e5995 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1300,5 +1300,7 @@ function exception_test(func, type) { exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {Array(-3);}, "RangeError"); exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {date.setTime();}, "TypeError"); +exception_test(function() {arr.test();}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw more errors in Date functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 789afcdc1b596e68368c39538e69b0c8031d2c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789afcdc1b596e68368c39538… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:09 2009 +0200 jscript: Throw more errors in Date functions. --- dlls/jscript/date.c | 105 ++++++++++++------------------------------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + 3 files changed, 32 insertions(+), 75 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5a520a4..b33be0b 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1370,11 +1370,8 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1403,11 +1400,8 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1439,11 +1433,8 @@ static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1475,11 +1466,8 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1521,11 +1509,8 @@ static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DIS if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1567,11 +1552,8 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1621,11 +1603,8 @@ static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DIS if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1675,11 +1654,8 @@ static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1736,11 +1712,8 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1797,11 +1770,8 @@ static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1833,11 +1803,8 @@ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1869,11 +1836,8 @@ static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1915,11 +1879,8 @@ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1961,11 +1922,8 @@ static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -2014,11 +1972,8 @@ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 3a5f9d2..f54cffb 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 6c5f8b0..05b693d 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,7 @@ #include <windef.h> +#define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5

1 0

Piotr Caban : jscript: Throw type errors in Date functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 5b21893abf973ff89e8ab538010a034dc267c455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b21893abf973ff89e8ab5380… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:07 2009 +0200 jscript: Throw type errors in Date functions. --- dlls/jscript/date.c | 246 +++++++++++++++++---------------------------------- 1 files changed, 82 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b21893abf973ff89e8ab…

1 0

Piotr Caban : jscript: Throw type errors in Boolean functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 77e93ad8c7dca4e68b2f6b6cc9c6b9325f83de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e93ad8c7dca4e68b2f6b6cc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:05 2009 +0200 jscript: Throw type errors in Boolean functions. --- dlls/jscript/bool.c | 12 ++++-------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index ab9ef43..2b5152a 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -46,10 +46,8 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA TRACE("\n"); - if(!is_class(dispex, JSCLASS_BOOLEAN)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_BOOLEAN)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_BOOL, NULL); if(retv) { BoolInstance *bool = (BoolInstance*)dispex; @@ -81,10 +79,8 @@ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM { TRACE("\n"); - if(!is_class(dispex, JSCLASS_BOOLEAN)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_BOOLEAN)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_BOOL, NULL); if(retv) { BoolInstance *bool = (BoolInstance*)dispex; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 161b761..3a5f9d2 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -23,5 +23,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NOT_DATE "'[object]' is not a date object" + IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 5041e27..6c5f8b0 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -19,4 +19,5 @@ #include <windef.h> #define IDS_NOT_DATE 0x138E +#define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f36ec80..cae853b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1299,5 +1299,6 @@ function exception_test(func, type) { } exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {Array(-3);}, "RangeError"); +exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw range errors in Array functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bd87f97e2d304420314c339cd226280bb96bd650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd87f97e2d304420314c339cd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:02 2009 +0200 jscript: Throw range errors in Array functions. --- dlls/jscript/array.c | 12 ++++-------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9b43142..0af6df1 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -74,10 +74,8 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM else len = floor(V_R8(&num)); - if(len!=(DWORD)len) { - FIXME("Throw RangeError\n"); - return E_FAIL; - } + if(len!=(DWORD)len) + return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); for(i=len; i<This->length; i++) { hres = jsdisp_delete_idx(dispex, i); @@ -850,10 +848,8 @@ static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISP case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { - if(V_I4(arg_var) < 0) { - FIXME("throw RangeError\n"); - return E_FAIL; - } + if(V_I4(arg_var) < 0) + return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); hres = create_array(dispex->ctx, V_I4(arg_var), &obj); if(FAILED(hres)) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index cee2718..161b761 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -23,4 +23,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NOT_DATE "'[object]' is not a date object" + IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index e0f6661..5041e27 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -19,3 +19,4 @@ #include <windef.h> #define IDS_NOT_DATE 0x138E +#define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 36fb191..f36ec80 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1298,5 +1298,6 @@ function exception_test(func, type) { ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); } exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {Array(-3);}, "RangeError"); reportSuccess();

1 0

Piotr Caban : jscript: Add error throwing functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 469b5972128e8b501ddcec4f03aacede77b5b93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=469b5972128e8b501ddcec4f0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:00 2009 +0200 jscript: Add error throwing functions. --- dlls/jscript/Makefile.in | 6 +++- dlls/jscript/date.c | 6 +--- dlls/jscript/error.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 11 ++++++++ dlls/jscript/jscript_En.rc | 26 ++++++++++++++++++ dlls/jscript/jscript_main.c | 2 +- dlls/jscript/resource.h | 21 +++++++++++++++ dlls/jscript/tests/api.js | 11 ++++++++ 8 files changed, 136 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index b740546..c76bed0 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -3,9 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll -IMPORTS = oleaut32 advapi32 kernel32 +IMPORTS = oleaut32 user32 advapi32 kernel32 -RC_SRCS = rsrc.rc +RC_SRCS = \ + jscript_En.rc \ + rsrc.rc C_SRCS = \ array.c \ diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b65f03e..1630828 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -590,10 +590,8 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA TRACE("\n"); - if(!is_class(dispex, JSCLASS_DATE)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_DATE)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); date = (DateInstance*)dispex; time = local_time(date->time, date); diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index b122c39..422412a 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -330,3 +330,63 @@ HRESULT init_error_constr(script_ctx_t *ctx) return S_OK; } + +static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str, DispatchEx *constr) +{ + WCHAR buf[1024], *pos = NULL; + DispatchEx *err; + HRESULT hres; + + TRACE("\n"); + + LoadStringW(jscript_hinstance, id, buf, sizeof(buf)/sizeof(WCHAR)); + + if(str) pos = strchrW(buf, '|'); + if(pos) { + int len = strlenW(str); + memmove(pos+len, pos+1, strlenW(pos+1)*sizeof(WCHAR)); + memcpy(pos, str, len*sizeof(WCHAR)); + } + + hres = create_error(ctx, constr, buf, &err); + if(FAILED(hres)) + return hres; + + if(!ei) + return id; + + V_VT(&ei->var) = VT_DISPATCH; + V_DISPATCH(&ei->var) = (IDispatch*)_IDispatchEx_(err); + + return 0x800A0000+id; +} + +HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->eval_error_constr); +} + +HRESULT throw_range_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->range_error_constr); +} + +HRESULT throw_reference_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->reference_error_constr); +} + +HRESULT throw_syntax_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->syntax_error_constr); +} + +HRESULT throw_type_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->type_error_constr); +} + +HRESULT throw_uri_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->uri_error_constr); +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 14903e9..f99299f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -28,6 +28,8 @@ #include "dispex.h" #include "activscp.h" +#include "resource.h" + #include "wine/unicode.h" #include "wine/list.h" @@ -58,6 +60,8 @@ jsheap_t *jsheap_mark(jsheap_t*); typedef struct DispatchEx DispatchEx; +extern HINSTANCE jscript_hinstance; + #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 #define PROPF_ENUM 0x0200 @@ -139,6 +143,13 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const builtin_inf DispatchEx*,DispatchEx**); HRESULT Function_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_range_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_reference_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_syntax_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_type_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_uri_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); + HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc new file mode 100644 index 0000000..cee2718 --- /dev/null +++ b/dlls/jscript/jscript_En.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Piotr Caban + * + * 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" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NOT_DATE "'[object]' is not a date object" +} diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 37266e5..4f59ecb 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -40,7 +40,7 @@ static const CLSID CLSID_JScriptEncode = DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static HINSTANCE jscript_hinstance; +HINSTANCE jscript_hinstance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h new file mode 100644 index 0000000..e0f6661 --- /dev/null +++ b/dlls/jscript/resource.h @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Piotr Caban + * + * 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 <windef.h> + +#define IDS_NOT_DATE 0x138E diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 18e6141..36fb191 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1288,4 +1288,15 @@ err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +function exception_test(func, type) { + ret = ""; + try { + func(); + } catch(e) { + ret = e.name; + } + ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); +} +exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); + reportSuccess();

1 0

Piotr Caban : jscript: Add Error_toString implementation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 2d71dac4124092578c1dfb5b8bded0fd66bd1548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d71dac4124092578c1dfb5b8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:57 2009 +0200 jscript: Add Error_toString implementation. --- dlls/jscript/error.c | 15 +++++++++++++-- dlls/jscript/tests/api.js | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 4ae52cf..b122c39 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -54,11 +54,22 @@ static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, } } +/* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; + + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(str); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Error_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f2387b5..18e6141 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1253,6 +1253,8 @@ ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.v ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); EvalError.prototype.message = "test"; +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new EvalError(); ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name); ok(err.name === "EvalError", "err.name = " + err.name); @@ -1260,22 +1262,30 @@ ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype. ok(err.message === "", "err.message != ''"); err.message = date; ok(err.message === date, "err.message != date"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); err = new RangeError(); ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name); ok(err.name === "RangeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new ReferenceError(); ok(ReferenceError.prototype.name === "ReferenceError", "ReferenceError.prototype.name = " + ReferenceError.prototype.name); ok(err.name === "ReferenceError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new SyntaxError(); ok(SyntaxError.prototype.name === "SyntaxError", "SyntaxError.prototype.name = " + SyntaxError.prototype.name); ok(err.name === "SyntaxError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new TypeError(); ok(TypeError.prototype.name === "TypeError", "TypeError.prototype.name = " + TypeError.prototype.name); ok(err.name === "TypeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new URIError(); ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name); ok(err.name === "URIError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); reportSuccess();

1 0

Piotr Caban : jscript: Add Error_message implementation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f17b1f6334d2412b8c1d90fd6697a1c921d20fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17b1f6334d2412b8c1d90fd6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:54 2009 +0200 jscript: Add Error_message implementation. --- dlls/jscript/error.c | 15 +++++++++++++-- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 40228d4..4ae52cf 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -39,8 +39,19 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->message); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->message, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a82931e..f2387b5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1252,9 +1252,14 @@ err = new Error(); ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.valueOf"); ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); +EvalError.prototype.message = "test"; err = new EvalError(); ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name); ok(err.name === "EvalError", "err.name = " + err.name); +ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype.toString"); +ok(err.message === "", "err.message != ''"); +err.message = date; +ok(err.message === date, "err.message != date"); err = new RangeError(); ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name); ok(err.name === "RangeError", "err.name = " + err.name); @@ -1270,5 +1275,7 @@ ok(err.name === "TypeError", "err.name = " + err.name); err = new URIError(); ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name); ok(err.name === "URIError", "err.name = " + err.name); +err = new Error("message"); +ok(err.message === "message", "err.message !== 'message'"); reportSuccess();

1 0