May 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 4deab508ba936d3708bc04204fcae4c316b14d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deab508ba936d3708bc04204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:56 2010 +0200 wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE. --- dlls/wineoss.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 9c712c8..5598879 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1967,7 +1967,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) audio_buf_info info; DWORD ret; - TRACE("(%u, %p[cb=%08lx], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags); + TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM;

1 0

Michael Stefaniuc : rpcrt4: Remove redundant "non NULL" check of var cred_dst (coccicheck).
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 9dc835c2bca02b4b10e6897f150fc22852de6b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc835c2bca02b4b10e6897f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:16:34 2010 +0200 rpcrt4: Remove redundant "non NULL" check of var cred_dst (coccicheck). --- dlls/rpcrt4/rpc_binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a534b7d..d83f53b 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1303,7 +1303,7 @@ static RPC_STATUS RpcQualityOfService_Create(const RPC_SECURITY_QOS *qos_src, BO cred_dst->User = HeapAlloc(GetProcessHeap(), 0, cred_dst->UserLength * sizeof(WCHAR)); cred_dst->Password = HeapAlloc(GetProcessHeap(), 0, cred_dst->PasswordLength * sizeof(WCHAR)); cred_dst->Domain = HeapAlloc(GetProcessHeap(), 0, cred_dst->DomainLength * sizeof(WCHAR)); - if (!cred_dst || !cred_dst->Password || !cred_dst->Domain) goto error; + if (!cred_dst->Password || !cred_dst->Domain) goto error; MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->User, cred_src->UserLength, cred_dst->User, cred_dst->UserLength); MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Domain, cred_src->DomainLength, cred_dst->Domain, cred_dst->DomainLength); MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Password, cred_src->PasswordLength, cred_dst->Password, cred_dst->PasswordLength);

1 0

Michael Stefaniuc : user32: Avoid a potential NULL pointer dereference in a TRACE.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 629a0b8057df0aa7d5b13e296abd257c07acbb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=629a0b8057df0aa7d5b13e296… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:16:55 2010 +0200 user32: Avoid a potential NULL pointer dereference in a TRACE. --- dlls/user32/dde_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 3e44e6a..2dc8ae8 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -392,8 +392,8 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w hwndClient = (HWND)wParam; pInstance = WDML_GetInstanceFromWnd(hwndServer); - TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); if (!pInstance) return 0; + TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); /* don't free DDEParams, since this is a broadcast */ UnpackDDElParam(WM_DDE_INITIATE, lParam, &uiLo, &uiHi);

1 0

Maarten Lankhorst : mciqtz32: Handle window visibility better.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 573abf839890afdd616307fbf644a15606cc6aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=573abf839890afdd616307fbf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:24:28 2010 +0200 mciqtz32: Handle window visibility better. Video Window only needs to be created on play, so defer until then. --- dlls/mciqtz32/mciqtz.c | 31 ++++++++++++++++++++++++------- dlls/mciqtz32/mciqtz_private.h | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 4c9baf5..599a6f0 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -199,19 +199,21 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, DWORD style; RECT rc = { 0, 0, 0, 0 }; IVideoWindow_put_AutoShow(vidwin, OAFALSE); + IVideoWindow_put_Visible(vidwin, OAFALSE); style = 0; if (dwFlags & MCI_DGV_OPEN_WS) style |= lpOpenParms->dwStyle; if (dwFlags & MCI_DGV_OPEN_PARENT) { - style |= WS_CHILD; IVideoWindow_put_MessageDrain(vidwin, (OAHWND)lpOpenParms->hWndParent); IVideoWindow_put_WindowState(vidwin, SW_HIDE); + IVideoWindow_put_WindowStyle(vidwin, WS_CHILD); IVideoWindow_put_Owner(vidwin, (OAHWND)lpOpenParms->hWndParent); + wma->parent = (HWND)lpOpenParms->hWndParent; } - IVideoWindow_put_WindowStyle(vidwin, style); + else if (style) + IVideoWindow_put_WindowStyle(vidwin, style); IBasicVideo_GetVideoSize(vidbasic, &rc.right, &rc.bottom); IVideoWindow_SetWindowPosition(vidwin, rc.left, rc.top, rc.right, rc.bottom); - IVideoWindow_put_Visible(vidwin, OATRUE); IBasicVideo_Release(vidbasic); } if (vidwin) @@ -284,7 +286,14 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms return MCIERR_INTERNAL; } - wma->started = TRUE; + if (!wma->parent) { + IVideoWindow *vidwin; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OATRUE); + IVideoWindow_Release(vidwin); + } + } return 0; } @@ -358,7 +367,7 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa if (!wma) return MCIERR_INVALID_DEVICE_ID; - if (!wma->started) + if (!wma->opened) return 0; hr = IMediaControl_Stop(wma->pmctrl); @@ -367,7 +376,14 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa return MCIERR_INTERNAL; } - wma->started = FALSE; + if (!wma->parent) { + IVideoWindow *vidwin; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OAFALSE); + IVideoWindow_Release(vidwin); + } + } return 0; } @@ -793,7 +809,8 @@ out: if (vidbasic) IBasicVideo_Release(vidbasic); if (vidwin) { - IVideoWindow_put_Visible(vidwin, OATRUE); + if (wma->parent) + IVideoWindow_put_Visible(vidwin, OATRUE); IVideoWindow_Release(vidwin); } } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 2269c42..2fdef73 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -31,9 +31,9 @@ typedef struct { BOOL uninit; IGraphBuilder* pgraph; IMediaControl* pmctrl; - BOOL started; DWORD time_format; UINT command_table; + HWND parent; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_STATUS_TIME_FORMAT.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: ecbc152977fcc1d84856275597d6feed97276837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbc152977fcc1d8485627559… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:26:44 2010 +0200 mciqtz32: Add support for MCI_STATUS_TIME_FORMAT. --- dlls/mciqtz32/mciqtz.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 599a6f0..915ffc4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -629,8 +629,8 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; case MCI_STATUS_TIME_FORMAT: - FIXME("MCI_STATUS_TIME_FORMAT not implemented yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + lpParms->dwReturn = wma->time_format; + break; case MCI_STATUS_READY: FIXME("MCI_STATUS_READY not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND;

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_PAUSE.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: aa65a56afe5ab1b636a48c1a3fdd46b45616343d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa65a56afe5ab1b636a48c1a3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:27:25 2010 +0200 mciqtz32: Add support for MCI_PAUSE. --- dlls/mciqtz32/mciqtz.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 915ffc4..75f2c01 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -389,6 +389,29 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa } /*************************************************************************** + * MCIQTZ_mciPause [internal] + */ +static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Pause(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot pause filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -876,6 +899,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_PAUSE: return MCIQTZ_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); @@ -885,7 +909,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_UPDATE: return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_RECORD: - case MCI_PAUSE: case MCI_RESUME: case MCI_INFO: case MCI_PUT:

1 0

Louis Lenders : samlib: Add stubbed samlib.dll.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 1ae673f8deb4ad897afbea967a31dfda4d376007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae673f8deb4ad897afbea967… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue May 11 22:59:22 2010 +0200 samlib: Add stubbed samlib.dll. --- configure | 1 + configure.ac | 1 + dlls/samlib/Makefile.in | 11 ++++++++ dlls/samlib/main.c | 48 ++++++++++++++++++++++++++++++++++ dlls/samlib/samlib.spec | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9de0946..cee32b9 100755 --- a/configure +++ b/configure @@ -14620,6 +14620,7 @@ wine_fn_config_dll rsabase enable_rsabase wine_fn_config_dll rsaenh enable_rsaenh rsaenh wine_fn_config_test dlls/rsaenh/tests rsaenh_test wine_fn_config_dll rtutils enable_rtutils rtutils +wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel diff --git a/configure.ac b/configure.ac index 1e5ac7c..130291c 100644 --- a/configure.ac +++ b/configure.ac @@ -2550,6 +2550,7 @@ WINE_CONFIG_DLL(rsabase) WINE_CONFIG_DLL(rsaenh,,[rsaenh]) WINE_CONFIG_TEST(dlls/rsaenh/tests) WINE_CONFIG_DLL(rtutils,,[rtutils]) +WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) diff --git a/dlls/samlib/Makefile.in b/dlls/samlib/Makefile.in new file mode 100644 index 0000000..860dc63 --- /dev/null +++ b/dlls/samlib/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = samlib.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/samlib/main.c b/dlls/samlib/main.c new file mode 100644 index 0000000..46e8f6e --- /dev/null +++ b/dlls/samlib/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samlib); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/samlib/samlib.spec b/dlls/samlib/samlib.spec new file mode 100644 index 0000000..88f1600 --- /dev/null +++ b/dlls/samlib/samlib.spec @@ -0,0 +1,65 @@ +@ stub SamAddMemberToAlias +@ stub SamAddMemberToGroup +@ stub SamAddMultipleMembersToAlias +@ stub SamChangePasswordUser2 +@ stub SamChangePasswordUser3 +@ stub SamChangePasswordUser +@ stub SamCloseHandle +@ stub SamConnect +@ stub SamConnectWithCreds +@ stub SamCreateAliasInDomain +@ stub SamCreateGroupInDomain +@ stub SamCreateUser2InDomain +@ stub SamCreateUserInDomain +@ stub SamDeleteAlias +@ stub SamDeleteGroup +@ stub SamDeleteUser +@ stub SamEnumerateAliasesInDomain +@ stub SamEnumerateDomainsInSamServer +@ stub SamEnumerateGroupsInDomain +@ stub SamEnumerateUsersInDomain +@ stub SamFreeMemory +@ stub SamGetAliasMembership +@ stub SamGetCompatibilityMode +@ stub SamGetDisplayEnumerationIndex +@ stub SamGetGroupsForUser +@ stub SamGetMembersInAlias +@ stub SamGetMembersInGroup +@ stub SamLookupDomainInSamServer +@ stub SamLookupIdsInDomain +@ stub SamLookupNamesInDomain +@ stub SamOpenAlias +@ stub SamOpenDomain +@ stub SamOpenGroup +@ stub SamOpenUser +@ stub SamQueryDisplayInformation +@ stub SamQueryInformationAlias +@ stub SamQueryInformationDomain +@ stub SamQueryInformationGroup +@ stub SamQueryInformationUser +@ stub SamQuerySecurityObject +@ stub SamRemoveMemberFromAlias +@ stub SamRemoveMemberFromForeignDomain +@ stub SamRemoveMemberFromGroup +@ stub SamRemoveMultipleMembersFromAlias +@ stub SamRidToSid +@ stub SamSetInformationAlias +@ stub SamSetInformationDomain +@ stub SamSetInformationGroup +@ stub SamSetInformationUser +@ stub SamSetMemberAttributesOfGroup +@ stub SamSetSecurityObject +@ stub SamShutdownSamServer +@ stub SamTestPrivateFunctionsDomain +@ stub SamTestPrivateFunctionsUser +@ stub SamiChangeKeys +@ stub SamiChangePasswordUser2 +@ stub SamiChangePasswordUser3 +@ stub SamiChangePasswordUser +@ stub SamiEncryptPasswords +@ stub SamiGetBootKeyInformation +@ stub SamiLmChangePasswordUser +@ stub SamiOemChangePasswordUser2 +@ stub SamiSetBootKeyInformation +@ stub SamiSetDSRMPassword +@ stub SamiSetDSRMPasswordOWF

1 0

André Hentschel : start: Update German translation.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: a489489e01aaa729f7a336b7f8d8dd471c66557b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a489489e01aaa729f7a336b7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 19 16:49:25 2010 +0200 start: Update German translation. --- programs/start/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/De.rc b/programs/start/De.rc index 3977066..af2058b 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -38,7 +38,7 @@ Optionen:\n\ /MAX[imized] Starte das Programm maximiert.\n\ /R[estored] Starte das Programm normal (weder minimiert noch maximiert).\n\ /W[ait] Wartet bis das gestartete Programm sich beendet,\n\t dann beendet sich start mit dessen Exitcode des Programmes.\n\ -/ProgIDOpen Open a document using the following progID.\n\ +/ProgIDOpen Öffne ein Dokument mit der folgenden progID.\n\ /L Zeige die Endbenutzerlizenz an.\n\ \n\ start.exe Version 0.2 Copyright (C) 2003, Dan Kegel\n\

1 0

Maarten Lankhorst : quartz: Support negative heights in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 4c23814c48552ebac0354774b50fa33415c90a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c23814c48552ebac0354774b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 19 21:46:50 2010 +0200 quartz: Support negative heights in video renderer. --- dlls/quartz/videorenderer.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 845921c..f8a5852 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,8 +82,8 @@ typedef struct VideoRendererImpl RECT SourceRect; RECT DestRect; RECT WindowPos; - long VideoWidth; - long VideoHeight; + LONG VideoWidth; + LONG VideoHeight; IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; @@ -287,7 +287,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); TRACE("biWidth = %d\n", bmiHeader->biWidth); TRACE("biHeight = %d\n", bmiHeader->biHeight); @@ -483,6 +482,7 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) { VideoRendererImpl* This = iface; + LONG height; if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { @@ -490,7 +490,11 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt This->SourceRect.left = 0; This->SourceRect.top = 0; This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; + height = format->bmiHeader.biHeight; + if (height < 0) + This->SourceRect.bottom = This->VideoHeight = -height; + else + This->SourceRect.bottom = This->VideoHeight = height; } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { @@ -499,7 +503,11 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt This->SourceRect.left = 0; This->SourceRect.top = 0; This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format2->bmiHeader.biHeight; + height = format2->bmiHeader.biHeight; + if (height < 0) + This->SourceRect.bottom = This->VideoHeight = -height; + else + This->SourceRect.bottom = This->VideoHeight = height; } else {

1 0

Sven Baars : shdoclc: Fix Dutch translation.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 6711a0f55350f2ae1a296672b2ff5a9b07d1cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6711a0f55350f2ae1a296672b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 19 22:57:09 2010 +0200 shdoclc: Fix Dutch translation. --- dlls/shdoclc/Nl.rc | 92 ++++++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/shdoclc/Nl.rc b/dlls/shdoclc/Nl.rc index c10e803..075af99 100644 --- a/dlls/shdoclc/Nl.rc +++ b/dlls/shdoclc/Nl.rc @@ -40,38 +40,38 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Terug", IDM_GOBACKWARD MENUITEM "V&ooruit", IDM_GOFORWARD MENUITEM SEPARATOR - MENUITEM "&Achtergrond opslaan als...", IDM_SAVEBACKGROUND + MENUITEM "Achtergrond ops&laan als...", IDM_SAVEBACKGROUND MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Achtergrond &kopi�ren", IDM_COPYBACKGROUND MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Alles &selecteren", IDM_SELECTALL + MENUITEM "&Alles selecteren", IDM_SELECTALL MENUITEM "&Plakken", IDM_PASTE MENUITEM SEPARATOR MENUITEM "&Snelkoppeling aanmaken", IDM_CREATESHORTCUT - MENUITEM "Als &favoriet toevoegen", IDM_ADDFAVORITES + MENUITEM "Aan &favorieten toevoegen", IDM_ADDFAVORITES MENUITEM "&Bronweergave", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Tekstcodering", IDM_LANGUAGE MENUITEM SEPARATOR - MENUITEM "&Afdrukken", IDM_PRINT + MENUITEM "Af&drukken", IDM_PRINT MENUITEM "A&ctualiseren", _IDM_REFRESH MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "&Eigenschappen", IDM_PROPERTIES } - POPUP "Beeld" + POPUP "Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC - MENUITEM "Open link in nieuw venster", IDM_FOLLOWLINKN - MENUITEM "&Doel opslaan als...", IDM_SAVETARGET - MENUITEM "Doel &afdrukken", IDM_PRINTTARGET - MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE - MENUITEM "Beeld &versturen...", IDM_MP_EMAILPICTURE - MENUITEM "Beeld Af&drukken...", IDM_MP_PRINTPICTURE + MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE + MENUITEM "Afbeelding &versturen...", IDM_MP_EMAILPICTURE + MENUITEM "Afbeelding &afdrukken...", IDM_MP_PRINTPICTURE MENUITEM "&Ga naar Mijn Afbeeldingen", IDM_MP_MYPICS MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM @@ -91,8 +91,8 @@ IDR_BROWSE_CONTEXT_MENU MENU { MENUITEM "&Ongedaan maken", IDM_UNDO MENUITEM SEPARATOR - MENUITEM "&Knippen", IDM_CUT - MENUITEM "K&opi�ren", IDM_COPY + MENUITEM "K&nippen", IDM_CUT + MENUITEM "&Kopi�ren", IDM_COPY MENUITEM "&Plakken", IDM_PASTE MENUITEM "&Verwijderen", IDM_DELETE MENUITEM SEPARATOR @@ -111,8 +111,8 @@ IDR_BROWSE_CONTEXT_MENU MENU } MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Celeigenschappen", IDM_CELLPROPERTIES - MENUITEM "&Tabeleigenschappen", IDM_TABLEPROPERTIES + MENUITEM "Cel&eigenschappen", IDM_CELLPROPERTIES + MENUITEM "Tabelei&genschappen", IDM_TABLEPROPERTIES } POPUP "1DPaginakeuze" @@ -121,16 +121,16 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Kopi�ren", IDM_COPY MENUITEM "&Plakken", IDM_PASTE MENUITEM "Alles &selecteren", IDM_SELECTALL - MENUITEM "&Afdrukken", IDM_PRINT + MENUITEM "Af&drukken", IDM_PRINT MENUITEM SEPARATOR } POPUP "Anker" { MENUITEM "&Openen", IDM_FOLLOWLINKC - MENUITEM "In &nieuw venster openen", IDM_FOLLOWLINKN - MENUITEM "Doel op&slaan als...", IDM_SAVETARGET - MENUITEM "Doel &afdrukken", IDM_PRINTTARGET + MENUITEM "In nieuw &venster openen", IDM_FOLLOWLINKN + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "K&nippen", IDM_CUT MENUITEM "&Kopi�ren", IDM_COPY @@ -148,15 +148,15 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR } - POPUP "DYNSRC Beeld" + POPUP "DYNSRC Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN - MENUITEM "Doel &opslaan als...", IDM_SAVETARGET - MENUITEM "&Doel afdrukken", IDM_PRINTTARGET + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR @@ -173,15 +173,15 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Eigenschappen", IDM_PROPERTIES } - POPUP "ART Beeld" + POPUP "ART Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN - MENUITEM "Doel &opslaan als...", IDM_SAVETARGET - MENUITEM "&Doel afdrukken", IDM_PRINTTARGET + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR @@ -220,31 +220,31 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Wijzigen Beeld", IDM_EDITMODE } - POPUP "Vertikale scrollbalk" + POPUP "Verticale scrollbalk" { - MENUITEM "Scroll hier", IDM_SCROLL_HERE + MENUITEM "Scroll hier", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "Boven", IDM_SCROLL_TOP - MENUITEM "Onder", IDM_SCROLL_BOTTOM + MENUITEM "Boven", IDM_SCROLL_TOP + MENUITEM "Onder", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR - MENUITEM "Pagina boven", IDM_SCROLL_PAGEUP - MENUITEM "Pagina onder", IDM_SCROLL_PAGEDOWN + MENUITEM "Pagina naar boven", IDM_SCROLL_PAGEUP + MENUITEM "Pagina naar onder", IDM_SCROLL_PAGEDOWN MENUITEM SEPARATOR - MENUITEM "Scroll omhoog", IDM_SCROLL_UP - MENUITEM "Scroll omlaag", IDM_SCROLL_DOWN + MENUITEM "Scroll omhoog", IDM_SCROLL_UP + MENUITEM "Scroll omlaag", IDM_SCROLL_DOWN } POPUP "Horizontale scrollbalk" { - MENUITEM "Scroll hier", IDM_SCROLL_HERE + MENUITEM "Scroll hier", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "Linker hoek", IDM_SCROLL_LEFTEDGE - MENUITEM "Rechter hoek", IDM_SCROLL_RIGHTEDGE + MENUITEM "Linkerrand", IDM_SCROLL_LEFTEDGE + MENUITEM "Rechterrand", IDM_SCROLL_RIGHTEDGE MENUITEM SEPARATOR - MENUITEM "Pagina links", IDM_SCROLL_PAGELEFT - MENUITEM "Pagina rechts", IDM_SCROLL_PAGERIGHT + MENUITEM "Pagina naar links", IDM_SCROLL_PAGELEFT + MENUITEM "Pagina naar rechts", IDM_SCROLL_PAGERIGHT MENUITEM SEPARATOR - MENUITEM "Scroll links", IDM_SCROLL_LEFT - MENUITEM "Scroll rechts", IDM_SCROLL_RIGHT + MENUITEM "Scroll naar links", IDM_SCROLL_LEFT + MENUITEM "Scroll naar rechts", IDM_SCROLL_RIGHT } }

1 0