wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Charles Davis : ntdll: Implement CDROM_ReadQChannel() on Mac OS.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: c7992a8d260e0ce4073f85988c81b5c09a8c127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7992a8d260e0ce4073f85988… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 12 13:15:35 2009 -0600 ntdll: Implement CDROM_ReadQChannel() on Mac OS. --- dlls/ntdll/cdrom.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 574f737..8e334df 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1007,6 +1007,37 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); +#elif defined(__APPLE__) + SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; + int io = 0; + union + { + dk_cd_read_mcn_t mcn; + dk_cd_read_isrc_t isrc; + } ioc; + /* We need IOCDAudioControl for IOCTL_CDROM_CURRENT_POSITION */ + if (fmt->Format == IOCTL_CDROM_CURRENT_POSITION) + { + ERR("This version of Mac OS X does not support IOCDAudioControl\n"); + return STATUS_NOT_SUPPORTED; + } + /* No IOCDAudioControl support; just set the audio status to none */ + hdr->AudioStatus = AUDIO_STATUS_NO_STATUS; + switch(fmt->Format) + { + case IOCTL_CDROM_MEDIA_CATALOG: + if ((io = ioctl(fd, DKIOCCDREADMCN, &ioc.mcn)) == -1) break; + memcpy(data->MediaCatalog.MediaCatalog, ioc.mcn.mcn, kCDMCNMaxLength); + data->MediaCatalog.Mcval = 1; + break; + case IOCTL_CDROM_TRACK_ISRC: + ioc.isrc.track = fmt->Track; + if ((io = ioctl(fd, DKIOCCDREADISRC, &ioc.isrc)) == -1) break; + memcpy(data->TrackIsrc.TrackIsrc, ioc.isrc.isrc, kCDISRCMaxLength); + data->TrackIsrc.Tcval = 1; + data->TrackIsrc.Track = ioc.isrc.track; + } + ret = CDROM_GetStatusCode(io); #endif return ret; }

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_TAB in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 12a417de8abcb678ef3fecb783b07027e0bd8cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a417de8abcb678ef3fecb78… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 23:16:08 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_TAB in the dialog mode. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d978ac5..b5ad21c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2293,6 +2293,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); return TRUE; + case VK_TAB: + if (editor->bDialogMode && editor->hwndParent) + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, shift_is_down, 0); + return TRUE; case 'A': if (ctrl_is_down) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 93f0041..70c100a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6816,6 +6816,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 1, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + DestroyWindow(hwRichEdit); /* Check messages from richedit(ES_MULTILINE) */ @@ -6836,6 +6841,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6853,6 +6863,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6886,6 +6901,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6903,6 +6923,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6933,6 +6958,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8b == r, "expected 0x8b, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6947,6 +6977,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 0, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 1); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError());

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_ESCAPE in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: a50ca4ace0942cb8e251040c02513c870a687dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50ca4ace0942cb8e251040c0… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 22:50:50 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_ESCAPE in the dialog mode. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c49bb5d..d978ac5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2289,6 +2289,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; } break; + case VK_ESCAPE: + if (editor->bDialogMode && editor->hwndParent) + PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); + return TRUE; case 'A': if (ctrl_is_down) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 154b297..93f0041 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6831,6 +6831,11 @@ static void test_dialogmode(void) ok(2 == lcount, "expected 2, got %d\n", lcount); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6843,6 +6848,11 @@ static void test_dialogmode(void) lcount = SendMessage(hwRichEdit, EM_GETLINECOUNT, 0, 0); ok(2 == lcount, "expected 2, got %d\n", lcount); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6871,6 +6881,11 @@ static void test_dialogmode(void) ok(2 == lcount, "expected 2, got %d\n", lcount); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8f == r, "expected 0x8f, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6883,6 +6898,11 @@ static void test_dialogmode(void) lcount = SendMessage(hwRichEdit, EM_GETLINECOUNT, 0, 0); ok(3 == lcount, "expected 3, got %d\n", lcount); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); @@ -6908,6 +6928,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0); memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + + memset(&dm_messages, 0, sizeof(dm_messages)); r = SendMessage(hwRichEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); ok(0x8b == r, "expected 0x8b, got 0x%x\n", r); test_dm_messages(0, 0, 0); @@ -6917,6 +6942,11 @@ static void test_dialogmode(void) ok(0 == r, "expected 0, got %d\n", r); test_dm_messages(0, 1, 0); + memset(&dm_messages, 0, sizeof(dm_messages)); + r = SendMessage(hwRichEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(0 == r, "expected 0, got %d\n", r); + test_dm_messages(0, 0, 0); + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, 100, 100, 50, 20, hwParent, (HMENU)ID_RICHEDITTESTDBUTTON, GetModuleHandleA(0), NULL); ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError());

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_RETURN in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 8fb119ba8b03fb86ca62f2797fe1f6eec8bbb83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb119ba8b03fb86ca62f2797… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 22:48:44 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_RETURN in the dialog mode. --- dlls/riched20/editor.c | 25 ++++ dlls/riched20/tests/editor.c | 262 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fb119ba8b03fb86ca62f…

1 0

Sergey Khodych : riched20: Enable the dialog mode after receiving WM_GETDLGCODE message.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 851c33ddd909f83eaa183e989aff48d034a4ef18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851c33ddd909f83eaa183e989… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 21:41:48 2009 +0300 riched20: Enable the dialog mode after receiving WM_GETDLGCODE message. --- dlls/riched20/editor.c | 3 +++ dlls/riched20/editstr.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 11d4925..9f56761 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2665,6 +2665,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->mode |= (props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; + ed->bDialogMode = FALSE; ed->bMouseCaptured = FALSE; for (i=0; i<HFONT_CACHE_SIZE; i++) { @@ -3008,6 +3009,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETDLGCODE: { UINT code = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + if (lParam) + editor->bDialogMode = TRUE; if (editor->styleFlags & ES_MULTILINE) code |= DLGC_WANTMESSAGE; return code; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 115662c..9b8d645 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -370,6 +370,7 @@ typedef struct tagME_TextEditor BOOL AutoURLDetect_bEnable; WCHAR cPasswordMask; BOOL bHaveFocus; + BOOL bDialogMode; /* Indicates that we are inside a dialog window */ /*for IME */ int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */

1 0

Sergey Khodych : riched20: Cache ES_WANTRETURN style.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 205df00c6465ac6183355b1d264ec86214bb7839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205df00c6465ac6183355b1d2… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 21:16:25 2009 +0300 riched20: Cache ES_WANTRETURN style. --- dlls/riched20/txthost.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 950d200..68f4437 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -59,6 +59,7 @@ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion1 editor = ME_MakeEditor((ITextHost*)texthost, bEmulateVersion10); editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); + editor->styleFlags |= GetWindowLongW(hwnd, GWL_STYLE) & ES_WANTRETURN; editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ editor->hwndParent = cs->hwndParent; SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor);

1 0

Alexandre Julliard : winex11: Store the device format in the Xrender info structure.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 2fda19ca9842cdd68072628dc1f4af6631fd741c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fda19ca9842cdd68072628dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 12:21:53 2009 +0200 winex11: Store the device format in the Xrender info structure. --- dlls/winex11.drv/xrender.c | 54 +++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2498668..efced85 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -144,6 +144,7 @@ struct xrender_info { int cache_index; Picture pict; + const WineXRenderFormat *format; }; static gsCacheEntry *glyphsetCache = NULL; @@ -206,23 +207,6 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif -static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) -{ - if(!physDev->xrender) - { - physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender)); - - if(!physDev->xrender) - { - ERR("Unable to allocate XRENDERINFO!\n"); - return NULL; - } - physDev->xrender->cache_index = -1; - } - - return physDev->xrender; -} - static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPictFormat *templ, unsigned long *mask) { templ->id = 0; @@ -495,19 +479,23 @@ static void set_xrender_transformation(Picture src_pict, float xscale, float ysc #endif } -static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts *shifts) +static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) { - Picture pict; - XRenderPictureAttributes pa; - const WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); - if (!fmt) return 0; + if(!physDev->xrender) + { + physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender)); - wine_tsx11_lock(); - pa.subwindow_mode = IncludeInferiors; - pict = pXRenderCreatePicture(gdi_display, drawable, fmt->pict_format, CPSubwindowMode, &pa); - wine_tsx11_unlock(); + if(!physDev->xrender) + { + ERR("Unable to allocate XRENDERINFO!\n"); + return NULL; + } + physDev->xrender->cache_index = -1; + } + if (!physDev->xrender->format) + physDev->xrender->format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); - return pict; + return physDev->xrender; } static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) @@ -515,9 +503,15 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) struct xrender_info *info = get_xrender_info(physDev); if (!info) return 0; - if(!info->pict) + if (!info->pict && info->format) { - info->pict = create_xrender_picture(physDev->drawable, physDev->depth, physDev->color_shifts); + XRenderPictureAttributes pa; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + info->pict = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, + CPSubwindowMode, &pa); + wine_tsx11_unlock(); TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); } @@ -939,7 +933,7 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) } wine_tsx11_unlock(); - return; + physDev->xrender->format = NULL; } /************************************************************************

1 0

Alexandre Julliard : winex11: Make all render format pointers const.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 6193d7def400d76e26198deecaa5843bcf521375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6193d7def400d76e26198deec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 12:06:38 2009 +0200 winex11: Make all render format pointers const. --- dlls/winex11.drv/xrender.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 665e6fb..2498668 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -124,7 +124,7 @@ typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVAL typedef struct { GlyphSet glyphset; - WineXRenderFormat *font_format; + const WineXRenderFormat *font_format; int nrealized; BOOL *realized; void **bitmaps; @@ -408,7 +408,7 @@ sym_not_found: } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */ -static void get_xrender_color(WineXRenderFormat *wxr_format, int src_color, XRenderColor *dst_color) +static void get_xrender_color(const WineXRenderFormat *wxr_format, int src_color, XRenderColor *dst_color) { XRenderPictFormat *pf = wxr_format->pict_format; @@ -430,7 +430,7 @@ static void get_xrender_color(WineXRenderFormat *wxr_format, int src_color, XRen dst_color->alpha = 0xffff; } -static WineXRenderFormat *get_xrender_format(WXRFormat format) +static const WineXRenderFormat *get_xrender_format(WXRFormat format) { int i; for(i=0; i<WineXRenderFormatsListSize; i++) @@ -444,7 +444,7 @@ static WineXRenderFormat *get_xrender_format(WXRFormat format) return NULL; } -static WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) +static const WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) { int redMask, greenMask, blueMask; unsigned int i; @@ -499,7 +499,7 @@ static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts { Picture pict; XRenderPictureAttributes pa; - WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); + const WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); if (!fmt) return 0; wine_tsx11_lock(); @@ -896,7 +896,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) { - WineXRenderFormat *fmt; + const WineXRenderFormat *fmt; ColorShifts shifts; /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion @@ -1411,7 +1411,7 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf * Returns an appropriate Picture for tiling the text colour. * Call and use result within the xrender_cs */ -static Picture get_tile_pict(WineXRenderFormat *wxr_format, int text_pixel) +static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel) { static struct { @@ -1484,7 +1484,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag unsigned int idx; double cosEsc, sinEsc; LOGFONTW lf; - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; /* Do we need to disable antialiasing because of palette mode? */ @@ -1860,8 +1860,8 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid POINT pts[2]; BOOL top_down = FALSE; RGNDATA *rgndata; - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); - WineXRenderFormat *src_format; + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); + const WineXRenderFormat *src_format; int repeat_src; if(!X11DRV_XRender_Installed) { @@ -2058,8 +2058,8 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, } else /* We meed depth conversion */ { - WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); + const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture src_pict, dst_pict; XRenderPictureAttributes pa; @@ -2087,8 +2087,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; - WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); + const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; double xscale = widthSrc/(double)widthDst;

1 0

Roderick Colenbrander : winex11: Introduce get_xrender_picture for retrieving a Picture from a physDev and allocating a Picture when needed .
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 34116289a559b26266b412d4950bd9bd3ff77c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34116289a559b26266b412d49… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Oct 8 17:24:46 2009 +0200 winex11: Introduce get_xrender_picture for retrieving a Picture from a physDev and allocating a Picture when needed. --- dlls/winex11.drv/xrender.c | 103 ++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8b2f0dd..665e6fb 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -146,7 +146,6 @@ struct xrender_info Picture pict; }; - static gsCacheEntry *glyphsetCache = NULL; static DWORD glyphsetCacheSize = 0; static INT lastfree = -1; @@ -482,6 +481,49 @@ static WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorS return NULL; } +/* Set the x/y scaling and x/y offsets in the transformation matrix of the source picture */ +static void set_xrender_transformation(Picture src_pict, float xscale, float yscale, int xoffset, int yoffset) +{ +#ifdef HAVE_XRENDERSETPICTURETRANSFORM + XTransform xform = {{ + { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(xoffset) }, + { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(yoffset) }, + { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } + }}; + + pXRenderSetPictureTransform(gdi_display, src_pict, &xform); +#endif +} + +static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts *shifts) +{ + Picture pict; + XRenderPictureAttributes pa; + WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); + if (!fmt) return 0; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + pict = pXRenderCreatePicture(gdi_display, drawable, fmt->pict_format, CPSubwindowMode, &pa); + wine_tsx11_unlock(); + + return pict; +} + +static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) +{ + struct xrender_info *info = get_xrender_info(physDev); + if (!info) return 0; + + if(!info->pict) + { + info->pict = create_xrender_picture(physDev->drawable, physDev->depth, physDev->color_shifts); + TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); + } + + return info->pict; +} + static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; @@ -1434,7 +1476,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; BOOL retv = FALSE; - HDC hdc = physDev->hdc; int textPixel, backgroundPixel; HRGN saved_region = 0; BOOL disable_antialias = FALSE; @@ -1515,35 +1556,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag DeleteObject( clip_region ); } - if(X11DRV_XRender_Installed) { - if(!physDev->xrender->pict) { - XRenderPictureAttributes pa; - pa.subwindow_mode = IncludeInferiors; - - wine_tsx11_lock(); - physDev->xrender->pict = pXRenderCreatePicture(gdi_display, - physDev->drawable, dst_format->pict_format, - CPSubwindowMode, &pa); - wine_tsx11_unlock(); - - TRACE("allocing pict = %lx dc = %p drawable = %08lx\n", - physDev->xrender->pict, hdc, physDev->drawable); - } else { - TRACE("using existing pict = %lx dc = %p drawable = %08lx\n", - physDev->xrender->pict, hdc, physDev->drawable); - } - - if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) - { - wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, - physDev->dc_rect.left, physDev->dc_rect.top, - (XRectangle *)data->Buffer, data->rdh.nCount ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, data ); - } - } - EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physDev->xrender->cache_index; @@ -1578,6 +1590,17 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag INT offset = 0; POINT desired, current; int render_op = PictOpOver; + Picture pict = get_xrender_picture(physDev); + + if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) + { + wine_tsx11_lock(); + pXRenderSetPictureClipRectangles( gdi_display, pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)data->Buffer, data->rdh.nCount ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, data ); + } /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -1618,9 +1641,11 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag } } wine_tsx11_lock(); + /* Make sure we don't have any transforms set from a previous call */ + set_xrender_transformation(pict, 1, 1, 0, 0); pXRenderCompositeText16(gdi_display, render_op, tile_pict, - physDev->xrender->pict, + pict, formatEntry->font_format->pict_format, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); @@ -1781,20 +1806,6 @@ done_unlock: return retv; } -/* Set the x/y scaling and x/y offsets in the transformation matrix of the source picture */ -static void set_xrender_transformation(Picture src_pict, float xscale, float yscale, int xoffset, int yoffset) -{ -#ifdef HAVE_XRENDERSETPICTURETRANSFORM - XTransform xform = {{ - { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(xoffset) }, - { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(yoffset) }, - { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } - }}; - - pXRenderSetPictureTransform(gdi_display, src_pict, &xform); -#endif -} - /* Helper function for (stretched) blitting using xrender */ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, float xscale, float yscale, int width, int height) {

1 0

Andrew Eikum : mshtml: Add stub implementation for IHTMLDocument6.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 1622fd0e7a7290d7a42facc96cb9e88b7ecf5b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1622fd0e7a7290d7a42facc96… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 12 13:39:23 2009 -0500 mshtml: Add stub implementation for IHTMLDocument6. --- dlls/mshtml/htmldoc.c | 3 + dlls/mshtml/htmldoc5.c | 134 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 3 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bb5d968..ef3085e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1626,6 +1626,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) { TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppv); *ppv = HTMLDOC5(This); + }else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) { + TRACE("(%p)->(IID_IHTMLDocument6, %p)\n", This, ppv); + *ppv = HTMLDOC6(This); }else if(IsEqualGUID(&IID_IPersist, riid)) { TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); *ppv = PERSIST(This); diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 59b223b..4c8d173 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -299,7 +299,141 @@ static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { HTMLDocument5_get_compatMode }; +#define HTMLDOC6_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument6, iface) + +static HRESULT WINAPI HTMLDocument6_QueryInterface(IHTMLDocument6 *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI HTMLDocument6_AddRef(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI HTMLDocument6_Release(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI HTMLDocument6_GetTypeInfoCount(IHTMLDocument6 *iface, UINT *pctinfo) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); +} + +static HRESULT WINAPI HTMLDocument6_GetTypeInfo(IHTMLDocument6 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDocument6_GetIDsOfNames(IHTMLDocument6 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDocument6_Invoke(IHTMLDocument6 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, + IHTMLDocumentCompatibleInfoCollection **p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, + VARIANT p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, + VARIANT *p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, + VARIANT p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, + BSTR bstrId, IHTMLElement2 **p) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrId), p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument6_updateSettings(IHTMLDocument6 *iface) +{ + HTMLDocument *This = HTMLDOC6_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +#undef HTMLDOC6_THIS + +static const IHTMLDocument6Vtbl HTMLDocument6Vtbl = { + HTMLDocument6_QueryInterface, + HTMLDocument6_AddRef, + HTMLDocument6_Release, + HTMLDocument6_GetTypeInfoCount, + HTMLDocument6_GetTypeInfo, + HTMLDocument6_GetIDsOfNames, + HTMLDocument6_Invoke, + HTMLDocument6_get_compatible, + HTMLDocument6_get_documentMode, + HTMLDocument6_put_onstorage, + HTMLDocument6_get_onstorage, + HTMLDocument6_put_onstoragecommit, + HTMLDocument6_get_onstoragecommit, + HTMLDocument6_getElementById, + HTMLDocument6_updateSettings +}; + void HTMLDocument_HTMLDocument5_Init(HTMLDocument *This) { This->lpHTMLDocument5Vtbl = &HTMLDocument5Vtbl; + This->lpHTMLDocument6Vtbl = &HTMLDocument6Vtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51074ed..c92bb25 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -253,6 +253,7 @@ struct HTMLDocument { const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; + const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistFileVtbl *lpPersistFileVtbl; const IPersistHistoryVtbl *lpPersistHistoryVtbl; @@ -488,6 +489,7 @@ struct HTMLDocumentNode { #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl) #define HTMLDOC4(x) ((IHTMLDocument4*) &(x)->lpHTMLDocument4Vtbl) #define HTMLDOC5(x) ((IHTMLDocument5*) &(x)->lpHTMLDocument5Vtbl) +#define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) #define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl) #define PERSISTFILE(x) ((IPersistFile*) &(x)->lpPersistFileVtbl)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009