April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : explorer: Implement a global system tray window.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 698805d8c5a65311900c5f387618fd66572f69d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698805d8c5a65311900c5f387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:56:24 2008 +0200 explorer: Implement a global system tray window. --- programs/explorer/systray.c | 433 +++++++++++++++++++++++-------------------- 1 files changed, 229 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=698805d8c5a65311900c5…

1 0

Maarten Lankhorst : quartz: Make mpeg splitter keep track of play position and keep last sample if sending was not successful .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 4bc4457109075bd25ab8a5bd4dc8101636074f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc4457109075bd25ab8a5bd4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 16:11:36 2008 -0700 quartz: Make mpeg splitter keep track of play position and keep last sample if sending was not successful. This fixes data discontinuities that earlier occured after a stop/pause command or the downright rejection of a sample (S_FALSE). --- dlls/quartz/mpegsplit.c | 121 ++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 59 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index fcd0a5c..a9632c3 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -136,7 +136,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; if (!bitrate || layer != 3) { - ERR("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); + FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; } @@ -189,6 +189,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed HRESULT hr = S_OK; DWORD dlen; LONGLONG time = This->position, sampleduration = 0; + DWORD extrasamples = 2; TRACE("Source length: %u, skip length: %u, remaining: %u\n", *flen, This->skipbytes, This->remaining_bytes); @@ -307,8 +308,11 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed out_append: /* Optimize: Send multiple samples! */ - while (*flen >= 4) + while (extrasamples--) { + if (*flen < 4) + break; + if (FAILED(parse_header(*fbuf, &length, &sampleduration))) break; @@ -324,24 +328,19 @@ out_append: } TRACE("Media time: %u.%03u\n", (DWORD)(This->position/10000000), (DWORD)((This->position/10000)%1000)); - IMediaSample_AddRef(pCurrentSample); - LeaveCriticalSection(&This->Parser.csFilter); - hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); - EnterCriticalSection(&This->Parser.csFilter); - IMediaSample_Release(pCurrentSample); - - if (FAILED(hr)) + if (hr != S_OK) { - WARN("Error sending sample (%x)\n", hr); + if (hr != S_FALSE) + TRACE("Error sending sample (%x)\n", hr); + else + TRACE("S_FALSE (%d), holding\n", IMediaSample_GetActualDataLength(This->pCurrentSample)); return hr; } - if (This->pCurrentSample) - { - IMediaSample_Release(pCurrentSample); - This->pCurrentSample = NULL; - } + + IMediaSample_Release(pCurrentSample); + This->pCurrentSample = NULL; return hr; } @@ -367,7 +366,27 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) /* trace removed for performance reasons */ /* TRACE("(%p), %llu -> %llu\n", pSample, tStart, tStop); */ - EnterCriticalSection(&This->Parser.csFilter); + /* Try to get rid of current sample, if any */ + if (This->pCurrentSample && !This->skipbytes && !This->remaining_bytes && IMediaSample_GetActualDataLength(This->pCurrentSample) > 4) + { + Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; + IMediaSample *pCurrentSample = This->pCurrentSample; + HRESULT hr; + + /* Unset advancement */ + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream); + + hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); + + if (hr != S_OK) + return hr; + + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(cbSrcStream); + } + /* Now, try to find a new header */ while (cbSrcStream > 0) { @@ -375,7 +394,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) { if (FAILED(hr = OutputPin_GetDeliveryBuffer(&pOutputPin->pin, &This->pCurrentSample, NULL, NULL, 0))) { - FIXME("Failed with hres: %08x!\n", hr); + TRACE("Failed with hres: %08x!\n", hr); break; } @@ -387,14 +406,17 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) This->seek = FALSE; } hr = FillBuffer(This, &pbSrcStream, &cbSrcStream, This->pCurrentSample); - if (SUCCEEDED(hr) && hr != S_FALSE) + if (hr == S_OK) continue; + /* We still have our sample! Do damage control and send it next round */ fail: if (hr != S_FALSE) - FIXME("Failed with hres: %08x!\n", hr); + WARN("Failed with hres: %08x!\n", hr); This->skipbytes += This->remaining_bytes; This->remaining_bytes = 0; + + This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream); if (This->pCurrentSample) { IMediaSample_SetActualDataLength(This->pCurrentSample, 0); @@ -410,20 +432,9 @@ fail: TRACE("End of file reached\n"); - if (This->pCurrentSample) - { - /* Drop last data, it's likely to be garbage anyway */ - IMediaSample_SetActualDataLength(This->pCurrentSample, 0); - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - for (i = 0; i < This->Parser.cStreams; i++) { IPin* ppin; - HRESULT hr; - - TRACE("Send End Of Stream to output pin %d\n", i); hr = IPin_ConnectedTo(This->Parser.ppPins[i+1], &ppin); if (SUCCEEDED(hr)) @@ -439,7 +450,6 @@ fail: hr = S_FALSE; } - LeaveCriticalSection(&This->Parser.csFilter); return hr; } @@ -636,7 +646,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) if (FAILED(hr)) return hr; pos -= 4; - This->header_bytes = This->skipbytes = pos; + This->header_bytes = pos; + This->skipbytes = 0; switch(streamtype) { @@ -673,6 +684,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) break; if (!strncmp((char*)header+4, "TAG", 3)) This->EndOfFile -= 128; + This->Parser.pInputPin->rtStop = MEDIATIME_FROM_BYTES(This->EndOfFile); + This->Parser.pInputPin->rtStart = This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(This->header_bytes); /* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole readup on audio headers */ while (pos + 3 < This->EndOfFile) @@ -720,20 +733,13 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) { MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; - TRACE("(%p)->()\n", This); + TRACE("(%p) Deleting sample\n", This); if (This->pCurrentSample) IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; - if (This->Parser.pInputPin && !This->seek) - { - This->skipbytes += This->remaining_bytes; - This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(This->skipbytes); - } - if (!This->seek) - This->skipbytes = This->remaining_bytes = 0; - + This->remaining_bytes = This->skipbytes = 0; return S_OK; } @@ -754,18 +760,17 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) if (newpos > This->duration) { - FIXME("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); + WARN("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); return E_INVALIDARG; } if (This->position/1000000 == newpos/1000000) { - FIXME("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); + TRACE("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); return S_OK; } hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); - while (bytepos < This->EndOfFile && SUCCEEDED(hr)) { LONGLONG length = 0; @@ -783,35 +788,33 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) if (timepos >= newpos) break; } + if (SUCCEEDED(hr)) { - FILTER_STATE state; PullPin *pin = This->Parser.pInputPin; + IPin *victim = NULL; - TRACE("Moving sound to %x%08x bytes!\n", (DWORD)(bytepos>>32), (DWORD)bytepos); + TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); IPin_BeginFlush((IPin *)pin); - IPin_NewSegment((IPin*)pin, newpos, This->duration, pin->dRate); - IPin_EndFlush((IPin *)pin); - /* Make sure this is done while stopped */ + /* Make sure this is done while stopped, BeginFlush takes care of this */ EnterCriticalSection(&This->Parser.csFilter); + IPin_ConnectedTo(This->Parser.ppPins[1], &victim); + if (victim) + { + IPin_NewSegment(victim, newpos, This->duration, pin->dRate); + IPin_Release(victim); + } + pin->rtStart = pin->rtCurrent = MEDIATIME_FROM_BYTES(bytepos); pin->rtStop = MEDIATIME_FROM_BYTES((REFERENCE_TIME)This->EndOfFile); This->seek = TRUE; - This->skipbytes = This->remaining_bytes = 0; This->position = newpos; - if (This->pCurrentSample) - { - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - state = This->Parser.state; LeaveCriticalSection(&This->Parser.csFilter); - if (state == State_Running && pin->state == State_Paused) - PullPin_StartProcessing(pin); - + TRACE("Done flushing\n"); + IPin_EndFlush((IPin *)pin); } return hr; }

1 0

Maarten Lankhorst : quartz: Try creating the file reader from the filter source first before falling back to the generic async file reader .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 0117468754bdf53266b6ea752a44528abb744c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0117468754bdf53266b6ea752… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:28:15 2008 -0700 quartz: Try creating the file reader from the filter source first before falling back to the generic async file reader. --- dlls/quartz/filtergraph.c | 69 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1c0acc7..91b872d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -29,6 +29,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" +#include "shlwapi.h" #include "dshow.h" #include "wine/debug.h" #include "quartz_private.h" @@ -1199,6 +1201,63 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, return hr; } +/* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ +static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) +{ + static const WCHAR wszReg[] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s',0}; + HRESULT hr = S_OK; + HKEY extkey; + LONG lRet; + + lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszReg, 0, KEY_READ, &extkey); + hr = HRESULT_FROM_WIN32(lRet); + + if (SUCCEEDED(hr)) + { + static const WCHAR filtersource[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; + WCHAR *ext = PathFindExtensionW(pszFileName); + WCHAR clsid_key[39]; + GUID clsid; + DWORD size = sizeof(clsid_key); + HKEY pathkey; + + if (!ext) + { + CloseHandle(extkey); + return E_FAIL; + } + + lRet = RegOpenKeyExW(extkey, ext, 0, KEY_READ, &pathkey); + hr = HRESULT_FROM_WIN32(lRet); + CloseHandle(extkey); + if (FAILED(hr)) + return hr; + + lRet = RegQueryValueExW(pathkey, filtersource, NULL, NULL, (LPBYTE)clsid_key, &size); + hr = HRESULT_FROM_WIN32(lRet); + CloseHandle(pathkey); + if (FAILED(hr)) + return hr; + + CLSIDFromString(clsid_key, &clsid); + + TRACE("CLSID: %s\n", debugstr_guid(&clsid)); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + if (SUCCEEDED(hr)) + { + IFileSourceFilter *source = NULL; + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); + if (SUCCEEDED(hr)) + IFileSourceFilter_Release(source); + else + IBaseFilter_Release(*filter); + } + } + if (FAILED(hr)) + *filter = NULL; + return hr; +} + static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, @@ -1212,8 +1271,11 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); - /* Instantiate a file source filter */ - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); + /* Try from file name first, then fall back to default asynchronous reader */ + hr = GetFileSourceFilter(lpcwstrFileName, &preader); + + if (FAILED(hr)) + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { ERR("Unable to create file source filter (%x)\n", hr); return hr; @@ -1238,12 +1300,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, ERR("Load (%x)\n", hr); goto error; } - + IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { ERR("GetCurFile (%x)\n", hr); goto error; } + TRACE("File %s\n", debugstr_w(filename)); TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); TRACE("SubType %s\n", debugstr_guid(&mt.subtype));

1 0

Maarten Lankhorst : quartz: Drop packets in the transform filter if in the wrong state.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 8939a41563608585dbbfa0e76ce95237e93c3419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8939a41563608585dbbfa0e76… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:28:47 2008 -0700 quartz: Drop packets in the transform filter if in the wrong state. --- dlls/quartz/transform.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 85962d1..dbb84a7 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -54,6 +54,12 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + if (This->state == State_Paused) + return S_FALSE; + + if (This->state == State_Stopped) + return VFW_E_WRONG_STATE; + return This->pFuncsTable->pfnProcessSampleData(This, pSample); }

1 0

Alexandre Julliard : winex11: Move all the embedded systray window support to winex11.drv.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 52246fb92124620a7c57d897f44a78dfa92b6246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52246fb92124620a7c57d897f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:47:36 2008 +0200 winex11: Move all the embedded systray window support to winex11.drv. --- dlls/winex11.drv/Makefile.in | 2 + dlls/winex11.drv/systray.c | 439 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 90 -------- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 2 - programs/explorer/systray.c | 18 +- 7 files changed, 454 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52246fb92124620a7c57d…

1 0

Alexandre Julliard : winex11: Make the system tray window transparent.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 498a7628c95a80896c46c57562f6fb2b6dbeb80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=498a7628c95a80896c46c5756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:51:22 2008 +0200 winex11: Make the system tray window transparent. --- dlls/winex11.drv/systray.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 9deb003..6b967ff 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -223,6 +223,7 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) Display *display = thread_display(); struct x11drv_win_data *data; XEvent ev; + XSetWindowAttributes attr; unsigned long info[2]; if (!(data = X11DRV_get_win_data( hwnd )) && @@ -252,6 +253,10 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) ev.xclient.data.l[3] = 0; ev.xclient.data.l[4] = 0; XSendEvent( display, systray_window, False, NoEventMask, &ev ); + attr.background_pixmap = ParentRelative; + attr.bit_gravity = ForgetGravity; + XChangeWindowAttributes( display, data->whole_window, CWBackPixmap | CWBitGravity, &attr ); + XChangeWindowAttributes( display, data->client_window, CWBackPixmap | CWBitGravity, &attr ); wine_tsx11_unlock(); data->mapped = TRUE; @@ -295,7 +300,6 @@ static BOOL show_icon( struct tray_icon *icon ) class.lpfnWndProc = tray_wndproc; class.hCursor = LoadCursorW( 0, (LPCWSTR)IDC_ARROW ); class.lpszClassName = tray_classname; - class.hbrBackground = (HBRUSH)COLOR_WINDOW; class.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; if (!RegisterClassExW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) @@ -344,7 +348,10 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) icon->image = CopyIcon(nid->hIcon); if (!icon->hidden) - RedrawWindow(icon->window, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); + { + struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); + if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + } } if (nid->uFlags & NIF_MESSAGE)

1 0

Alexandre Julliard : winex11: Add a timer to detect when a systray owner has been destroyed.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 49f467c339497cdf1d81d30b99263f9adcebe15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f467c339497cdf1d81d30b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:56:09 2008 +0200 winex11: Add a timer to detect when a systray owner has been destroyed. --- dlls/winex11.drv/systray.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 6b967ff..347e5a7 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -185,6 +185,10 @@ static LRESULT WINAPI tray_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } break; + case WM_TIMER: + if (!IsWindow( icon->owner )) delete_icon( icon ); + return 0; + default: return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -323,6 +327,7 @@ static BOOL show_icon( struct tray_icon *icon ) NULL, NULL, NULL, icon ); create_tooltip( icon ); dock_systray_window( icon->window, systray_window ); + SetTimer( icon->window, 1, 1000, NULL ); ShowWindow( icon->window, SW_SHOWNA ); icon->hidden = FALSE; return TRUE;

1 0

Huw Davies : gdi32: Don' t overrun the current scanline while copying a glyph's bitmap.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a643337c266c64bd55ec32bed74703409a629a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a643337c266c64bd55ec32bed… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 8 12:19:31 2008 +0100 gdi32: Don't overrun the current scanline while copying a glyph's bitmap. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b00bc71..aeb9c7d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4384,7 +4384,12 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, INT x; while(h--) { for(x = 0; x < pitch; x++) - dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + { + if(x < ft_face->glyph->bitmap.width) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + else + dst[x] = 0; + } src += ft_face->glyph->bitmap.pitch; dst += pitch; }

1 0

Alexander Dorofeyev : wined3d: Set isInDraw later in drawPrimitive.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 7c8b8e0a9319c53eb0602c0e5ab12da0b83b9ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8b8e0a9319c53eb0602c0e5… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Apr 8 00:42:39 2008 +0300 wined3d: Set isInDraw later in drawPrimitive. This should fix the problem that in LoadLocation SFLAG_INTEXTURE path gl calls can be made without activating context, due to isInDraw checks. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 37482fb..77b396a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -986,9 +986,6 @@ void drawPrimitive(IWineD3DDevice *iface, if (NumPrimitives == 0) return; - /* Signals other modules that a drawing is in progress and the stateblock finalized */ - This->isInDraw = TRUE; - /* Invalidate the back buffer memory so LockRect will read it the next time */ for(i = 0; i < GL_LIMITS(buffers); i++) { target = (IWineD3DSurfaceImpl *) This->render_targets[i]; @@ -1032,6 +1029,9 @@ void drawPrimitive(IWineD3DDevice *iface, } } + /* Signals other modules that a drawing is in progress and the stateblock finalized */ + This->isInDraw = TRUE; + /* Ok, we will be updating the screen from here onwards so grab the lock */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) {

1 0

Michael Stefaniuc : msacm32: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: e7311f0aa455d0e1dfbde225dbfa0916443b56c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7311f0aa455d0e1dfbde225d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:09:26 2008 +0200 msacm32: Add the Romanian translation. --- dlls/msacm32/msacm.rc | 1 + dlls/msacm32/msacm_Ro.rc | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc index 0fa0157..6e55fb1 100644 --- a/dlls/msacm32/msacm.rc +++ b/dlls/msacm32/msacm.rc @@ -36,6 +36,7 @@ #include "msacm_No.rc" #include "msacm_Pl.rc" #include "msacm_Pt.rc" +#include "msacm_Ro.rc" #include "msacm_Ru.rc" #include "msacm_Si.rc" #include "msacm_Sv.rc" diff --git a/dlls/msacm32/msacm_Ro.rc b/dlls/msacm32/msacm_Ro.rc new file mode 100644 index 0000000..d1cc0bb --- /dev/null +++ b/dlls/msacm32/msacm_Ro.rc @@ -0,0 +1,54 @@ +/* + * Copyright 2000 Eric Pouech + * Copyright 2008 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound Selection" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Nume:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Salvează ca", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Elimină", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Atribute:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Renunță", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +#pragma code_page(default)

1 0