March 2013 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Use jsstr_flush in String_concat.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 895d059ebe8f58a1ce2b2526a63cb6b29d9d1606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895d059ebe8f58a1ce2b2526a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:50:18 2013 +0100 jscript: Use jsstr_flush in String_concat. --- dlls/jscript/string.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 70be13a..1d4a188 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -331,8 +331,8 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + unsigned len = 0, i, str_cnt; jsstr_t **strs, *ret = NULL; - DWORD len = 0, i, l, str_cnt; WCHAR *ptr; HRESULT hres; @@ -364,11 +364,8 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns ret = jsstr_alloc_buf(len); if(ret) { ptr = ret->str; - for(i=0; i < str_cnt; i++) { - l = jsstr_length(strs[i]); - memcpy(ptr, strs[i]->str, l*sizeof(WCHAR)); - ptr += l; - } + for(i=0; i < str_cnt; i++) + ptr += jsstr_flush(strs[i], ptr); }else { hres = E_OUTOFMEMORY; }

1 0

Piotr Caban : msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 8e5bebe26253f2725141a35f23b6f2e10fc7694d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5bebe26253f2725141a35f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:02:16 2013 +0100 msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd. --- dlls/msvcrt/file.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5b3bf5e..4561711 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -287,7 +287,7 @@ static void msvcrt_free_fd(int fd) /* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */ /* caller must hold the files lock */ -static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) +static int msvcrt_set_fd(HANDLE hand, int flag, int fd) { ioinfo *fdinfo; @@ -351,7 +351,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) LOCK_FILES(); TRACE(":handle (%p) allocating fd (%d)\n",hand,MSVCRT_fdstart); - ret = msvcrt_alloc_fd_from(hand, flag, MSVCRT_fdstart); + ret = msvcrt_set_fd(hand, flag, MSVCRT_fdstart); UNLOCK_FILES(); return ret; } @@ -474,7 +474,7 @@ void msvcrt_init_io(void) for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(*handle_ptr, *wxflag_ptr, i); + msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i); wxflag_ptr++; handle_ptr++; } @@ -485,15 +485,15 @@ void msvcrt_init_io(void) fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -913,7 +913,7 @@ int CDECL MSVCRT__dup2(int od, int nd) if (msvcrt_is_valid_fd(nd)) MSVCRT__close(nd); - ret = msvcrt_alloc_fd_from(handle, wxflag, nd); + ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) { CloseHandle(handle);

1 0

Piotr Caban : msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 62e00e527fa67e3ddb043a61f6813f471b380116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e00e527fa67e3ddb043a61f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:05:32 2013 +0100 msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals. --- dlls/msvcrt/except.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 80004c9..c96623c 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -152,13 +152,11 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) void msvcrt_init_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, TRUE); - SetUnhandledExceptionFilter(msvcrt_exception_filter); } void msvcrt_free_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, FALSE); - SetUnhandledExceptionFilter(NULL); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added __pxcptinfoptrs implementation.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 14a81773c7ce865dd6d919ddee89cad301985ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a81773c7ce865dd6d919dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:05:42 2013 +0100 msvcrt: Added __pxcptinfoptrs implementation. --- dlls/msvcrt/except.c | 45 +++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 3 ++- dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/signal.h | 1 + 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index c96623c..32cf3b0 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -61,6 +61,14 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) return ret; } +/********************************************************************* + * __pxcptinfoptrs (MSVCRT.@) + */ +void** CDECL MSVCRT___pxcptinfoptrs(void) +{ + return (void**)&msvcrt_get_thread_data()->xcptinfo; +} + typedef void (CDECL *float_handler)(int, int); /* The exception codes are actually NTSTATUS values */ @@ -93,8 +101,13 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != MSVCRT_SIG_IGN) { + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + + old_ep = *ep; + *ep = except; sighandlers[MSVCRT_SIGSEGV] = MSVCRT_SIG_DFL; handler(MSVCRT_SIGSEGV); + *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; } @@ -114,6 +127,7 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != MSVCRT_SIG_IGN) { + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; unsigned int i; int float_signal = MSVCRT__FPE_INVALID; @@ -128,7 +142,11 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) break; } } + + old_ep = *ep; + *ep = except; ((float_handler)handler)(MSVCRT_SIGFPE, float_signal); + *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; } @@ -139,8 +157,13 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != MSVCRT_SIG_IGN) { + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + + old_ep = *ep; + *ep = except; sighandlers[MSVCRT_SIGILL] = MSVCRT_SIG_DFL; handler(MSVCRT_SIGILL); + *ep = old_ep; } ret = EXCEPTION_CONTINUE_EXECUTION; } @@ -204,22 +227,36 @@ int CDECL MSVCRT_raise(int sig) switch (sig) { - case MSVCRT_SIGABRT: case MSVCRT_SIGFPE: case MSVCRT_SIGILL: case MSVCRT_SIGSEGV: - case MSVCRT_SIGINT: - case MSVCRT_SIGTERM: - case MSVCRT_SIGBREAK: handler = sighandlers[sig]; if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); if (handler != MSVCRT_SIG_IGN) { + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + sighandlers[sig] = MSVCRT_SIG_DFL; + + old_ep = *ep; + *ep = NULL; if (sig == MSVCRT_SIGFPE) ((float_handler)handler)(sig, MSVCRT__FPE_EXPLICITGEN); else handler(sig); + *ep = old_ep; + } + break; + case MSVCRT_SIGABRT: + case MSVCRT_SIGINT: + case MSVCRT_SIGTERM: + case MSVCRT_SIGBREAK: + handler = sighandlers[sig]; + if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); + if (handler != MSVCRT_SIG_IGN) + { + sighandlers[sig] = MSVCRT_SIG_DFL; + handler(sig); } break; default: diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 288d18d..e2ff7a0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -200,7 +200,8 @@ struct __thread_data { struct MSVCRT_tm *time_buffer; /* buffer for localtime/gmtime */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ int unk3[2]; - void *unk4[4]; + void *unk4[3]; + EXCEPTION_POINTERS *xcptinfo; int fpecode; MSVCRT_pthreadmbcinfo mbcinfo; MSVCRT_pthreadlocinfo locinfo; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f5ef8b6..2b01fc3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -250,7 +250,7 @@ @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() -@ stub __pxcptinfoptrs() +@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr diff --git a/include/msvcrt/signal.h b/include/msvcrt/signal.h index d9f72cc..42d2bfe 100644 --- a/include/msvcrt/signal.h +++ b/include/msvcrt/signal.h @@ -42,6 +42,7 @@ typedef void (__cdecl *__sighandler_t)(int); #define SIG_IGN ((__sighandler_t)1) #define SIG_ERR ((__sighandler_t)-1) +void** __cdecl __pxcptinfoptrs(void); __sighandler_t __cdecl signal(int sig, __sighandler_t func); int __cdecl raise(int sig);

1 0

Frédéric Delanoy : vbscript: Specify correct variable in memory allocation check (coverity).
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: d0d269ab7fd1fb424dc7e5007f730451553abc6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d269ab7fd1fb424dc7e5007… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Mar 3 23:53:07 2013 +0100 vbscript: Specify correct variable in memory allocation check (coverity). --- dlls/vbscript/vbregexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 02e63ab..f3fb874 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -314,7 +314,7 @@ static HRESULT create_sub_matches(DWORD pos, match_state_t *result, SubMatches * ret->result = result; if(result) { ret->match = heap_alloc((result->match_len+1) * sizeof(WCHAR)); - if(!ret) { + if(!ret->match) { heap_free(ret); return E_OUTOFMEMORY; }

1 0

Alexandre Julliard : gdi32: Store the font stat information when loading it .
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 93c1389b7c134c0377b6ba7648cc5c574c9eb585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c1389b7c134c0377b6ba764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:35:28 2013 +0100 gdi32: Store the font stat information when loading it. --- dlls/gdi32/freetype.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d7cc777..5b10d0d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -263,6 +263,8 @@ typedef struct tagFace { WCHAR *StyleName; WCHAR *FullName; WCHAR *file; + dev_t dev; + ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1761,6 +1763,7 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { + struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1779,11 +1782,18 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); + face->dev = 0; + face->ino = 0; if (file) { face->file = towstr( CP_UNIXCP, file ); face->font_data_ptr = NULL; face->font_data_size = 0; + if (!stat( file, &st )) + { + face->dev = st.st_dev; + face->ino = st.st_ino; + } } else { @@ -1986,8 +1996,7 @@ static int remove_font_resource( const char *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - char *filename; - struct stat st, st2; + struct stat st; int count = 0; if (stat( file, &st ) == -1) return 0; @@ -1998,14 +2007,12 @@ static int remove_font_resource( const char *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - filename = strWtoA( CP_UNIXCP, face->file ); - if (!stat( filename, &st2 ) && st.st_dev == st2.st_dev && st.st_ino == st2.st_ino) + if (st.st_dev == face->dev && st.st_ino == face->ino) { - TRACE( "removing matching face %s\n", debugstr_w(face->file) ); + TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); count++; } - HeapFree( GetProcessHeap(), 0, filename ); } release_family( family ); }

1 0

Alexandre Julliard : gdi32: Increment the face refcount when loading the same font file multiple times .
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 591a31ba67ba1fcf8baea702b6460868ab3522e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591a31ba67ba1fcf8baea702b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:35:50 2013 +0100 gdi32: Increment the face refcount when loading the same font file multiple times. --- dlls/gdi32/freetype.c | 7 +++++++ dlls/gdi32/tests/font.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b10d0d..a452fa0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1304,6 +1304,13 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(family->FamilyName), debugstr_w(face->StyleName), cursor->font_version, face->font_version); + if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + { + cursor->refcount++; + TRACE("Font %s already in list, refcount now %d\n", + debugstr_w(face->file), cursor->refcount); + return FALSE; + } if (face->font_version <= cursor->font_version) { TRACE("Original font %s is newer so skipping %s\n", diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b72a423..aa94dea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4567,6 +4567,7 @@ static void test_CreateScalableFontResource(void) char fot_name[MAX_PATH]; char *file_part; DWORD ret; + int i; if (!pAddFontResourceExA || !pRemoveFontResourceExA) { @@ -4655,6 +4656,22 @@ static void test_CreateScalableFontResource(void) ret = pRemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); + /* test refcounting */ + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pAddFontResourceExA(fot_name, 0, 0); + ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); + } + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); + } + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + DeleteFile(fot_name); /* test hidden font resource */

1 0

Daniel Jelinski : comctl32/imagelist: Fixed merging of images without mask.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 634d190478846c0224e799a740045a77c91f76f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634d190478846c0224e799a74… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Mar 1 19:48:08 2013 +0100 comctl32/imagelist: Fixed merging of images without mask. --- dlls/comctl32/imagelist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 54d864e..03c359f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2134,8 +2134,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + if (himl2->flags & ILC_MASK) + { + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + } + else + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCCOPY); } /* copy mask */

1 0

Daniel Jelinski : comctl32/listview: Fix font handling in custom draw.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 0ee1df5926110cfd17c7b938fcefcdaace388302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee1df5926110cfd17c7b938f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Mar 2 23:12:00 2013 +0100 comctl32/listview: Fix font handling in custom draw. --- dlls/comctl32/listview.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dc0a95..9f4305a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4577,7 +4577,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; - HFONT hOldFont; TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); @@ -4615,7 +4614,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; if (cdmode & CDRF_NOTIFYITEMDRAW) @@ -4741,8 +4739,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - if (cdsubitemmode & CDRF_NEWFONT) - SelectObject(hdc, hOldFont); return TRUE; } @@ -4869,6 +4865,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* iterate through the invalidated rows */ while(iterator_next(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; @@ -5016,6 +5013,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D while(iterator_prev(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.x += Origin.x; Position.y += Origin.y; @@ -5342,6 +5340,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP POINT pos; HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; + HFONT hOldFont; HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); @@ -5362,6 +5361,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP hdc = CreateCompatibleDC(hdcOrig); hbmp = CreateCompatibleBitmap(hdcOrig, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); + hOldFont = SelectObject(hdc, infoPtr->hFont); rcItem.left = rcItem.top = 0; rcItem.right = size.cx; @@ -5378,6 +5378,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP else SelectObject(hdc, hOldbmp); + SelectObject(hdc, hOldFont); DeleteObject(hbmp); DeleteDC(hdc); ReleaseDC(infoPtr->hwndSelf, hdcOrig);

1 0

Daniel Jelinski : comctl32/listview: Fix custom draw prepaint handling.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 704412b459cfafada2a04fa2f62be149e5597537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704412b459cfafada2a04fa2f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 3 15:22:43 2013 +0100 comctl32/listview: Fix custom draw prepaint handling. --- dlls/comctl32/listview.c | 14 +------------- dlls/comctl32/tests/listview.c | 5 ++++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f4305a..4ae974e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5037,7 +5037,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D */ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcErase) { - COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText; + COLORREF oldTextColor = 0, oldBkColor = 0; NMLVCUSTOMDRAW nmlvcd; HFONT hOldFont = 0; DWORD cdmode; @@ -5094,21 +5094,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - /* FIXME: Shouldn't need to do this */ - oldClrTextBk = infoPtr->clrTextBk; - oldClrText = infoPtr->clrText; - infoPtr->cditemmode = CDRF_DODEFAULT; GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - - /* Use these colors to draw the items */ - infoPtr->clrTextBk = nmlvcd.clrTextBk; - infoPtr->clrText = nmlvcd.clrText; /* nothing to draw */ if(infoPtr->nItemCount == 0) goto enddraw; @@ -5157,9 +5148,6 @@ enddraw: if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - infoPtr->clrTextBk = oldClrTextBk; - infoPtr->clrText = oldClrText; - if(hbmp) { BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, infoPtr->rcList.right - infoPtr->rcList.left, diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fef3f60..1147c0b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1765,7 +1765,10 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (nmlvcd->iSubItem) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + else + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc);

1 0