wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Alexandre Julliard : user32: Fix coordinates mapping for the desktop window in the explorer process.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: ee44c7c0f4665af2d7f2f29d4ac85a0cdbfa465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44c7c0f4665af2d7f2f29d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 12:42:19 2010 +0100 user32: Fix coordinates mapping for the desktop window in the explorer process. --- dlls/user32/win.c | 7 +++++-- dlls/user32/winpos.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f1da48b..b61d183 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -740,8 +740,11 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind goto other_process; } win = parent; - OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); - OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + if (win->parent) + { + OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + } } break; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6b623d2..03c16c9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -445,7 +445,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_from = TRUE; offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x += wndPtr->rectClient.left; offset.y += wndPtr->rectClient.top; @@ -460,6 +460,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } } @@ -475,7 +476,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) mirror_to = TRUE; offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; } - for (;;) + while (wndPtr->parent) { offset.x -= wndPtr->rectClient.left; offset.y -= wndPtr->rectClient.top; @@ -490,6 +491,7 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) goto other_process; } } + if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); } }

1 0

Detlef Riekenberg : configure: Ask for the correct development package for gstreamer base plugins.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 654bb4a2317198a4c9540f7d59afd14234acb2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=654bb4a2317198a4c9540f7d5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 12 22:48:56 2010 +0100 configure: Ask for the correct development package for gstreamer base plugins. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4e72097..c1256ba 100755 --- a/configure +++ b/configure @@ -10812,9 +10812,9 @@ fi fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then : case "x$with_gstreamer" in - x) as_fn_append wine_notices "|gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled" ;; + x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; - *) as_fn_error $? "gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled + *) as_fn_error $? "gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 8ad460d..71c14d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,7 +1461,7 @@ then CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes], - [gstreamer-0.10 ${notice_platform}development files not found, gstreamer support disabled]) + [gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x ****

1 0

Detlef Riekenberg : cmd: Allow GOTO to a label which has a following whitespace, with test.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: d62c6bb77f923bfa3d635f9e484feb78d8c3f78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c6bb77f923bfa3d635f9e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 13 00:04:19 2010 +0100 cmd: Allow GOTO to a label which has a following whitespace, with test. --- programs/cmd/builtins.c | 14 ++++++++++++-- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5ccbb8f..8c3f727 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1150,6 +1150,7 @@ void WCMD_give_help (WCHAR *command) { void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; + WCHAR current[MAX_PATH]; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -1174,8 +1175,17 @@ void WCMD_goto (CMD_LIST **cmdList) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW(*str)) str++; - if ((*str == ':') && (lstrcmpiW (++str, paramStart) == 0)) return; + while (isspaceW (*str)) str++; + if (*str == ':') { + DWORD index = 0; + str++; + while (((current[index] = str[index])) && (!isspaceW (current[index]))) + index++; + + /* ignore space at the end */ + current[index] = 0; + if (lstrcmpiW (current, paramStart) == 0) return; + } } WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 375b7a1..2b117e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -88,3 +88,6 @@ echo goto with a leading space worked if c==c goto dest3 :dest3 echo goto with a leading tab worked +if d==d goto dest4 +:dest4@space@ +echo goto with a following space worked diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dee2c5b..e4644d3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -82,3 +82,4 @@ if /I seems to work goto with no leading space worked goto with a leading space worked goto with a leading tab worked +goto with a following space worked

1 0

Michael Stefaniuc : oleaut32: Standardize the COM usage in connpt.c.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: dacdb07dc454c58845450efc3c26127cba23e909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dacdb07dc454c58845450efc3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:49:02 2010 +0100 oleaut32: Standardize the COM usage in connpt.c. --- dlls/oleaut32/connpt.c | 55 +++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 94e8e7c..59768a0 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ typedef struct ConnectionPointImpl { - const IConnectionPointVtbl *lpvtbl; + IConnectionPoint IConnectionPoint_iface; /* IUnknown of our main object*/ IUnknown *Obj; @@ -74,7 +74,7 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable; */ typedef struct EnumConnectionsImpl { - const IEnumConnectionsVtbl *lpvtbl; + IEnumConnections IEnumConnections_iface; LONG ref; @@ -94,6 +94,15 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, DWORD nSinks, CONNECTDATA *pCD); +static inline ConnectionPointImpl *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, ConnectionPointImpl, IConnectionPoint_iface); +} + +static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections *iface) +{ + return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface); +} /************************************************************************ * ConnectionPointImpl_Construct @@ -104,7 +113,7 @@ static ConnectionPointImpl *ConnectionPointImpl_Construct(IUnknown *pUnk, ConnectionPointImpl *Obj; Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); - Obj->lpvtbl = &ConnectionPointImpl_VTable; + Obj->IConnectionPoint_iface.lpVtbl = &ConnectionPointImpl_VTable; Obj->Obj = pUnk; Obj->ref = 1; Obj->iid = *riid; @@ -143,7 +152,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( REFIID riid, void** ppvObject) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); /* @@ -178,7 +187,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( * Query Interface always increases the reference count by one when it is * successful */ - ConnectionPointImpl_AddRef((IConnectionPoint*)This); + ConnectionPointImpl_AddRef(&This->IConnectionPoint_iface); return S_OK; } @@ -191,7 +200,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( */ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); @@ -207,7 +216,7 @@ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) static ULONG WINAPI ConnectionPointImpl_Release( IConnectionPoint* iface) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); @@ -228,7 +237,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( IConnectionPoint *iface, IID *piid) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p) returning %s\n", This, piid, debugstr_guid(&(This->iid))); *piid = This->iid; return S_OK; @@ -242,7 +251,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( IConnectionPoint *iface, IConnectionPointContainer **ppCPC) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p)\n", This, ppCPC); return IUnknown_QueryInterface(This->Obj, @@ -259,7 +268,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, DWORD *pdwCookie) { DWORD i; - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); IUnknown *lpSink; TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); @@ -290,7 +299,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%d)\n", This, dwCookie); if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG; @@ -311,7 +320,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( IConnectionPoint *iface, LPENUMCONNECTIONS *ppEnum) { - ConnectionPointImpl *This = (ConnectionPointImpl *)iface; + ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); CONNECTDATA *pCD; DWORD i, nextslot; EnumConnectionsImpl *EnumObj; @@ -339,9 +348,9 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( IUnknown_AddRef((IUnknown*)This); EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); - hr = IEnumConnections_QueryInterface((IEnumConnections*)EnumObj, + hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, &IID_IEnumConnections, (LPVOID)ppEnum); - IEnumConnections_Release((IEnumConnections*)EnumObj); + IEnumConnections_Release(&EnumObj->IEnumConnections_iface); HeapFree(GetProcessHeap(), 0, pCD); return hr; @@ -373,7 +382,7 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, EnumConnectionsImpl *Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); DWORD i; - Obj->lpvtbl = &EnumConnectionsImpl_VTable; + Obj->IEnumConnections_iface.lpVtbl = &EnumConnectionsImpl_VTable; Obj->ref = 1; Obj->pUnk = pUnk; Obj->pCD = HeapAlloc(GetProcessHeap(), 0, nSinks * sizeof(CONNECTDATA)); @@ -460,7 +469,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( */ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); @@ -476,7 +485,7 @@ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) */ static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); @@ -499,7 +508,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); DWORD nRet = 0; TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum); @@ -534,7 +543,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); TRACE("(%p)->(%d)\n", This, cSkip); if(This->nCur + cSkip >= This->nConns) @@ -552,7 +561,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, */ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); TRACE("(%p)\n", This); This->nCur = 0; @@ -568,7 +577,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, LPENUMCONNECTIONS *ppEnum) { - EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; + EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *newObj; TRACE("(%p)->(%p)\n", This, ppEnum); @@ -613,8 +622,8 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, Obj = ConnectionPointImpl_Construct(pUnk, riid); if(!Obj) return E_OUTOFMEMORY; - hr = IConnectionPoint_QueryInterface((IConnectionPoint *)Obj, + hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, &IID_IConnectionPoint, (LPVOID)pCP); - IConnectionPoint_Release((IConnectionPoint *)Obj); + IConnectionPoint_Release(&Obj->IConnectionPoint_iface); return hr; }

1 0

Michael Stefaniuc : clock: Add the Punjabi translation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 47446593279d16977667648e371582b0d25d9759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47446593279d16977667648e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:48:12 2010 +0100 clock: Add the Punjabi translation. Translation by Jaswinder Singh. --- programs/clock/Makefile.in | 1 + programs/clock/Pa.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 7b674f8..d40906e 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Nl.rc \ No.rc \ Or.rc \ + Pa.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/programs/clock/Pa.rc b/programs/clock/Pa.rc new file mode 100644 index 0000000..361a6db --- /dev/null +++ b/programs/clock/Pa.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Cpoyright 2010 Jaswinder Singh + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "ਜਾਣਕਾਰੀ(&o)" { + MENUITEM "ਐਨਾਲਾਗ(&l)", IDM_ANALOG + MENUITEM "ਡਿਜ਼ੀਟਲ(&t)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ਫੌਂਟ(&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "ਟਾਈਟਲਬਾਰ ਤੋਂ ਬਿਨਾਂ(&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "ਸਕਿੰਟ(&S)", IDM_SECONDS + MENUITEM "ਮਿਤੀ(&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ਹਮੇਸ਼ਾ ਉੱਪਰ(&A)", IDM_ONTOP + } + POPUP "ਜਾਣਕਾਰੀ(&o)" { + MENUITEM "ਘੜੀ ਬਾਰੇ(&A)...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ਘੜੀ" +}

1 0

Michael Stefaniuc : clock: Add the Oriya translation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: cddc8e71cc402e2306a87d0315b16b694b4cb62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cddc8e71cc402e2306a87d031… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:47:59 2010 +0100 clock: Add the Oriya translation. Translation by Manoj Giri. --- programs/clock/Makefile.in | 1 + programs/clock/Or.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 74d730b..7b674f8 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ Ml.rc \ Nl.rc \ No.rc \ + Or.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/programs/clock/Or.rc b/programs/clock/Or.rc new file mode 100644 index 0000000..d668b9c --- /dev/null +++ b/programs/clock/Or.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Manoj Giri + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_ORIYA, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "ସୂଚନା (&o)" { + MENUITEM "ଆନାଲଗ ‍‌(&l)", IDM_ANALOG + MENUITEM "ଡିଜିଟାଲ (&)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ଅକ୍ଷରରୂପ (&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "ଶୀର୍ଷକ ପଟି ବିନା (&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "ସେକଣ୍ଡ (&S)", IDM_SECONDS + MENUITEM "ତାରିଖ (&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ସର୍ବଦା ଉପରେ (&A)", IDM_ONTOP + } + POPUP "ସୂଚନା (&o)" { + MENUITEM "ଘଡ଼ି ବିଷୟରେ (&A)...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ଘଡ଼ି" +}

1 0

Michael Stefaniuc : clock: Add the Telugu translation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: f845a7f05fde1388cefe14c6be96e4d6bca58da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f845a7f05fde1388cefe14c6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:48:27 2010 +0100 clock: Add the Telugu translation. Translation by Krishnababu Krothapalli. --- programs/clock/Makefile.in | 1 + programs/clock/Te.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index dc89086..74d730b 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ Sk.rc \ Sr.rc \ Sv.rc \ + Te.rc \ Th.rc \ Tr.rc \ Uk.rc \ diff --git a/programs/clock/Te.rc b/programs/clock/Te.rc new file mode 100644 index 0000000..ed90884 --- /dev/null +++ b/programs/clock/Te.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Krishnababu Krothapalli + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "సమాచారము (&o)" { + MENUITEM "ఎనలాగ్ (&l)", IDM_ANALOG + MENUITEM "డిజిటల్ (&t)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "ఫాంట్... (&F)", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "శీర్షికపట్టీ లేకుండా (&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "క్షణాలు (&S)", IDM_SECONDS + MENUITEM "తేది (&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "ఎల్లప్పుడూ పైన (&A)", IDM_ONTOP + } + POPUP "సమాచారము (&o)" { + MENUITEM "గడియారం గురించి... (&A)", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "గడియారం" +}

1 0

Michael Stefaniuc : clock: Add the Malayalam translation.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 1cd20f8c48ac9b548ecdf1d81649b93742cd23a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd20f8c48ac9b548ecdf1d81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 12 23:47:42 2010 +0100 clock: Add the Malayalam translation. Translation by Ani Peter. --- programs/clock/Makefile.in | 1 + programs/clock/Ml.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 757b304..dc89086 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ Ja.rc \ Ko.rc \ Lt.rc \ + Ml.rc \ Nl.rc \ No.rc \ Pl.rc \ diff --git a/programs/clock/Ml.rc b/programs/clock/Ml.rc new file mode 100644 index 0000000..f20b54e --- /dev/null +++ b/programs/clock/Ml.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Ani Peter + * Michael Stefaniuc + * + * 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 "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_MALAYALAM, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "വി_വരം" { + MENUITEM "_അനലോഗ്", IDM_ANALOG + MENUITEM "_ഡിജിറ്റല്‍", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "_അക്ഷരസഞ്ചയം...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "റ്റൈറ്റില്‍ബാര്‍ _ഇല്ലാതെ", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "_സെക്കന്‍ഡുകള്‍", IDM_SECONDS + MENUITEM "_തീയതി", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "_എപ്പോഴും മുകളില്‍", IDM_ONTOP + } + POPUP "വി_വരം" { + MENUITEM "ക്ലോക്കിനെപ്പറ്റി _അറിയുക...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "ക്ലോക്ക്" +}

1 0

Rico Schüller : d3dcompiler: Handle TAG_OSG5 in D3DGetBlobPart().
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: cc6699f09df78b7fb3d8c281ad3215a836133661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6699f09df78b7fb3d8c281a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Dec 12 21:48:25 2010 +0100 d3dcompiler: Handle TAG_OSG5 in D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 6 +++--- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index c22a9b1..d7c8067 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -130,11 +130,11 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: - if (tag == TAG_OSGN) add = TRUE; + if (tag == TAG_OSGN || tag == TAG_OSG5) add = TRUE; break; case D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB: - if (tag == TAG_ISGN || tag == TAG_OSGN) add = TRUE; + if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_OSG5) add = TRUE; break; case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: @@ -142,7 +142,7 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; case D3D_BLOB_ALL_SIGNATURE_BLOB: - if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_PCSG) add = TRUE; + if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_OSG5 || tag == TAG_PCSG) add = TRUE; break; case D3D_BLOB_DEBUG_INFO: diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index c27e3d8..33c51d7 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -583,6 +583,7 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G')

1 0

Jacek Caban : mshtml: Fixed tests on IEs not supporting INewWindowManager.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 47bb0de4bca4e51b5945635c26f9927a6512a91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bb0de4bca4e51b5945635c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 12 18:13:43 2010 +0100 mshtml: Fixed tests on IEs not supporting INewWindowManager. --- dlls/mshtml/tests/htmldoc.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9801d68..ed322ba 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3572,22 +3572,31 @@ static void test_open_window(IHTMLDocument2 *doc) SET_EXPECT(EvaluateNewWindow); hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); - todo_wine - ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine - ok(new_window == NULL, "new_window != NULL\n"); + open_call = FALSE; + SysFreeString(url); + SysFreeString(name); todo_wine CHECK_CALLED(TranslateUrl); + + if(!called_EvaluateNewWindow) { + todo_wine + win_skip("INewWindowManager not supported\n"); + if(SUCCEEDED(hres) && new_window) + IHTMLWindow2_Release(new_window); + IHTMLWindow2_Release(window); + return; + } + todo_wine CHECK_CALLED(EvaluateNewWindow); - open_call = FALSE; - SysFreeString(url); - SysFreeString(name); + todo_wine + ok(hres == S_OK, "open failed: %08x\n", hres); + todo_wine + ok(new_window == NULL, "new_window != NULL\n"); IHTMLWindow2_Release(window); - SysFreeString(name); } static void test_clear(IHTMLDocument2 *doc)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010