February 2013 - Wine-commits

André Hentschel : make_xftmpl: Avoid comparing a char with EOF.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: a32199b3f3b755cd21b7135db05962a67ac318d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32199b3f3b755cd21b7135db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 16:21:04 2013 +0100 make_xftmpl: Avoid comparing a char with EOF. --- tools/make_xftmpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 85b373f..b5751ce 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -336,7 +336,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c == EOF) { + if (c != '"') { fprintf(stderr, "%s: Unterminated string (line %d).\n", program_name, parser->line_no); parser->error = TRUE;

1 0

Austin English : shlwapi: Add a stub for IsInternetESCEnabled.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: b8f072e910b34eebebf1eae3a978839880b7571d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f072e910b34eebebf1eae3a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 11 11:52:27 2013 -0800 shlwapi: Add a stub for IsInternetESCEnabled. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/url.c | 9 +++++++++ include/shlwapi.h | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index bf33e62..aad095e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -567,6 +567,7 @@ @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW @ stdcall IsCharSpaceA(long) +@ stdcall IsInternetESCEnabled() @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 70a0b87..102faf5 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2621,3 +2621,12 @@ HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) return S_OK; } + +/************************************************************************* + * IsInternetESCEnabled [SHLWAPI.@] + */ +BOOL WINAPI IsInternetESCEnabled(void) +{ + FIXME(": stub\n"); + return FALSE; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index a1436fa..f3d6ca0 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -955,6 +955,8 @@ VOID WINAPI ColorRGBToHLS(COLORREF,LPWORD,LPWORD,LPWORD); #endif /* NO_SHLWAPI_GDI */ +/* Security functions */ +BOOL WINAPI IsInternetESCEnabled(void); /* Stream functions */ #ifndef NO_SHLWAPI_STREAM

1 0

Juan Lang : cryptui: Use add_usage_to_oid correctly.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: ba7eebfd624666f35f4c4e95fd9ce8d860830f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7eebfd624666f35f4c4e95f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 11 12:51:04 2013 -0800 cryptui: Use add_usage_to_oid correctly. Spotted by Marcus Meissner and Coverity. --- dlls/cryptui/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6481c1f..c3b0a0e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -295,7 +295,7 @@ static CERT_ENHKEY_USAGE *convert_usages_str_to_usage(LPSTR usageStr) { if (comma) *comma = 0; - add_oid_to_usage(usage, ptr); + usage = add_oid_to_usage(usage, ptr); } } return usage; @@ -323,7 +323,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) { PCCRYPT_OID_INFO *ptr; - for (ptr = usages; *ptr; ptr++) + for (ptr = usages; advancedUsage && *ptr; ptr++) { DWORD i; BOOL disabled = FALSE; @@ -334,7 +334,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) (*ptr)->pszOID)) disabled = TRUE; if (!disabled) - add_oid_to_usage(advancedUsage, + advancedUsage = add_oid_to_usage(advancedUsage, (LPSTR)(*ptr)->pszOID); } /* The individual strings are pointers to disabledUsagesStr,

1 0

Andrew Talbot : mapi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: d24dc4b884c8524cb9ccd795959ab92e084b4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24dc4b884c8524cb9ccd7959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:56 2013 +0000 mapi32: Avoid signed-unsigned integer comparisons. --- dlls/mapi32/sendmail.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index da19259..9ebb220 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -269,7 +269,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (message->nFileCount > 0) { ULONG num_attach = 0; - int i, j; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -294,6 +294,8 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (!filename) { + int j; + filename = message->lpFiles[i].lpszPathName; for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) @@ -307,7 +309,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM } } - TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), + TRACE("Attachment %u path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), debugstr_w(filename)); /* Create the attachment */ @@ -504,7 +506,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDescW filesW; - int i; + unsigned int i; filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); @@ -522,7 +524,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, /* Now free everything we allocated */ if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -623,7 +625,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { lpMapiRecipDesc recipsA; - int i; + unsigned int i; recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); @@ -638,7 +640,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDesc filesA; - int i; + unsigned int i; filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); @@ -666,7 +668,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { - int i; + unsigned int i; for (i = 0; i < message->nRecipCount; i++) { @@ -679,7 +681,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) {

1 0

Andrew Talbot : kernel32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: ac79a3f9d372949de74942cc3b7f368a23db9296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac79a3f9d372949de74942cc3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:12 2013 +0000 kernel32: Avoid signed-unsigned integer comparisons. --- dlls/kernel32/debugger.c | 3 ++- dlls/kernel32/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 528ba76..5300fb5 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -51,7 +51,8 @@ BOOL WINAPI WaitForDebugEvent( DWORD timeout) { BOOL ret; - DWORD i, res; + DWORD res; + int i; for (;;) { diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8ca4555..2e0cc8a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -445,7 +445,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) */ static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) { - int i; + unsigned int i; DWORD offset; INT locations[] = { 256, -1, -257, 512 }; @@ -548,7 +548,7 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand } else { - int i; + unsigned int i; label_len = 1 + pvd[24+32-1]; for(i=0; i<label_len && i<len; i+=2)

1 0

Alexandre Julliard : winex11: Ignore color key and exposures when using the null surface.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: bdfab8cd88b895612f9eab17a569c18736c9ae34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfab8cd88b895612f9eab17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:42:12 2013 +0100 winex11: Ignore color key and exposures when using the null surface. --- dlls/winex11.drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e91ca75..e52fbc2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2059,6 +2059,8 @@ void set_surface_color_key( struct window_surface *window_surface, COLORREF colo struct x11drv_window_surface *surface = get_x11_surface( window_surface ); COLORREF prev; + if (window_surface->funcs != &x11drv_surface_funcs) return; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); prev = surface->color_key; set_color_key( surface, color_key ); @@ -2074,6 +2076,8 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) struct x11drv_window_surface *surface = get_x11_surface( window_surface ); HRGN region = 0; + if (window_surface->funcs != &x11drv_surface_funcs) return 0; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); add_bounds_rect( &surface->bounds, rect ); if (surface->region)

1 0

Alexandre Julliard : user32: Avoid releasing a potentially null pointer.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: b7bf7f01b35c2cb3e86dbc537b98aea7d7e427d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bf7f01b35c2cb3e86dbc537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:45:43 2013 +0100 user32: Avoid releasing a potentially null pointer. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 645d563..db4881a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -180,7 +180,7 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; - release_user_handle_ptr( ptr ); + USER_Unlock(); } return ptr; } @@ -290,7 +290,7 @@ static void free_window_handle( HWND hwnd ) else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; - release_user_handle_ptr( ptr ); + USER_Unlock(); HeapFree( GetProcessHeap(), 0, ptr ); } }

1 0

Dmitry Timoshkov : winspool.drv: Turn macros into helper functions.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: da7c4ee1e59aa19ca32352e7c2156ea2669a803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c4ee1e59aa19ca32352e7c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 11 16:47:35 2013 +0800 winspool.drv: Turn macros into helper functions. --- dlls/winspool.drv/tests/info.c | 120 +++++++++++++++++++--------------------- 1 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da7c4ee1e59aa19ca3235…

1 0

Dmitry Timoshkov : wineps.drv: Add DEVMODE dumping to make debugging device state easier.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: ced916b9e709f41a385b9f2e3893cc5aa8ba28ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced916b9e709f41a385b9f2e3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 11 14:03:50 2013 +0800 wineps.drv: Add DEVMODE dumping to make debugging device state easier. --- dlls/wineps.drv/init.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 76c1c38..4b5baed 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -148,12 +148,99 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static void dump_fields(DWORD fields) +{ + int add_space = 0; + +#define CHECK_FIELD(flag) \ +do \ +{ \ + if (fields & flag) \ + { \ + if (add_space++) DPRINTF(" "); \ + TRACE(#flag); \ + fields &= ~flag; \ + } \ +} \ +while (0) + + CHECK_FIELD(DM_ORIENTATION); + CHECK_FIELD(DM_PAPERSIZE); + CHECK_FIELD(DM_PAPERLENGTH); + CHECK_FIELD(DM_PAPERWIDTH); + CHECK_FIELD(DM_SCALE); + CHECK_FIELD(DM_POSITION); + CHECK_FIELD(DM_NUP); + CHECK_FIELD(DM_DISPLAYORIENTATION); + CHECK_FIELD(DM_COPIES); + CHECK_FIELD(DM_DEFAULTSOURCE); + CHECK_FIELD(DM_PRINTQUALITY); + CHECK_FIELD(DM_COLOR); + CHECK_FIELD(DM_DUPLEX); + CHECK_FIELD(DM_YRESOLUTION); + CHECK_FIELD(DM_TTOPTION); + CHECK_FIELD(DM_COLLATE); + CHECK_FIELD(DM_FORMNAME); + CHECK_FIELD(DM_LOGPIXELS); + CHECK_FIELD(DM_BITSPERPEL); + CHECK_FIELD(DM_PELSWIDTH); + CHECK_FIELD(DM_PELSHEIGHT); + CHECK_FIELD(DM_DISPLAYFLAGS); + CHECK_FIELD(DM_DISPLAYFREQUENCY); + CHECK_FIELD(DM_ICMMETHOD); + CHECK_FIELD(DM_ICMINTENT); + CHECK_FIELD(DM_MEDIATYPE); + CHECK_FIELD(DM_DITHERTYPE); + CHECK_FIELD(DM_PANNINGWIDTH); + CHECK_FIELD(DM_PANNINGHEIGHT); + if (fields) TRACE(" %#x", fields); + TRACE("\n"); +#undef CHECK_FIELD +} + +/* Dump DEVMODE structure without a device specific part. + * Some applications and drivers fail to specify correct field + * flags (like DM_FORMNAME), so dump everything. + */ +static void dump_devmode(const DEVMODEW *dm) +{ + if (!TRACE_ON(psdrv)) return; + + TRACE("dmDeviceName: %s\n", debugstr_w(dm->dmDeviceName)); + TRACE("dmSpecVersion: 0x%04x\n", dm->dmSpecVersion); + TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); + TRACE("dmSize: 0x%04x\n", dm->dmSize); + TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); + TRACE("dmFields: 0x%04x\n", dm->dmFields); + dump_fields(dm->dmFields); + TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); + TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); + TRACE("dmPaperLength: %d\n", dm->u1.s1.dmPaperLength); + TRACE("dmPaperWidth: %d\n", dm->u1.s1.dmPaperWidth); + TRACE("dmScale: %d\n", dm->u1.s1.dmScale); + TRACE("dmCopies: %d\n", dm->u1.s1.dmCopies); + TRACE("dmDefaultSource: %d\n", dm->u1.s1.dmDefaultSource); + TRACE("dmPrintQuality: %d\n", dm->u1.s1.dmPrintQuality); + TRACE("dmColor: %d\n", dm->dmColor); + TRACE("dmDuplex: %d\n", dm->dmDuplex); + TRACE("dmYResolution: %d\n", dm->dmYResolution); + TRACE("dmTTOption: %d\n", dm->dmTTOption); + TRACE("dmCollate: %d\n", dm->dmCollate); + TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); + TRACE("dmLogPixels %u\n", dm->dmLogPixels); + TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); +} + static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { PAGESIZE *page; RESOLUTION *res; INT width = 0, height = 0, resx = 0, resy = 0; + dump_devmode(&physDev->Devmode->dmPublic); + if (physDev->Devmode->dmPublic.dmFields & (DM_PRINTQUALITY | DM_YRESOLUTION | DM_LOGPIXELS)) { if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) @@ -324,7 +411,10 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) + { + dump_devmode(initData); PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)initData, pi); + } PSDRV_UpdateDevCaps(physDev); SelectObject( (*pdev)->hdc, PSDRV_DefaultFont );

1 0

Daniel Jelinski : comctl32/listview: Better handling of custom colors in report view.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 80f70b5d85a3965d73840590bb5b38920b22fdc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f70b5d85a3965d73840590b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Feb 9 23:52:51 2013 +0100 comctl32/listview: Better handling of custom colors in report view. --- dlls/comctl32/listview.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2d75f85..1274d15 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4634,21 +4634,25 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); - /* in full row select, subitems, will just use main item's colors */ - if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - nmlvcd.clrTextBk = CLR_NONE; - /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; - /* draw the selection background, if we're drawing the main item */ - if (nSubItem == 0) - { - /* in icon mode, the label rect is really what we want to draw the - * background for */ - if (infoPtr->uView == LV_VIEW_ICON) - rcSelect = rcLabel; + /* in icon mode, the label rect is really what we want to draw the + * background for */ + /* in detail mode, we want to paint background for label rect when + * item is not selected or listview has full row select; otherwise paint + * background for text only */ + if (infoPtr->uView == LV_VIEW_ICON || + (infoPtr->uView == LV_VIEW_DETAILS && + (!(lvItem.state & LVIS_SELECTED) || + (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0))) + rcSelect = rcLabel; + if (nmlvcd.clrTextBk != CLR_NONE) + ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + + if(nSubItem == 0 && infoPtr->nFocusedItem == nItem) + { if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { /* we have to update left focus bound too if item isn't in leftmost column @@ -4671,10 +4675,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS rcSelect.right = rcBox.right; } - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); /* store new focus rectangle */ - if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; + infoPtr->rcFocus = rcSelect; } /* state icons */

1 0