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

Christian Costa : dmsynth: Add stubbed IKsControl interface to DirectMusicSynth object.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 1f3d99a2e4cb2a0c512744465a1b6bbd983f0c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3d99a2e4cb2a0c512744465… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 23:05:51 2012 +0200 dmsynth: Add stubbed IKsControl interface to DirectMusicSynth object. --- dlls/dmsynth/dmsynth_private.h | 18 +++++---- dlls/dmsynth/synth.c | 76 +++++++++++++++++++++++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 2 +- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aec547a..86606bb 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -39,6 +39,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmksctrl.h" /***************************************************************************** * Interfaces @@ -56,15 +57,16 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LP * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ - IDirectMusicSynth8 IDirectMusicSynth8_iface; - LONG ref; - - /* IDirectMusicSynth8 fields */ - DMUS_PORTCAPS pCaps; - BOOL fActive; - IReferenceClock* pLatencyClock; - IDirectMusicSynthSinkImpl* pSynthSink; + /* IUnknown fields */ + IDirectMusicSynth8 IDirectMusicSynth8_iface; + IKsControl IKsControl_iface; + LONG ref; + + /* IDirectMusicSynth8 fields */ + DMUS_PORTCAPS pCaps; + BOOL fActive; + IReferenceClock* pLatencyClock; + IDirectMusicSynthSinkImpl* pSynthSink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index aadb72f..9c088af 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1,4 +1,5 @@ -/* IDirectMusicSynth8 Implementation +/* + * IDirectMusicSynth8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -17,6 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "objbase.h" +#include "initguid.h" +#include "dmksctrl.h" + #include "dmsynth_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); @@ -40,6 +47,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 *ppobj = This; return S_OK; } + else if (IsEqualIID(riid, &IID_IKsControl)) { + IUnknown_AddRef(iface); + *ppobj = &This->IKsControl_iface; + return S_OK; + } + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); return E_NOINTERFACE; } @@ -324,6 +337,66 @@ static const IDirectMusicSynth8Vtbl DirectMusicSynth8_Vtbl = { IDirectMusicSynth8Impl_AssignChannelToBuses }; +static inline IDirectMusicSynth8Impl *impl_from_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSynth8Impl, IKsControl_iface); +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_QueryInterface(&This->IDirectMusicSynth8_iface, riid, ppobj); +} + +static ULONG WINAPI DMSynthImpl_IKsControl_AddRef(IKsControl* iface) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_AddRef(&This->IDirectMusicSynth8_iface); +} + +static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface) +{ + IDirectMusicSynth8Impl *This = impl_from_IKsControl(iface); + + return IDirectMusicSynth8Impl_Release(&This->IDirectMusicSynth8_iface); +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DMSynthImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + + +static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { + DMSynthImpl_IKsControl_QueryInterface, + DMSynthImpl_IKsControl_AddRef, + DMSynthImpl_IKsControl_Release, + DMSynthImpl_IKsControl_KsProperty, + DMSynthImpl_IKsControl_KsMethod, + DMSynthImpl_IKsControl_KsEvent +}; + /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { @@ -336,6 +409,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj return E_OUTOFMEMORY; } obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; obj->ref = 0; /* fill in caps */ obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 66da1fb..3a53900 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -51,7 +51,7 @@ static void test_dmsynth(void) ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); - todo_wine ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); + ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); todo_wine ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr);

1 0

Dylan Smith : richedit: Remove always FALSE parameter from ME_PaintContent.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 18fa3287f647ea1e123641ee04447a7132c6a7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fa3287f647ea1e123641ee0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 7 22:11:55 2012 -0400 richedit: Remove always FALSE parameter from ME_PaintContent. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 28 ++++++++-------------------- dlls/riched20/wrap.c | 1 + 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f3764df..e61aac4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4463,7 +4463,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, FALSE, &ps.rcPaint); + ME_PaintContent(editor, hDC, &ps.rcPaint); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8cded51..7a56b1a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -207,7 +207,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; /* paint.c */ -void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) DECLSPEC_HIDDEN; +void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e1f838e..18b2da4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); -void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate) +void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { ME_DisplayItem *item; ME_Context c; @@ -71,17 +71,14 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * ys -= item->member.para.pCell->member.cell.yTextOffset; } - if (!bOnlyNew || (item->member.para.nFlags & MEPF_REPAINT)) + /* Draw the paragraph if any of the paragraph is in the update region. */ + if (ys < rcUpdate->bottom && ye > rcUpdate->top) { - /* Draw the paragraph if any of the paragraph is in the update region. */ - if (ys < rcUpdate->bottom && ye > rcUpdate->top) - { - ME_DrawParagraph(&c, item); - /* Clear the repaint flag if the whole paragraph is in the - * update region. */ - if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) - item->member.para.nFlags &= ~MEPF_REPAINT; - } + ME_DrawParagraph(&c, item); + /* Clear the repaint flag if the whole paragraph is in the + * update region. */ + if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) + item->member.para.nFlags &= ~MEPF_REPAINT; } item = item->member.para.next_para; } @@ -94,15 +91,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * rc.bottom = c.rcView.bottom; rc.right = c.rcView.right; - if (bOnlyNew) - { - /* Only erase region drawn from previous call to ME_PaintContent */ - if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.pt.y + editor->nLastTotalLength; - else - SetRectEmpty(&rc); - } - IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cca2cb1..2d19119 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -753,6 +753,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) + item->member.para.nHeight - ofs, c.rcView.bottom); ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); + item->member.para.nFlags &= ~MEPF_REPAINT; } item = item->member.para.next_para; }

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: c4b404c7afbcff1fb2bbf8257dcbef75d1a4942b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b404c7afbcff1fb2bbf8257… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 7 11:13:09 2012 +0900 po: Update Korean translation. --- po/ko.po | 55 ++++++++++++------------------------------------------- 1 files changed, 12 insertions(+), 43 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0607251..aeb56f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6627,37 +6627,6 @@ msgid "insert disk %s" msgstr "디스크 %s 삽입" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6689,27 +6658,27 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" +"윈도우즈 설치 프로그램 %s\n" "\n" "사용법:\n" "msiexec 명령 {필수 매개변수} [선택적 매개변수]\n" "\n" "제품 설치:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" +"\t/i {패키지|제품코드} [속성}\n" +"\t/package {패키지|제품코드} [속성]\n" +"\t/a package [속성]\n" "설치 복구:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" +"\t/f[p|o|e|d|c|a|u|m|s|v] {패키지|제품코드}\n" "제품 제거:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" +"\t/uninstall {제품|제품코드} [속성]\n" +"\t/x {제품|제품코드} [속성]\n" "제품 알리기:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" +"\t/j[u|m] 패키지 [/t 변환] [/g 언어아이디]\n" "패치 추가:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"위의 명령어를 위한 Log 와 UI 한정자:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" +"\t/p 패치할 패키지 [속성]\n" +"\t/p 패치할 패키지 /a 패키지 [속성]\n" +"위의 명령어를 위한 사용자 인터페이스 한정자:\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 로그파일\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "MSI 서비스 등록:\n" "\t/y\n"

1 0

Dmitry Timoshkov : winex11.drv: Use XK_KP_Decimal as a fallback if XK_KP_Separator doesn't work.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 8ed11d8bb11e60c4dcb113564b4457da809db5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed11d8bb11e60c4dcb113564… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 13:12:17 2012 +0900 winex11.drv: Use XK_KP_Decimal as a fallback if XK_KP_Separator doesn't work. --- dlls/winex11.drv/keyboard.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 090eae4..7e49ffb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2220,7 +2220,11 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) * in order to produce a locale dependent numeric separator. */ if (wCode == VK_DECIMAL || wCode == VK_SEPARATOR) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + { + e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + if (!e.keycode) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + } if (!e.keycode) { @@ -2558,7 +2562,11 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState * in order to produce a locale dependent numeric separator. */ if (virtKey == VK_DECIMAL || virtKey == VK_SEPARATOR) + { e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + if (!e.keycode) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + } if (!e.keycode && virtKey != VK_NONAME) {

1 0

Christian Costa : dmusic: COM cleanup of IDirectMusicInstrument and get rid of separated IUnknown interface .
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 03c75b9cf652146a44c35d0c4de79bc76629ee80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c75b9cf652146a44c35d0c4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 4 20:51:30 2012 +0200 dmusic: COM cleanup of IDirectMusicInstrument and get rid of separated IUnknown interface. --- dlls/dmusic/collection.c | 4 +- dlls/dmusic/dmusic_private.h | 8 ++- dlls/dmusic/instrument.c | 136 +++++++++++++++++++---------------------- 3 files changed, 71 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03c75b9cf652146a44c35…

1 0

Alexandre Julliard : gdi32: Add a priority mechanism for pushing drivers on the stack in a defined order .
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: e94d3b4e0897d6c744595941bcfd724bdd47d3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d3b4e0897d6c744595941b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:16:05 2012 +0200 gdi32: Add a priority mechanism for pushing drivers on the stack in a defined order. --- dlls/gdi32/bitmap.c | 15 ++++----------- dlls/gdi32/dc.c | 3 ++- dlls/gdi32/dib.c | 7 ++----- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 2 ++ dlls/gdi32/enhmfdrv/init.c | 15 ++++++++++++++- dlls/gdi32/freetype.c | 14 +++++++++++++- dlls/gdi32/gdi_private.h | 9 +++++++++ dlls/gdi32/mfdrv/init.c | 15 ++++++++++++++- dlls/gdi32/path.c | 18 ++++++++++++++---- dlls/wineps.drv/init.c | 14 +++++++++++++- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 14 +++++++++++++- include/wine/gdi_driver.h | 21 +++++++++++---------- 14 files changed, 114 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e94d3b4e0897d6c744595…

1 0

Alexandre Julliard : gdi32: Allow a driver to implement SelectBitmap but not CreateBitmap.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: eb80e6f2dbf89cb15c2b9086af55714a54cf6c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb80e6f2dbf89cb15c2b9086a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 14:32:23 2012 +0200 gdi32: Allow a driver to implement SelectBitmap but not CreateBitmap. --- dlls/gdi32/bitmap.c | 73 +++++++++++++++++--------------------------------- 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index acb0575..bcc2932 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -493,49 +493,6 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) } } -/*********************************************************************** - * BITMAP_SetOwnerDC - * - * Set the type of DC that owns the bitmap. This is used when the - * bitmap is selected into a device to initialize the bitmap function - * table. - */ -static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) -{ - BITMAPOBJ *bitmap; - BOOL ret = TRUE; - - /* never set the owner of the stock bitmap since it can be selected in multiple DCs */ - if (hbitmap == GetStockObject(DEFAULT_BITMAP)) return TRUE; - - if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return FALSE; - - if (bitmap->funcs != physdev->funcs) - { - /* we can only change from the null driver to some other driver */ - if (bitmap->funcs == &null_driver) - { - if (physdev->funcs->pCreateBitmap) - { - ret = physdev->funcs->pCreateBitmap( physdev, hbitmap ); - if (ret) - { - bitmap->funcs = physdev->funcs; - set_initial_bitmap_bits( hbitmap, bitmap ); - } - } - else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ - } - else - { - FIXME( "Trying to select bitmap %p in different DC type\n", hbitmap ); - ret = FALSE; - } - } - GDI_ReleaseObj( hbitmap ); - return ret; -} - /*********************************************************************** * BITMAP_SelectObject @@ -545,7 +502,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret; BITMAPOBJ *bitmap; DC *dc; - PHYSDEV physdev = NULL, old_physdev = NULL; + PHYSDEV physdev = NULL, old_physdev = NULL, createdev; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -574,6 +531,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if (dc->dibdrv) old_physdev = pop_dc_driver( dc, dc->dibdrv ); physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + createdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (physdev->funcs == &null_driver) { physdev = dc->dibdrv; @@ -585,12 +543,31 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) } } - if (!BITMAP_SetOwnerDC( handle, physdev )) + /* never set the owner of the stock bitmap since it can be selected in multiple DCs */ + if (handle != GetStockObject(DEFAULT_BITMAP) && bitmap->funcs != createdev->funcs) { - GDI_ReleaseObj( handle ); - ret = 0; - goto done; + /* we can only change from the null driver to some other driver */ + if (bitmap->funcs != &null_driver) + { + FIXME( "Trying to select bitmap %p in different DC type\n", handle ); + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + if (createdev->funcs != &null_driver) + { + if (!createdev->funcs->pCreateBitmap( createdev, handle )) + { + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + bitmap->funcs = createdev->funcs; + set_initial_bitmap_bits( handle, bitmap ); + } + else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ } + if (!physdev->funcs->pSelectBitmap( physdev, handle )) { GDI_ReleaseObj( handle );

1 0

Alexandre Julliard : winex11: Add an OpenGL GDI driver.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 5f99b59e77c94ac861a6f5e5bd56f975c30fe2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f99b59e77c94ac861a6f5e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:18:54 2012 +0200 winex11: Add an OpenGL GDI driver. --- dlls/winex11.drv/init.c | 109 ++++++++- dlls/winex11.drv/opengl.c | 473 +++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 24 +-- dlls/winex11.drv/x11drv_main.c | 1 - 4 files changed, 350 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f99b59e77c94ac861a6f…

1 0

Alexandre Julliard : winex11: Implement wglGetPbufferDCARB with a DC escape and remove it from the GDI driver interface .
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 147174ff1ca864a3d275d12290aac4c427b5140d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147174ff1ca864a3d275d1229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:35:13 2012 +0200 winex11: Implement wglGetPbufferDCARB with a DC escape and remove it from the GDI driver interface. --- dlls/gdi32/dibdrv/dc.c | 10 ---------- dlls/gdi32/driver.c | 6 ------ dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/opengl.c | 30 ------------------------------ dlls/gdi32/path.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 10 ---------- dlls/winex11.drv/opengl.c | 38 ++++++++++++++++++++------------------ dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 12 files changed, 21 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147174ff1ca864a3d275d…

1 0

Alexandre Julliard : winex11: Store the GL-specific information in the GL driver physdev.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 791a46658a3e31aa6408faaeb6f797d6b2fe53de URL: http://source.winehq.org/git/wine.git/?a=commit;h=791a46658a3e31aa6408faaeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 14:03:56 2012 +0200 winex11: Store the GL-specific information in the GL driver physdev. --- dlls/winex11.drv/bitmap.c | 1 - dlls/winex11.drv/init.c | 14 +-- dlls/winex11.drv/opengl.c | 243 +++++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 6 - 4 files changed, 148 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=791a46658a3e31aa6408f…

1 0