July 2011 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLStyle:: pageBreakAfter property implementation.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: dfaee0f3b19f2f13047183e9d5f74ffe0329320e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaee0f3b19f2f13047183e9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 18 13:39:37 2011 +0200 mshtml: Added IHTMLStyle::pageBreakAfter property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cd1f6b5..2aab2c1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -143,6 +143,8 @@ static const WCHAR attrPaddingRight[] = {'p','a','d','d','i','n','g','-','r','i','g','h','t',0}; static const WCHAR attrPaddingTop[] = {'p','a','d','d','i','n','g','-','t','o','p',0}; +static const WCHAR attrPageBreakAfter[] = + {'p','a','g','e','-','b','r','e','a','k','-','a','f','t','e','r',0}; static const WCHAR attrPosition[] = {'p','o','s','i','t','i','o','n',0}; static const WCHAR attrRight[] = @@ -226,6 +228,7 @@ static const struct{ {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, {attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT}, {attrPaddingTop, DISPID_IHTMLSTYLE_PADDINGTOP}, + {attrPageBreakAfter, DISPID_IHTMLSTYLE_PAGEBREAKAFTER}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, {attrRight, DISPID_IHTMLSTYLE2_RIGHT}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, @@ -2359,15 +2362,19 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakBefore(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_pageBreakAfter(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_AFTER, v, 0); } static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_AFTER, p, 0); } static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 154c391..6eae659 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -85,6 +85,7 @@ typedef enum { STYLEID_PADDING_LEFT, STYLEID_PADDING_RIGHT, STYLEID_PADDING_TOP, + STYLEID_PAGE_BREAK_AFTER, STYLEID_POSITION, STYLEID_RIGHT, STYLEID_TEXT_ALIGN, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 045de7c..67d9c33 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5742,6 +5742,21 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(str, "rect(0px 1px 500px 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* pageBreakAfter */ + hres = IHTMLStyle_get_pageBreakAfter(style, &str); + ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres); + ok(!str, "pageBreakAfter = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("always"); + hres = IHTMLStyle_put_pageBreakAfter(style, str); + ok(hres == S_OK, "put_pageBreakAfter failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_pageBreakAfter(style, &str); + ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres); + ok(!strcmp_wa(str, "always"), "pageBreakAfter = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Huw Davies : gdi32: Export a bitmap conversion function.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 09a14184493d1a955a84fc945ed73d1802a3459d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a14184493d1a955a84fc945… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 15:27:43 2011 +0100 gdi32: Export a bitmap conversion function. --- dlls/gdi32/dibdrv/dc.c | 47 +++++++++++++++++++++++------------------- dlls/gdi32/dibdrv/objects.c | 16 +++++++++++++- dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3ec44d1..1122579 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -200,6 +200,20 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u return init_dib_info(dib, bi, masks, color_table, num_colors, ptr, private_color_table); } +BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) +{ + unsigned int colors = 0; + void *colorptr = (char *)&info->bmiHeader + info->bmiHeader.biSize; + const DWORD *bitfields = (info->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)colorptr : NULL; + + if (info->bmiHeader.biBitCount <= 8) + { + colors = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + } + return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); +} + static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; @@ -252,32 +266,23 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } } -/************************************************************** - * convert_dib - * - * Converts src into the format specified in dst. - * - * FIXME: At the moment this always creates a top-down dib, - * do we want to give the option of bottom-up? - */ -BOOL convert_dib(dib_info *dst, const dib_info *src) +DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, const RECT *src_rect, + const BITMAPINFO *dst_info, void *dst_bits ) { - BOOL ret; - RECT src_rect; + dib_info src_dib, dst_dib; + DWORD ret; - dst->height = src->height; - dst->width = src->width; - dst->stride = ((dst->width * dst->bit_count + 31) >> 3) & ~3; - dst->ptr_to_free = dst->bits = HeapAlloc(GetProcessHeap(), 0, dst->height * dst->stride); + if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + return ERROR_BAD_FORMAT; + if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + return ERROR_BAD_FORMAT; - src_rect.left = src_rect.top = 0; - src_rect.right = src->width; - src_rect.bottom = src->height; + ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, src_rect ); - ret = dst->funcs->convert_to(dst, src, &src_rect); + /* We shared the color tables, so there's no need to free the dib_infos here */ - if(!ret) free_dib_info(dst); - return ret; + if(!ret) return ERROR_BAD_FORMAT; + return ERROR_SUCCESS; } static void update_fg_colors( dibdrv_physdev *pdev ) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 75b63fa..a977bd4 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1285,16 +1285,30 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) dib_info orig_dib; WORD usage = LOWORD(logbrush.lbColor); HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; + RECT rect; if(!bi) return NULL; if(init_dib_info_from_packed(&orig_dib, bi, usage, pal)) { copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - if(convert_dib(&pdev->brush_dib, &orig_dib)) + + pdev->brush_dib.height = orig_dib.height; + pdev->brush_dib.width = orig_dib.width; + pdev->brush_dib.stride = ((pdev->brush_dib.width * pdev->brush_dib.bit_count + 31) >> 3) & ~3; + pdev->brush_dib.ptr_to_free = HeapAlloc( GetProcessHeap(), 0, pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits = pdev->brush_dib.ptr_to_free; + + rect.left = rect.top = 0; + rect.right = orig_dib.width; + rect.bottom = orig_dib.height; + + if(pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect)) { pdev->brush_rects = pattern_brush; pdev->defer &= ~DEFER_BRUSH; } + else + free_dib_info(&pdev->brush_dib); free_dib_info(&orig_dib); } GlobalUnlock((HGLOBAL)logbrush.lbHatch); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a48ac87..8c3e9ac 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -338,6 +338,9 @@ extern int DIB_GetDIBImageBytes( int width, int height, int depth ) DECLSPEC_HID extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; +extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, const RECT *src_rect, + const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; + /* driver.c */ extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN;

1 0

Huw Davies : gdi32: Implement GetDIBits using the GetImage driver function.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 103719e9e97379c558b53b54015b253e6eb42dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=103719e9e97379c558b53b540… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 18 15:27:44 2011 +0100 gdi32: Implement GetDIBits using the GetImage driver function. --- dlls/gdi32/dib.c | 370 +++++++++++++-------------------------------- dlls/gdi32/tests/bitmap.c | 1 - 2 files changed, 107 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=103719e9e97379c558b53…

1 0

Grazvydas Ignotas : ntdll/tests: Add more debug register tests.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 382d953872297a327f125ec1103a9e46709c2413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382d953872297a327f125ec11… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Fri Jul 15 23:19:09 2011 +0300 ntdll/tests: Add more debug register tests. --- dlls/ntdll/tests/exception.c | 65 +++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 386c5a6..194bfae 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -474,20 +474,50 @@ static void test_prot_fault(void) } } +struct dbgreg_test { + DWORD dr0, dr1, dr2, dr3, dr6, dr7; +}; + /* test handling of debug registers */ static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { + const struct dbgreg_test *test = *(const struct dbgreg_test **)(frame + 1); + context->Eip += 2; /* Skips the popl (%eax) */ - context->Dr0 = 0x42424242; - context->Dr1 = 0; - context->Dr2 = 0; - context->Dr3 = 0; - context->Dr6 = 0; - context->Dr7 = 0x155; + context->Dr0 = test->dr0; + context->Dr1 = test->dr1; + context->Dr2 = test->dr2; + context->Dr3 = test->dr3; + context->Dr6 = test->dr6; + context->Dr7 = test->dr7; return ExceptionContinueExecution; } +#define CHECK_DEBUG_REG(n, m) \ + ok((ctx.Dr##n & m) == test->dr##n, "(%d) failed to set debug register " #n " to %x, got %x\n", \ + test_num, test->dr##n, ctx.Dr##n) + +static void check_debug_registers(int test_num, const struct dbgreg_test *test) +{ + CONTEXT ctx; + NTSTATUS status; + + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + status = pNtGetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + + CHECK_DEBUG_REG(0, ~0); + CHECK_DEBUG_REG(1, ~0); +if (test_num == 2) todo_wine + CHECK_DEBUG_REG(2, ~0); +if (test_num == 2) todo_wine + CHECK_DEBUG_REG(3, ~0); + CHECK_DEBUG_REG(6, 0x0f); +if (test_num == 2) todo_wine + CHECK_DEBUG_REG(7, ~0xdc00); +} + static const BYTE segfault_code[5] = { 0x31, 0xc0, /* xor %eax,%eax */ 0x8f, 0x00, /* popl (%eax) - cause exception */ @@ -644,6 +674,7 @@ static void test_exceptions(void) { CONTEXT ctx; NTSTATUS res; + struct dbgreg_test dreg_test; if (!pNtGetContextThread || !pNtSetContextThread) { @@ -652,13 +683,21 @@ static void test_exceptions(void) } /* test handling of debug registers */ - run_exception_test(dreg_handler, NULL, &segfault_code, sizeof(segfault_code), 0); - - ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; - res = pNtGetContextThread(GetCurrentThread(), &ctx); - ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %x\n", res); - ok(ctx.Dr0 == 0x42424242,"failed to set debugregister 0 to 0x42424242, got %x\n", ctx.Dr0); - ok((ctx.Dr7 & ~0xdc00) == 0x155,"failed to set debugregister 7 to 0x155, got %x\n", ctx.Dr7); + memset(&dreg_test, 0, sizeof(dreg_test)); + + dreg_test.dr0 = 0x42424240; + dreg_test.dr2 = 0x126bb070; + dreg_test.dr3 = 0x0badbad0; + dreg_test.dr7 = 0xffff0115; + run_exception_test(dreg_handler, &dreg_test, &segfault_code, sizeof(segfault_code), 0); + check_debug_registers(1, &dreg_test); + + dreg_test.dr0 = 0x42424242; + dreg_test.dr2 = 0x100f0fe7; + dreg_test.dr3 = 0x0abebabe; + dreg_test.dr7 = 0x115; + run_exception_test(dreg_handler, &dreg_test, &segfault_code, sizeof(segfault_code), 0); + check_debug_registers(2, &dreg_test); /* test single stepping behavior */ got_exception = 0;

1 0

Grazvydas Ignotas : server: Set RW and LEN bits of DR7 before setting DR0-DR3.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: fa179b1c26c2d6ba92f1e4c3ea651c45bf509d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa179b1c26c2d6ba92f1e4c3e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Fri Jul 15 23:19:10 2011 +0300 server: Set RW and LEN bits of DR7 before setting DR0-DR3. --- dlls/ntdll/tests/exception.c | 2 -- server/ptrace.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 194bfae..9f80651 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -509,12 +509,10 @@ static void check_debug_registers(int test_num, const struct dbgreg_test *test) CHECK_DEBUG_REG(0, ~0); CHECK_DEBUG_REG(1, ~0); -if (test_num == 2) todo_wine CHECK_DEBUG_REG(2, ~0); if (test_num == 2) todo_wine CHECK_DEBUG_REG(3, ~0); CHECK_DEBUG_REG(6, 0x0f); -if (test_num == 2) todo_wine CHECK_DEBUG_REG(7, ~0xdc00); } diff --git a/server/ptrace.c b/server/ptrace.c index 69747ed..6df9555 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -593,6 +593,8 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign switch (context->cpu) { case CPU_x86: + /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; if (thread->context) thread->context->debug.i386_regs.dr0 = context->debug.i386_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; @@ -607,6 +609,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; break; case CPU_x86_64: + if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; if (thread->context) thread->context->debug.x86_64_regs.dr0 = context->debug.x86_64_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error;

1 0

Grazvydas Ignotas : server: Set debug enable bits briefly to commit the addresses to kernel.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 2cc56f379c3a17d3274fc4b7e91ac648e10e641d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc56f379c3a17d3274fc4b7e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Fri Jul 15 23:19:11 2011 +0300 server: Set debug enable bits briefly to commit the addresses to kernel. --- dlls/ntdll/tests/exception.c | 1 - server/ptrace.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9f80651..5d3f8c1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -510,7 +510,6 @@ static void check_debug_registers(int test_num, const struct dbgreg_test *test) CHECK_DEBUG_REG(0, ~0); CHECK_DEBUG_REG(1, ~0); CHECK_DEBUG_REG(2, ~0); -if (test_num == 2) todo_wine CHECK_DEBUG_REG(3, ~0); CHECK_DEBUG_REG(6, 0x0f); CHECK_DEBUG_REG(7, ~0xdc00); diff --git a/server/ptrace.c b/server/ptrace.c index 6df9555..51157ab 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -605,6 +605,8 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (thread->context) thread->context->debug.i386_regs.dr3 = context->debug.i386_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.i386_regs.dr6 ) == -1) goto error; if (thread->context) thread->context->debug.i386_regs.dr6 = context->debug.i386_regs.dr6; + /* Linux 2.6.33+ needs enable bits set briefly to update value returned by PEEKUSER later */ + ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; break; @@ -620,6 +622,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (thread->context) thread->context->debug.x86_64_regs.dr3 = context->debug.x86_64_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.x86_64_regs.dr6 ) == -1) goto error; if (thread->context) thread->context->debug.x86_64_regs.dr6 = context->debug.x86_64_regs.dr6; + ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; break;

1 0

André Hentschel : user32/tests: Add test for nested default button in dialogs.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: b3fbdfa908d122f713078d6929188aa0e91b3f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fbdfa908d122f713078d692… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 19:10:30 2011 +0200 user32/tests: Add test for nested default button in dialogs. --- dlls/user32/tests/dialog.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 1dd5884..5964931 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -50,7 +50,7 @@ static HWND g_hwndTestDlg, g_hwndTestDlgBut1, g_hwndTestDlgBut2, g_hwndTestDlgEd static HWND g_hwndInitialFocusT1, g_hwndInitialFocusT2, g_hwndInitialFocusGroupBox; static LONG g_styleInitialFocusT1, g_styleInitialFocusT2; -static BOOL g_bInitialFocusInitDlgResult; +static BOOL g_bInitialFocusInitDlgResult, g_bReceivedCommand; static int g_terminated; @@ -539,6 +539,8 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, case WM_CREATE: return (OnTestDlgCreate (hwnd, (LPCREATESTRUCTA) lParam) ? 0 : (LRESULT) -1); + case WM_COMMAND: + if(LOWORD(wParam) == 300) g_bReceivedCommand = TRUE; } return DefDlgProcA (hwnd, uiMsg, wParam, lParam); @@ -576,6 +578,8 @@ static BOOL RegisterWindowClasses (void) static void test_WM_NEXTDLGCTL(void) { + HWND child1, child2, child3; + MSG msg; DWORD dwVal; g_hwndTestDlg = CreateWindowEx( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR @@ -678,6 +682,38 @@ static void test_WM_NEXTDLGCTL(void) dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); ok ( IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); } + + /* test nested default buttons */ + + child1 = CreateWindowA("button", "child1", WS_VISIBLE|WS_CHILD, 0, 0, 50, 50, + g_hwndTestDlg, (HMENU)100, g_hinst, NULL); + ok(child1 != NULL, "failed to create first child\n"); + child2 = CreateWindowA("button", "child2", WS_VISIBLE|WS_CHILD, 60, 60, 30, 30, + g_hwndTestDlg, (HMENU)200, g_hinst, NULL); + ok(child2 != NULL, "failed to create second child\n"); + /* create nested child */ + child3 = CreateWindowA("button", "child3", WS_VISIBLE|WS_CHILD, 10, 10, 10, 10, + child1, (HMENU)300, g_hinst, NULL); + ok(child3 != NULL, "failed to create subchild\n"); + + DefDlgProcA( g_hwndTestDlg, DM_SETDEFID, 200, 0); + dwVal = DefDlgProcA( g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(LOWORD(dwVal) == 200, "expected 200, got %x\n", dwVal); + + DefDlgProcA( g_hwndTestDlg, DM_SETDEFID, 300, 0); + dwVal = DefDlgProcA( g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(LOWORD(dwVal) == 300, "expected 300, got %x\n", dwVal); + ok(SendMessageW( child3, WM_GETDLGCODE, 0, 0) != DLGC_DEFPUSHBUTTON, + "expected child3 not to be marked as DLGC_DEFPUSHBUTTON\n"); + + g_bReceivedCommand = FALSE; + FormEnterMsg (&msg, child3); + ok(IsDialogMessage (g_hwndTestDlg, &msg), "Did not handle the ENTER\n"); + todo_wine ok(g_bReceivedCommand, "Did not trigger the default Button action\n"); + + DestroyWindow(child3); + DestroyWindow(child2); + DestroyWindow(child1); DestroyWindow(g_hwndTestDlg); }

1 0

Alexander Morozov : mshtml: Added IProvideClassInfo:: GetClassInfo implementation.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 25c70bacc66d0c42d8996c5b303e3e63053b2ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c70bacc66d0c42d8996c5b3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jul 15 15:09:44 2011 +0400 mshtml: Added IProvideClassInfo::GetClassInfo implementation. --- dlls/mshtml/dispex.c | 45 +++++++++++++++++++++++++++++++---------- dlls/mshtml/htmldoc.c | 5 +-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 38 +++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 327b5db..09de654 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -88,22 +88,30 @@ TID_LIST #undef XDIID }; -static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +static HRESULT load_typelib(void) { HRESULT hres; + ITypeLib *tl; - if(!typelib) { - ITypeLib *tl; + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } - hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); - if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); - return hres; - } + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} - if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) - ITypeLib_Release(tl); - } +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; if(!typeinfos[tid]) { ITypeInfo *ti; @@ -149,6 +157,21 @@ void release_typelib(void) ITypeLib_Release(typelib); } +HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_HTMLDocument, typeinfo); + if(FAILED(hres)) + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; +} + static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) { HRESULT hres; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5ba48cd..38d4bf3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1798,9 +1798,8 @@ static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface, ITypeInfo **ppTI) { HTMLDocument *This = impl_from_IProvideClassInfo(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - *ppTI = NULL; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ppTI); + return get_htmldoc_classinfo(ppTI); } static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 71afb8f..7a5b24e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -213,6 +213,7 @@ HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_H HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; +HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; typedef struct HTMLWindow HTMLWindow; typedef struct HTMLDocumentNode HTMLDocumentNode; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b629071..045de7c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -594,6 +594,42 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID _test_disp_value(line, unk, val); } +#define test_class_info(u) _test_class_info(__LINE__,u) +static void _test_class_info(unsigned line, IUnknown *unk) +{ + IProvideClassInfo *classinfo; + ITypeInfo *typeinfo; + TYPEATTR *type_attr; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo, (void**)&classinfo); + ok_(__FILE__,line)(hres == S_OK, "Could not get IProvideClassInfo interface: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IProvideClassInfo_GetClassInfo(classinfo, &typeinfo); + ok_(__FILE__,line)(hres == S_OK, "Could not get ITypeInfo interface: %08x\n", hres); + if(FAILED(hres)) + { + IProvideClassInfo_Release(classinfo); + return; + } + + hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); + ok_(__FILE__,line)(hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + if(SUCCEEDED(hres)) + { + ok_(__FILE__,line)(IsEqualGUID(&type_attr->guid, &CLSID_HTMLDocument), + "unexpected guid %s\n", dbgstr_guid(&type_attr->guid)); + ok_(__FILE__,line)(type_attr->typekind == TKIND_COCLASS, + "unexpected typekind %d\n", type_attr->typekind); + ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); + } + + ITypeInfo_Release(typeinfo); + IProvideClassInfo_Release(classinfo); +} + #define set_dispex_value(a,b,c) _set_dispex_value(__LINE__,a,b,c) static void _set_dispex_value(unsigned line, IUnknown *unk, const char *name, VARIANT *val) { @@ -5958,9 +5994,11 @@ static void test_window(IHTMLDocument2 *doc) test_ifaces((IUnknown*)doc2, doc_node_iids); test_disp((IUnknown*)doc2, &DIID_DispHTMLDocument, "[object]"); + test_class_info((IUnknown*)doc2); test_ifaces((IUnknown*)doc, doc_obj_iids); test_disp((IUnknown*)doc, &DIID_DispHTMLDocument, "[object]"); + test_class_info((IUnknown*)doc); unk = (void*)0xdeadbeef; hres = IHTMLDocument2_QueryInterface(doc2, &IID_ICustomDoc, (void**)&unk);

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_get_rect() const.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: db12216301a930a2dcd00f68c195a17b6434a324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db12216301a930a2dcd00f68c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:03 2011 +0200 wined3d: Make the surface parameter to surface_get_rect() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f0cfeb4..17f9b70 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -274,7 +274,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } } -static inline void surface_get_rect(struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) +static void surface_get_rect(const struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) { if (rect_in) *rect_out = *rect_in;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_is_full_rect () const.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 416a55c7aa36c08bed862980c46d7f968de26444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416a55c7aa36c08bed862980c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:04 2011 +0200 wined3d: Make the surface parameter to surface_is_full_rect() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 17f9b70..458cc36 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1070,7 +1070,7 @@ static HRESULT surface_flip(struct wined3d_surface *surface, struct wined3d_surf return WINED3D_OK; } -static BOOL surface_is_full_rect(struct wined3d_surface *surface, const RECT *r) +static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) return FALSE;

1 0