May 2009 - Wine-Commits - list.winehq.org

Gerald Pfeifer : winmm/tests: Fix test in wave_out_test_deviceOut().
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: d840311f24895de98cff1188862128391cf1f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d840311f24895de98cff11888… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 24 20:16:05 2009 +0200 winmm/tests: Fix test in wave_out_test_deviceOut(). --- dlls/winmm/tests/wave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3a656ac..6430667 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -799,7 +799,7 @@ static void wave_out_test_deviceOut(int device, double duration, "The sound played for %u ms instead of %g ms\n", actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { - ok(frags[i].dwFlags=(WHDR_DONE|WHDR_PREPARED), + ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n", wave_header_flags(frags[i].dwFlags)); }

1 0

Gerald Pfeifer : user32/tests: Fix MODIFIED macro.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 551892b071219289b84f58125cf424869968379a URL: http://source.winehq.org/git/wine.git/?a=commit;h=551892b071219289b84f58125… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 24 19:47:24 2009 +0200 user32/tests: Fix MODIFIED macro. --- dlls/user32/tests/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 47f5274..a55c014 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -27,7 +27,7 @@ #include "winuser.h" #include "winerror.h" -#define MODIFIED(rect) (rect.left = 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) +#define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define SAME(rect) (rect.left = 10 && rect.right == 100 && rect.top == 10 && rect.bottom == 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top)

1 0

Alexandre Julliard : oleaut32/tests: Fix a test broken on XP 64.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 6194cf888d8f8ee9f369af72a361ba62aff86f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6194cf888d8f8ee9f369af72a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 25 11:49:08 2009 +0200 oleaut32/tests: Fix a test broken on XP 64. --- dlls/oleaut32/tests/typelib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1c1cfef..6a07a49 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1326,7 +1326,9 @@ static void test_dump_typelib(const char *name) expect_int(desc->callconv, fn_info->callconv); expect_int(desc->cParams, fn_info->cParams); expect_int(desc->cParamsOpt, fn_info->cParamsOpt); - expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*)); + ok( desc->oVft == fn_info->vtbl_index * sizeof(void*) || + broken(desc->oVft == fn_info->vtbl_index * 4), /* xp64 */ + "desc->oVft got %u\n", desc->oVft ); expect_int(desc->cScodes, fn_info->cScodes); expect_int(desc->wFuncFlags, fn_info->wFuncFlags); ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames));

1 0

André Hentschel : comctl32: Add ListView_SetCheckState and ListView_GetCheckState.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 6c915fb33639271bb6aa7ec3b273c3af750961de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c915fb33639271bb6aa7ec3b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 24 16:02:38 2009 +0200 comctl32: Add ListView_SetCheckState and ListView_GetCheckState. --- dlls/comctl32/listview.c | 1 - include/commctrl.h | 5 +++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 14f73d0..129f3cb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -137,7 +137,6 @@ * -- LVM_SORTGROUPS * * Macros: - * -- ListView_GetCheckSate, ListView_SetCheckState * -- ListView_GetHoverTime, ListView_SetHoverTime * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas diff --git a/include/commctrl.h b/include/commctrl.h index 9428d99..e39f4a2 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3724,6 +3724,11 @@ typedef struct NMLVSCROLL SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEM)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (UINT)SNDMSG((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) +#define ListView_SetCheckState(hwndLV, i, bCheck) \ + { LVITEM _LVi; _LVi.state = INDEXTOSTATEIMAGEMASK((bCheck)?2:1); _LVi.stateMask = LVIS_STATEIMAGEMASK; \ + SNDMSG(hwndLV, LVM_SETITEMSTATE, (WPARAM)(UINT)(i), (LPARAM)(LPLVITEM)&_LVi);} +#define ListView_GetCheckState(hwndLV, i) \ + (((UINT)SNDMSG((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) >> 12) - 1) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSG((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \

1 0

Alexandre Julliard : wineboot: Compain loudly if we can't find wine.inf.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 2b6b8cc8d663254c7e5a3a17d565f8e70f5f2825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6b8cc8d663254c7e5a3a17d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 25 11:48:23 2009 +0200 wineboot: Compain loudly if we can't find wine.inf. --- programs/wineboot/wineboot.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0aec488..85e2897 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -668,18 +668,22 @@ static void update_wineprefix( int force ) const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); + int fd; struct stat st; if (!inf_path) { - WINE_WARN( "cannot find path to wine.inf file\n" ); + WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", config_dir ); return; } - if (stat( inf_path, &st ) == -1) + if ((fd = open( inf_path, O_RDONLY )) == -1) { - WINE_WARN( "cannot stat wine.inf file: %s\n", strerror(errno) ); + WINE_MESSAGE( "wine: failed to update %s with %s: %s\n", + config_dir, inf_path, strerror(errno) ); goto done; } + fstat( fd, &st ); + close( fd ); if (update_timestamp( config_dir, st.st_mtime ) || force) {

1 0

Louis Lenders : wined3d: Match device name string to windows one.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: f55522ab6b55580f4bbf3eda3338e397b40d2512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55522ab6b55580f4bbf3eda3… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri May 22 22:14:58 2009 +0000 wined3d: Match device name string to windows one. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ce84cd..6bad91e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1737,7 +1737,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad strcpy(pIdentifier->Description, This->adapters[Adapter].description); /* Note dx8 doesn't supply a DeviceName */ - if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ + if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY1"); /* FIXME: May depend on desktop? */ pIdentifier->DriverVersion->u.HighPart = This->adapters[Adapter].gl_info.driver_version_hipart; pIdentifier->DriverVersion->u.LowPart = This->adapters[Adapter].gl_info.driver_version; *(pIdentifier->VendorId) = This->adapters[Adapter].gl_info.gl_vendor;

1 0

Damjan Jovanovic : winemenubuilder: Add MIME types to freedesktop.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: c1fa150cebc4c7e5685fa7f4f59ab6c453d12250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fa150cebc4c7e5685fa7f4f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 19 21:40:41 2009 +0200 winemenubuilder: Add MIME types to freedesktop. --- programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 182 +++++++++++++++++++++++++++- 2 files changed, 178 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 050b3b3..0931bdf 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemenubuilder.exe APPMODE = -mwindows -IMPORTS = uuid shell32 ole32 user32 advapi32 kernel32 +IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 kernel32 C_SRCS = \ winemenubuilder.c diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 58e84c6..2e63168 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -64,6 +64,7 @@ #endif #include <errno.h> #include <stdarg.h> +#include <fnmatch.h> #define COBJMACROS @@ -74,6 +75,7 @@ #include <appmgmt.h> #include <tlhelp32.h> #include <intshcut.h> +#include <shlwapi.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -1251,6 +1253,38 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } +static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) +{ + HRESULT hr; + WCHAR *value = NULL; + DWORD size = 0; + hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); + if (SUCCEEDED(hr)) + { + value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (value) + { + hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, value); + value = NULL; + } + } + } + return value; +} + +static char* wchars_to_utf8_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UTF8, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + static BOOL next_line(FILE *file, char **line, int *size) { int pos = 0; @@ -1316,9 +1350,17 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) if (mime_type_entry) { *pos = 0; - mime_type_entry->mimeType = line; - mime_type_entry->glob = pos + 1; - list_add_tail(mime_types, &mime_type_entry->entry); + mime_type_entry->mimeType = heap_printf("%s", line); + mime_type_entry->glob = heap_printf("%s", pos + 1); + if (mime_type_entry->mimeType && mime_type_entry->glob) + list_add_tail(mime_types, &mime_type_entry->entry); + else + { + HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); + HeapFree(GetProcessHeap(), 0, mime_type_entry->glob); + HeapFree(GetProcessHeap(), 0, mime_type_entry); + ret = FALSE; + } } else ret = FALSE; @@ -1341,6 +1383,7 @@ static void free_native_mime_types(struct list *native_mime_types) LIST_FOR_EACH_ENTRY_SAFE(mime_type_entry, mime_type_entry2, native_mime_types, struct xdg_mime_type, entry) { list_remove(&mime_type_entry->entry); + HeapFree(GetProcessHeap(), 0, mime_type_entry->glob); HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); HeapFree(GetProcessHeap(), 0, mime_type_entry); } @@ -1398,16 +1441,130 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim return ret; } +static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const char *dot_extension, + const char *mime_type, const char *comment) +{ + BOOL ret = FALSE; + char *filename; + + WINE_TRACE("writing MIME type %s, extension=%s, comment=%s\n", wine_dbgstr_a(mime_type), + wine_dbgstr_a(dot_extension), wine_dbgstr_a(comment)); + + filename = heap_printf("%s/x-wine-extension-%s.xml", packages_dir, &dot_extension[1]); + if (filename) + { + FILE *packageFile = fopen(filename, "w"); + if (packageFile) + { + fprintf(packageFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); + fprintf(packageFile, "<mime-info xmlns=\"http://www.freedesktop.org/standards/shared-mime-info\">\n"); + fprintf(packageFile, " <mime-type type=\"%s\">\n", mime_type); + fprintf(packageFile, " <glob pattern=\"*%s\"/>\n", dot_extension); + if (comment) + fprintf(packageFile, " <comment>%s</comment>\n", comment); + fprintf(packageFile, " </mime-type>\n"); + fprintf(packageFile, "</mime-info>\n"); + ret = TRUE; + fclose(packageFile); + } + else + WINE_ERR("error writing file %s\n", filename); + HeapFree(GetProcessHeap(), 0, filename); + } + else + WINE_ERR("out of memory\n"); + return ret; +} + static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { struct list *nativeMimeTypes = NULL; + LSTATUS ret = 0; + int i; + BOOL hasChanged = FALSE; if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n"); return FALSE; } - return TRUE; + + for (i = 0; ; i++) + { + WCHAR *extensionW = NULL; + DWORD size = 1024; + + do + { + HeapFree(GetProcessHeap(), 0, extensionW); + extensionW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (extensionW == NULL) + { + WINE_ERR("out of memory\n"); + ret = ERROR_OUTOFMEMORY; + break; + } + ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, i, extensionW, &size, NULL, NULL, NULL, NULL); + size *= 2; + } while (ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS && extensionW[0] == '.') + { + char *extensionA = NULL; + WCHAR *commandW = NULL; + WCHAR *friendlyDocNameW = NULL; + char *friendlyDocNameA = NULL; + WCHAR *contentTypeW = NULL; + char *mimeTypeA = NULL; + + extensionA = wchars_to_utf8_chars(extensionW); + if (extensionA == NULL) + { + WINE_ERR("out of memory\n"); + goto end; + } + + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL); + if (commandW == NULL) + /* no command -> unusable extension */ + goto end; + + friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); + if (friendlyDocNameW) + { + friendlyDocNameA = wchars_to_utf8_chars(friendlyDocNameW); + if (friendlyDocNameA == NULL) + { + WINE_ERR("out of memory\n"); + goto end; + } + } + + contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); + if (contentTypeW == NULL) + goto end; + + mimeTypeA = wchars_to_utf8_chars(contentTypeW); + if (mimeTypeA == NULL) + goto end; + + write_freedesktop_mime_type_entry(packages_dir, extensionA, mimeTypeA, friendlyDocNameA); + + end: + HeapFree(GetProcessHeap(), 0, extensionA); + HeapFree(GetProcessHeap(), 0, commandW); + HeapFree(GetProcessHeap(), 0, friendlyDocNameW); + HeapFree(GetProcessHeap(), 0, friendlyDocNameA); + HeapFree(GetProcessHeap(), 0, contentTypeW); + HeapFree(GetProcessHeap(), 0, mimeTypeA); + } + HeapFree(GetProcessHeap(), 0, extensionW); + if (ret != ERROR_SUCCESS) + break; + } + + free_native_mime_types(nativeMimeTypes); + return hasChanged; } static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) @@ -1841,6 +1998,7 @@ static void RefreshFileTypeAssociations(void) char *mime_dir = NULL; char *packages_dir = NULL; char *applications_dir = NULL; + BOOL hasChanged; hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) ) @@ -1875,7 +2033,21 @@ static void RefreshFileTypeAssociations(void) } create_directories(applications_dir); - generate_associations(xdg_data_dir, packages_dir, applications_dir); + hasChanged = generate_associations(xdg_data_dir, packages_dir, applications_dir); + if (hasChanged) + { + char *command = heap_printf("update-mime-database %s", mime_dir); + if (command) + { + system(command); + HeapFree(GetProcessHeap(), 0, command); + } + else + { + WINE_ERR("out of memory\n"); + goto end; + } + } end: if (hSem)

1 0

Nikolay Sivov : comctl32/listview: Don't hittest when it's not needed.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 0920079b69b4ba33b84a8b88ded0738517576b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920079b69b4ba33b84a8b88d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:44:26 2009 +0400 comctl32/listview: Don't hittest when it's not needed. --- dlls/comctl32/listview.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d1dc2ee..14f73d0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3401,8 +3401,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (!PtInRect(&rect, tmp)) { - NMLISTVIEW nmlv; - /* this path covers the following: 1. WM_LBUTTONDOWN over selected item (sets focus on it) 2. change focus with keys @@ -3419,15 +3417,17 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN infoPtr->nLButtonDownItem = -1; } - lvHitTestInfo.pt = infoPtr->ptClickPos; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; - nmlv.ptAction = infoPtr->ptClickPos; - if (!infoPtr->bDragging) { + NMLISTVIEW nmlv; + + lvHitTestInfo.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iItem = lvHitTestInfo.iItem; + nmlv.ptAction = infoPtr->ptClickPos; + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); infoPtr->bDragging = TRUE; }

1 0

Nikolay Sivov : comctl32/listview: Simplify key selection handler a bit.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 28bffafdf64a1316a6c3397b4397cba2234b5aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bffafdf64a1316a6c3397b4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:26:30 2009 +0400 comctl32/listview: Simplify key selection handler a bit. --- dlls/comctl32/listview.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0011b6f..d1dc2ee 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3269,18 +3269,14 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl); if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { - if (infoPtr->dwStyle & LVS_SINGLESEL) - { - bResult = TRUE; + bResult = TRUE; + + if (infoPtr->dwStyle & LVS_SINGLESEL || (wShift == 0 && wCtrl == 0)) LISTVIEW_SetSelection(infoPtr, nItem); - } else { if (wShift) - { - bResult = TRUE; LISTVIEW_SetGroupSelection(infoPtr, nItem); - } else if (wCtrl) { LVITEMW lvItem; @@ -3294,11 +3290,6 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) } bResult = LISTVIEW_SetItemFocus(infoPtr, nItem); } - else - { - bResult = TRUE; - LISTVIEW_SetSelection(infoPtr, nItem); - } } LISTVIEW_EnsureVisible(infoPtr, nItem, FALSE); }

1 0

Nikolay Sivov : comctl32/listview: Reuse cached control style.
by Alexandre Julliard May 25, 2009

May 25, 2009

Module: wine Branch: master Commit: 4527d02a4419c5f11662e0dd2aa25e1d7572d72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4527d02a4419c5f11662e0dd2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:07:29 2009 +0400 comctl32/listview: Reuse cached control style. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 677bc1e..0011b6f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9631,7 +9631,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) * The "2" is there to mimic the native control. I think it may be * related to either padding or edges. (GLA 7/2002) */ - if (!(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_HSCROLL)) + if (!(infoPtr->dwStyle & WS_HSCROLL)) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); }

1 0