November 2010 - Wine-commits

Gustavo Henrique Milaré : inetcpl.cpl: Added Portuguese (Brazilian) translation.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 63ab5eea071b1acb3f17a64ef131ed7f114edb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ab5eea071b1acb3f17a64ef… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Nov 10 19:36:32 2010 -0200 inetcpl.cpl: Added Portuguese (Brazilian) translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Pt.rc | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 9095d7e..8c6b080 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ cpl_Lt.rc \ cpl_Nl.rc \ cpl_Pl.rc \ + cpl_Pt.rc \ cpl_Si.rc \ cpl_Sr.rc \ cpl_Sv.rc \ diff --git a/dlls/inetcpl.cpl/cpl_Pt.rc b/dlls/inetcpl.cpl/cpl_Pt.rc new file mode 100644 index 0000000..929cfec --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Pt.rc @@ -0,0 +1,68 @@ +/* + * English resources for the Internet control panel applet + * + * Copyright 2010 Gustavo Henrique Milaré + * + * 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 "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Configurações da Internet" + IDS_CPL_INFO "Configurar o Wine Internet Browser e opções relacionadas" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Geral" +BEGIN + + GROUPBOX " Página inicial ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Escolha o endereço que será usado como página inicial.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "Página &atual", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "Página &padrão", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Página em &branco", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Conteúdo" +BEGIN + + GROUPBOX " Certificados ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certificados são usados para sua identificação pessoal e para identificar certificados de autoridades e editores.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Gustavo Henrique Milaré : shdocvw: Added Portuguese (Brazilian) translation.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 58ff7a48e06589f90f6fa50503362dd76c294214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ff7a48e06589f90f6fa5050… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Nov 11 12:09:58 2010 -0200 shdocvw: Added Portuguese (Brazilian) translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Pt.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index e8d2a29..ab26009 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Pl.rc \ + Pt.rc \ Ro.rc \ Si.rc \ Sr.rc \ diff --git a/dlls/shdocvw/Pt.rc b/dlls/shdocvw/Pt.rc new file mode 100644 index 0000000..9dff39c --- /dev/null +++ b/dlls/shdocvw/Pt.rc @@ -0,0 +1,94 @@ +/* + * Copyright 2010 Gustavo Henrique Milaré + * + * 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_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Abrir URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Especifique a URL que você deseja abrir no Internet Explorer",-1,25, 5, 150,15 + LTEXT "Abrir:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 85, 50, 50, 15 +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Arquivo" + { + POPUP "&Novo" + { + MENUITEM "&Janela" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Abrir...", ID_BROWSE_OPEN + MENUITEM "&Salvar", ID_BROWSE_SAVE + MENUITEM "Salvar &como...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Imprimir &formato...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Imprimir...", ID_BROWSE_PRINT + MENUITEM "&Vizualizar impressão...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propriedades...", ID_BROWSE_PROPERTIES + MENUITEM "&Fechar", ID_BROWSE_QUIT + } + POPUP "&Ver" + { + POPUP "&Ferramentas" + { + MENUITEM "Barra &padrão" ID_BROWSE_BAR_STD + MENUITEM "Barra de &endereço" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoritos" + { + MENUITEM "&Adicionar aos Favoritos..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "A&juda" + { + MENUITEM "&Sobre o Internet Explorer...", ID_BROWSE_ABOUT + } +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_TB_BACK "Voltar" + IDS_TB_FORWARD "Avançar" + IDS_TB_STOP "Parar" + IDS_TB_REFRESH "Atualizar" + IDS_TB_HOME "Início" + IDS_TB_PRINT "Imprimir" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_ADDRESS "Endereço" +}

1 0

Maarten Lankhorst : winegstreamer: Move up gst_segment_init to prevent a theoretical race condition.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: cf085af1268e85f499d071d3963e83b84beec64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf085af1268e85f499d071d39… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:27 2010 +0100 winegstreamer: Move up gst_segment_init to prevent a theoretical race condition. --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1f98a7d..4c9fd74 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -396,9 +396,9 @@ static gboolean event_sink(GstPad *pad, GstEvent *event) { IPin_BeginFlush(pin->pin.pin.pConnectedTo); return 1; case GST_EVENT_FLUSH_STOP: + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.pConnectedTo) IPin_EndFlush(pin->pin.pin.pConnectedTo); - gst_segment_init(pin->segment, GST_FORMAT_TIME); return 1; default: FIXME("%p stub %s\n", event, gst_event_type_get_name(event->type)); @@ -746,12 +746,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS pin->isaud = isaud; pin->isvid = isvid; + gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); FIXME("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); } } @@ -772,9 +772,9 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImp for (x = 0; x < This->cStreams; ++x) { GSTOutPin *pin = This->ppPins[x]; if (!pin->their_src) { + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (gst_pad_link(pad, pin->my_sink) >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); TRACE("Relinked\n"); LeaveCriticalSection(&This->filter.csFilter);

1 0

Maarten Lankhorst : quartz: Start DirectSound renderer as soon as possible.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 64b14c0ecdd13530a92ff636c451523a99253a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b14c0ecdd13530a92ff636c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:28 2010 +0100 quartz: Start DirectSound renderer as soon as possible. Makes directsound switch to silent playback even when no buffers are playing, fixes glitching on starting playback from a stopped buffer. --- dlls/quartz/dsoundrender.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d8dd45b..ca58b98 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -457,6 +457,19 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) ERR("Cannot create Direct Sound object (%x)\n", hr); else hr = IDirectSound_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer *buf; + DSBUFFERDESC buf_desc; + memset(&buf_desc,0,sizeof(DSBUFFERDESC)); + buf_desc.dwSize = sizeof(DSBUFFERDESC); + buf_desc.dwFlags = DSBCAPS_PRIMARYBUFFER; + hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); + IUnknown_Release(buf); + } + hr = S_OK; + } } if (SUCCEEDED(hr))

1 0

Maarten Lankhorst : quartz: Make window behavior of video renderer act more like windows.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 5c3cddf351dd48d175aa5866526579a83574bd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3cddf351dd48d175aa58665… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:29 2010 +0100 quartz: Make window behavior of video renderer act more like windows. --- dlls/quartz/videorenderer.c | 78 ++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1cef40..112289a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -259,6 +259,42 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } +static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { + if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) + { + DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); + DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); + + if (!This->WindowPos.right) + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } + if (!This->WindowPos.bottom) + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } + + AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); + + GetClientRect(This->hWnd, &This->DestRect); + } + else if (!This->init) + This->DestRect = This->WindowPos; + This->init = TRUE; + if (This->AutoShow) + ShowWindow(This->hWnd, SW_SHOW); +} + static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { AM_MEDIA_TYPE amt; @@ -298,41 +334,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - if (!This->init) - { - if (!This->WindowPos.right || !This->WindowPos.top) - { - DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); - - if (!This->WindowPos.right) - { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; - } - if (!This->WindowPos.bottom) - { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; - } - - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); - - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); - SetWindowPos(This->hWnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); - - GetClientRect(This->hWnd, &This->DestRect); - } - else - This->DestRect = This->WindowPos; - This->init = TRUE; - } - hDC = GetDC(This->hWnd); if (!hDC) { @@ -349,8 +350,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->hWnd, hDC); - if (This->AutoShow) - ShowWindow(This->hWnd, SW_SHOW); return S_OK; } @@ -768,6 +767,9 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) SetEvent(This->hEvent); SetEvent(This->blocked); MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + if (This->AutoShow) + /* Black it out */ + RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } LeaveCriticalSection(&This->filter.csFilter); @@ -787,6 +789,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } This->filter.state = State_Paused; @@ -824,6 +827,7 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } SetEvent(This->blocked);

1 0

Maarten Lankhorst : quartz: Handle state changes in direct sound renderer correctly.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 44a17d27bbc99b1a2a4e0f7d14dad4acc74316b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a17d27bbc99b1a2a4e0f7d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 16:01:36 2010 +0100 quartz: Handle state changes in direct sound renderer correctly. Based on a patch from Vladimir Panteleev --- dlls/quartz/dsoundrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ca58b98..759ba07 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -620,6 +620,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { This->pInputPin->end_of_stream = 0; + ResetEvent(This->state_change); } hr = IDirectSoundBuffer_Stop(This->dsbuffer); @@ -627,7 +628,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) This->filter.state = State_Paused; ResetEvent(This->blocked); - ResetEvent(This->state_change); } LeaveCriticalSection(&This->filter.csFilter); @@ -856,6 +856,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) } } MediaSeekingPassThru_EOS(me->seekthru_unk); + SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Maarten Lankhorst : quartz: Fix stub for GetVideoPaletteEntries.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 06ca6fb184dd26a95726f9749c851b85beb4cf96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ca6fb184dd26a95726f9749… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:18 2010 +0100 quartz: Fix stub for GetVideoPaletteEntries. --- dlls/quartz/videorenderer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bf0fa7b..5fbedaf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1413,9 +1413,11 @@ static HRESULT WINAPI Basicvideo_GetVideoPaletteEntries(IBasicVideo *iface, LONG *pPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - FIXME("(%p/%p)->(%d, %d, %p, %p): stub !!!\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); - return S_OK; + if (pRetrieved) + *pRetrieved = 0; + return VFW_E_NO_PALETTE_AVAILABLE; } static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface,

1 0

Maarten Lankhorst : quartz: Reset state change after flushing.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 5dd27f759701bd5b2ebf196f6dc126b6125d2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd27f759701bd5b2ebf196f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:19 2010 +0100 quartz: Reset state change after flushing. This fixes IBasicVideo:GetCurrentImage. --- dlls/quartz/videorenderer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5fbedaf..e1cef40 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -944,8 +944,10 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(This->pin.pCritSec); - if (pVideoRenderer->filter.state == State_Paused) + if (pVideoRenderer->filter.state == State_Paused) { ResetEvent(pVideoRenderer->blocked); + ResetEvent(pVideoRenderer->hEvent); + } QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface);

1 0

Jaime Rave : wined3d: Added Intel GM45 video card detection.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 6bf3f67c018259e1c87189dcef31816023bd2e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf3f67c018259e1c87189dce… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Wed Nov 10 00:32:33 2010 -0500 wined3d: Added Intel GM45 video card detection. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4485491..d1ef660 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1114,7 +1114,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_I915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128} + {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128}, + {HW_VENDOR_INTEL, CARD_INTEL_GM45, "Mobile Intel(R) GM45 Express Chipset Family", DRIVER_INTEL_GMA3000, 512} }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -1692,6 +1693,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + if (strstr(gl_renderer, "GM45")) return CARD_INTEL_GM45; if (strstr(gl_renderer, "X3100") || strstr(gl_renderer, "965GM")) { /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f6c96e..badd3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1410,6 +1410,7 @@ enum wined3d_pci_device CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950? */ CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GM965/GL960 */ + CARD_INTEL_GM45 = 0x2a42, }; struct wined3d_fbo_ops

1 0

Henri Verbeet : wined3d: Take the location into account in context_apply_fbo_state_blit().
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 1fa19d8e4203f920eb29b8a4fb79d32917ce221a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa19d8e4203f920eb29b8a4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:17 2010 +0100 wined3d: Take the location into account in context_apply_fbo_state_blit(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b615a76..32df69b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -504,7 +504,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil, DWORD location) { - if (surface_is_offscreen(render_target)) + if (location != SFLAG_INDRAWABLE || surface_is_offscreen(render_target)) { UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); context->blit_targets[0] = render_target;

1 0