June 2009 - Wine-commits - list.winehq.org

Eric Pouech : winhlp32: Window name lookup is supposed to be insensitive.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: a6104304f43129cf753756a26216180cae4d3124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6104304f43129cf753756a26… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:52 2009 +0200 winhlp32: Window name lookup is supposed to be insensitive. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 9c69d48..e361335 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -261,7 +261,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) if (hlpfile) for (i = 0; i < hlpfile->numWindows; i++) - if (!strcmp(hlpfile->windows[i].name, name)) + if (!lstrcmpi(hlpfile->windows[i].name, name)) return &hlpfile->windows[i]; if (strcmp(name, "main") != 0)

1 0

Eric Pouech : winhlp32: Remove the lpszName field from the window structure , as it's given by the window info.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: e3beef0af592100ae7495e1adcfe032eeaf6eab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3beef0af592100ae7495e1ad… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:26:58 2009 +0200 winhlp32: Remove the lpszName field from the window structure, as it's given by the window info. --- programs/winhlp32/macro.c | 6 +++--- programs/winhlp32/winhelp.c | 13 ++++--------- programs/winhlp32/winhelp.h | 2 -- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 9a7f3fd..3383545 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -280,7 +280,7 @@ static void CALLBACK MACRO_CloseSecondarys(void) WINE_TRACE("()\n"); for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && lstrcmpi(win->lpszName, "main")) + if (lstrcmpi(win->info->name, "main")) DestroyWindow(win->hMainWnd); } @@ -293,7 +293,7 @@ static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && !lstrcmpi(win->lpszName, lpszWindow)) + if (!lstrcmpi(win->info->name, lpszWindow)) DestroyWindow(win->hMainWnd); } @@ -430,7 +430,7 @@ static void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow) if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; for (win = Globals.win_list; win; win = win->next) - if (win->lpszName && !lstrcmpi(win->lpszName, lpszWindow)) + if (!lstrcmpi(win->info->name, lpszWindow)) SetFocus(win->hMainWnd); } diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index e361335..8e6ba50 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -257,7 +257,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) unsigned int i; if (!name || !name[0]) - name = Globals.active_win->lpszName; + name = Globals.active_win->info->name; if (hlpfile) for (i = 0; i < hlpfile->numWindows; i++) @@ -645,7 +645,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe { WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; - LPSTR name; HICON hIcon; HWND hTextWnd = NULL; @@ -656,7 +655,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe { for (win = Globals.win_list; win; win = win->next) { - if (!lstrcmpi(win->lpszName, wpage->wininfo->name)) + if (!lstrcmpi(win->info->name, wpage->wininfo->name)) { POINT pt = {0, 0}; SIZE sz = {0, 0}; @@ -699,15 +698,11 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe if (!win) { /* Initialize WINHELP_WINDOW struct */ - win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(WINHELP_WINDOW) + strlen(wpage->wininfo->name) + 1); + win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINHELP_WINDOW)); if (!win) return FALSE; win->next = Globals.win_list; Globals.win_list = win; - name = (char*)win + sizeof(WINHELP_WINDOW); - lstrcpy(name, wpage->wininfo->name); - win->lpszName = name; win->hHandCur = LoadCursorW(0, (LPWSTR)IDC_HAND); win->back.index = 0; win->font_scale = 1; @@ -1496,7 +1491,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { BOOL bExit; win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); + bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); WINHELP_DeleteWindow(win); if (bExit) MACRO_Exit(); diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index 994547b..70e2dc2 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -71,8 +71,6 @@ typedef struct tagPageSet typedef struct tagWinHelp { - LPCSTR lpszName; - WINHELP_BUTTON* first_button; HLPFILE_PAGE* page;

1 0

Eric Pouech : winhlp32: Now manage windows with refcounts.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 82ffc04ef3b98c0cdc70b0c4ad373dd569c4c082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ffc04ef3b98c0cdc70b0c4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:27:04 2009 +0200 winhlp32: Now manage windows with refcounts. --- programs/winhlp32/macro.c | 6 ++-- programs/winhlp32/macro.lex.l | 3 +- programs/winhlp32/winhelp.c | 67 +++++++++++++++++++++++++++++++---------- programs/winhlp32/winhelp.h | 3 ++ 4 files changed, 59 insertions(+), 20 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 3383545..c2fc3cc 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -281,7 +281,7 @@ static void CALLBACK MACRO_CloseSecondarys(void) WINE_TRACE("()\n"); for (win = Globals.win_list; win; win = win->next) if (lstrcmpi(win->info->name, "main")) - DestroyWindow(win->hMainWnd); + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) @@ -294,7 +294,7 @@ static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) for (win = Globals.win_list; win; win = win->next) if (!lstrcmpi(win->info->name, lpszWindow)) - DestroyWindow(win->hMainWnd); + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_Compare(LPCSTR str) @@ -367,7 +367,7 @@ void CALLBACK MACRO_Exit(void) WINE_TRACE("()\n"); while (Globals.win_list) - DestroyWindow(Globals.win_list->hMainWnd); + WINHELP_ReleaseWindow(Globals.win_list); } static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u) diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index bf65fa0..67926cb 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -285,7 +285,7 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) memset(lex_data, 0, sizeof(*lex_data)); lex_data->macroptr = macro; - lex_data->window = window; + lex_data->window = WINHELP_GrabWindow(window); while ((t = yylex()) != EMPTY) { @@ -316,6 +316,7 @@ done: for (t = 0; t < lex_data->cache_used; t++) HeapFree(GetProcessHeap(), 0, lex_data->cache_string[t]); lex_data = prev_lex_data; + WINHELP_ReleaseWindow(window); return ret; } diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 8e6ba50..027bf65 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -500,11 +500,39 @@ static void WINHELP_DeletePageLinks(HLPFILE_PAGE* page) /*********************************************************************** * + * WINHELP_GrabWindow + */ +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Grab %p#%d++\n", win, win->ref_count); + win->ref_count++; + return win; +} + +/*********************************************************************** + * + * WINHELP_RelaseWindow + */ +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Release %p#%d--\n", win, win->ref_count); + + if (!--win->ref_count) + { + DestroyWindow(win->hMainWnd); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * * WINHELP_DeleteWindow */ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; + BOOL bExit; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -514,6 +542,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) break; } } + bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); if (Globals.active_win == win) { @@ -537,6 +566,10 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) if (win->page) HLPFILE_FreeHlpFile(win->page->file); HeapFree(GetProcessHeap(), 0, win); + + if (bExit) MACRO_Exit(); + if (!Globals.win_list) + PostQuitMessage(0); } static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage) @@ -706,9 +739,11 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe win->hHandCur = LoadCursorW(0, (LPWSTR)IDC_HAND); win->back.index = 0; win->font_scale = 1; + WINHELP_GrabWindow(win); } win->page = wpage->page; win->info = wpage->wininfo; + WINHELP_GrabWindow(win); if (!bPopup && wpage->page && remember) { @@ -772,6 +807,14 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe for (macro = wpage->page->first_macro; macro; macro = macro->next) MACRO_ExecuteMacro(win, macro->lpszMacro); } + /* See #17681, in some cases, the newly created window is closed by the macros it contains + * (braindead), so deal with this case + */ + for (win = Globals.win_list; win; win = win->next) + { + if (!lstrcmpi(win->info->name, wpage->wininfo->name)) break; + } + if (!win || !WINHELP_ReleaseWindow(win)) return TRUE; if (bPopup) { @@ -883,7 +926,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam */ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT* lret) { - HWND hPopup; + WINHELP_WINDOW* popup; if (!Globals.active_popup) return FALSE; @@ -916,9 +959,9 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: - hPopup = Globals.active_popup->hMainWnd; + popup = Globals.active_popup; Globals.active_popup = NULL; - DestroyWindow(hPopup); + WINHELP_ReleaseWindow(popup); return TRUE; } return FALSE; @@ -1422,7 +1465,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, switch (msgf->msg) { case WM_KEYUP: - if (msgf->wParam == VK_ESCAPE) DestroyWindow(hWnd); + if (msgf->wParam == VK_ESCAPE) + WINHELP_ReleaseWindow((WINHELP_WINDOW*)GetWindowLongPtr(hWnd, 0)); break; case WM_RBUTTONDOWN: { @@ -1486,18 +1530,9 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); break; - - case WM_NCDESTROY: - { - BOOL bExit; - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); - WINHELP_DeleteWindow(win); - - if (bExit) MACRO_Exit(); - if (!Globals.win_list) - PostQuitMessage(0); - } + case WM_DESTROY: + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + WINHELP_DeleteWindow(win); break; } return DefWindowProc(hWnd, msg, wParam, lParam); diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index 70e2dc2..e770cb5 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -71,6 +71,7 @@ typedef struct tagPageSet typedef struct tagWinHelp { + unsigned ref_count; WINHELP_BUTTON* first_button; HLPFILE_PAGE* page; @@ -151,6 +152,8 @@ void WINHELP_DeleteBackSet(WINHELP_WINDOW*); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW*); +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW*); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[];

1 0

Stefan Leichter : kernel32: Fix spec of QueryFullProcessImageNameW.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: d56839f64ec7774bcc3f38c60efd0af205499b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56839f64ec7774bcc3f38c60… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun May 31 19:52:33 2009 +0200 kernel32: Fix spec of QueryFullProcessImageNameW. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a73ea1b..b555621 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -866,7 +866,7 @@ @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) @ stub QueryFullProcessImageNameA -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +@ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) @ stdcall QueryInformationJobObject(long long ptr long ptr) # @ stub QueryMemoryResourceNotification @ stub QueryNumberOfEventLogRecords

1 0

Nikolay Sivov : comctl32/listview: Item horizontal position isn' t applied for any item bounds on LVS_REPORT.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 8cf54c5645bdbd9991de3f4b87f9bced0dfde69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf54c5645bdbd9991de3f4b8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat May 30 01:43:18 2009 +0400 comctl32/listview: Item horizontal position isn't applied for any item bounds on LVS_REPORT. --- dlls/comctl32/listview.c | 6 +-- dlls/comctl32/tests/listview.c | 66 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1c84f02..7c1aee2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2158,7 +2158,7 @@ calc_label: } /************************************************************/ - /* compute STATEICON bounding box */ + /* compute SELECT bounding box */ /************************************************************/ if (doSelectBox) { @@ -5928,7 +5928,6 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT BOOL doLabel = TRUE, oversizedBox = FALSE; POINT Position, Origin; LVITEMW lvItem; - INT type; TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc); @@ -5963,7 +5962,6 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lvItem.state = (oversizedBox ? LVIS_FOCUSED : 0); } - type = lprc->left; if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS) lprc->left = LVIR_BOUNDS; switch(lprc->left) @@ -5989,7 +5987,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT return FALSE; } - if ((uView == LVS_REPORT) && (type == LVIR_BOUNDS)) + if (uView == LVS_REPORT) OffsetRect(lprc, Origin.x, Position.y + Origin.y); else OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 217c2ee..b6a44c8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2597,6 +2597,8 @@ static void test_columnscreation(void) static void test_getitemrect(void) { HWND hwnd; + HIMAGELIST himl; + HBITMAP hbm; RECT rect; DWORD r; LVITEMA item; @@ -2650,7 +2652,24 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* padding */ - todo_wine expect(2, rect.left); + expect(2, rect.left); + + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, column width */ + expect(2, rect.left); + expect(50, rect.right); + + /* no icons attached */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding */ + expect(2, rect.left); + expect(2, rect.right); /* change order */ order[0] = 1; order[1] = 0; @@ -2677,6 +2696,51 @@ static void test_getitemrect(void) /* column width + padding */ todo_wine expect(102, rect.left); + /* back to initial order */ + order[0] = 0; order[1] = 1; + r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 2, (LPARAM)&order); + expect(TRUE, r); + + /* state icons */ + himl = ImageList_Create(16, 16, 0, 2, 2); + ok(himl != NULL, "failed to create imagelist\n"); + hbm = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbm != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbm, 0); + ok(r == 0, "should be zero\n"); + hbm = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbm != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbm, 0); + ok(r == 1, "should be one\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1); + item.stateMask = LVIS_STATEIMAGEMASK; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + stateicon width */ + expect(18, rect.left); + expect(18, rect.right); + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + stateicon width -> column width */ + expect(18, rect.left); + expect(50, rect.right); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Fix item bounds calculation for LVS_REPORT style.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 551bb4784a6aa01c049e513326ddaf759c750290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551bb4784a6aa01c049e51332… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat May 30 20:11:00 2009 +0400 comctl32/listview: Fix item bounds calculation for LVS_REPORT style. --- dlls/comctl32/listview.c | 16 +++---- dlls/comctl32/tests/listview.c | 86 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7c1aee2..a1aa250 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2045,7 +2045,11 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW Icon.left = Box.left + state_width; if (uView == LVS_REPORT && lpLVItem->iSubItem == 0) - Icon.left += REPORT_MARGINX; + { + /* we need the indent in report mode */ + assert(lpLVItem->mask & LVIF_INDENT); + Icon.left += infoPtr->iconSize.cx * lpLVItem->iIndent + REPORT_MARGINX; + } Icon.top = Box.top; Icon.right = Icon.left; @@ -2164,16 +2168,10 @@ calc_label: { if (uView == LVS_REPORT) { - SelectBox.left = Icon.right; /* FIXME: should be Icon.left */ + SelectBox.left = Icon.left; SelectBox.top = Box.top; SelectBox.bottom = Box.bottom; - if (lpLVItem->iSubItem == 0) - { - /* we need the indent in report mode */ - assert(lpLVItem->mask & LVIF_INDENT); - SelectBox.left += infoPtr->iconSize.cx * lpLVItem->iIndent; - } - SelectBox.right = min(SelectBox.left + labelSize.cx, Label.right); + SelectBox.right = min(Label.left + labelSize.cx, Label.right); } else { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b6a44c8..42b9df6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2741,6 +2741,92 @@ static void test_getitemrect(void) expect(18, rect.left); expect(50, rect.right); + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + ok(r != 0, "should return current list handle\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_STATE | LVIF_IMAGE; + item.iImage = 1; + item.state = 0; + item.stateMask = ~0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, icon width */ + expect(2, rect.left); + expect(18, rect.right); + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + icon width -> column width */ + expect(18, rect.left); + expect(50, rect.right); + + /* select bounds */ + rect.left = LVIR_SELECTBOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, column width */ + expect(2, rect.left); + todo_wine expect(50, rect.right); + + /* try with indentation */ + item.mask = LVIF_INDENT; + item.iIndent = 1; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* bounds */ + rect.left = LVIR_BOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width, column width */ + expect(0, rect.left); + expect(150, rect.right); + + /* select bounds */ + rect.left = LVIR_SELECTBOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width, column width */ + expect(2 + 16, rect.left); + todo_wine expect(50, rect.right); + + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 2 icon widths, column width */ + expect(2 + 16*2, rect.left); + expect(50, rect.right); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width indentation, icon width */ + expect(2 + 16, rect.left); + expect(34, rect.right); + + DestroyWindow(hwnd); }

1 0

Alexandre Julliard : configure: Add checks for fnmatch support.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 7d5e565b5a114de6d9e5a1a44d3ef73ed4bca6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5e565b5a114de6d9e5a1a44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 12:51:54 2009 +0200 configure: Add checks for fnmatch support. --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ programs/winemenubuilder/winemenubuilder.c | 6 ++++++ 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 52a8130..4ed22e0 100755 --- a/configure +++ b/configure @@ -5780,6 +5780,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -5799,6 +5800,7 @@ for ac_header in \ dlfcn.h \ elf.h \ float.h \ + fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ grp.h \ @@ -17988,6 +17990,7 @@ CFLAGS="$CFLAGS $BUILTINFLAG" + for ac_func in \ _pclose \ _popen \ @@ -18005,6 +18008,7 @@ for ac_func in \ epoll_create \ ffs \ finite \ + fnmatch \ fork \ fpclass \ fstatfs \ diff --git a/configure.ac b/configure.ac index beccbbd..2185331 100644 --- a/configure.ac +++ b/configure.ac @@ -275,6 +275,7 @@ AC_CHECK_HEADERS(\ dlfcn.h \ elf.h \ float.h \ + fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ grp.h \ @@ -1476,6 +1477,7 @@ AC_CHECK_FUNCS(\ epoll_create \ ffs \ finite \ + fnmatch \ fork \ fpclass \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index c22d1f7..a36d1fb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -93,6 +93,12 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H +/* Define to 1 if you have the `fnmatch' function. */ +#undef HAVE_FNMATCH + +/* Define to 1 if you have the <fnmatch.h> header file. */ +#undef HAVE_FNMATCH_H + /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ #undef HAVE_FONTCONFIG_FONTCONFIG_H diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2e87ca5..a86d207 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -64,7 +64,9 @@ #endif #include <errno.h> #include <stdarg.h> +#ifdef HAVE_FNMATCH_H #include <fnmatch.h> +#endif #define COBJMACROS @@ -1444,6 +1446,7 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim static BOOL match_glob(struct list *native_mime_types, const char *extension, char **match) { +#ifdef HAVE_FNMATCH struct xdg_mime_type *mime_type_entry; int matchLength = 0; @@ -1467,6 +1470,9 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, if (*match == NULL) return FALSE; } +#else + *match = NULL; +#endif return TRUE; }

1 0

Vincent Povirk : ole32: Add some tests for read only storage objects.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 5aab52c9778d3a73e17b636dc3100c058b4da19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aab52c9778d3a73e17b636dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:27:30 2009 -0500 ole32: Add some tests for read only storage objects. --- dlls/ole32/tests/storage32.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index da2d0aa..7d4fb30 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1267,6 +1267,86 @@ static void test_access(void) DeleteFileA("winetest"); } +void test_readonly(void) +{ + IStorage *stg, *stg2, *stg3; + IStream *stream; + HRESULT hr; + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR storageW[] = {'s','t','o','r','a','g','e',0}; + static const WCHAR streamW[] = {'s','t','r','e','a','m',0}; + + hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStorage( stg, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stg2 ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stream ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); + IStorage_Release(stg2); + } + IStorage_Release(stg); + } + + /* re-open read only */ + hr = StgOpenStorage( fileW, NULL, STGM_TRANSACTED | STGM_SHARE_DENY_NONE | STGM_READ, NULL, 0, &stg); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStorage_OpenStorage( stg, storageW, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, NULL, 0, &stg2 ); + ok(hr == S_OK, "should succeed, res=%x\n", hr); + if (SUCCEEDED(hr)) + { +#if 0 /* crashes on Wine */ + /* CreateStream on read-only storage, name exists */ + hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); +#endif + + /* CreateStream on read-only storage, name does not exist */ + hr = IStorage_CreateStream( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stream); + +#if 0 /* crashes on Wine */ + /* CreateStorage on read-only storage, name exists */ + hr = IStorage_CreateStorage( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); + ok(hr == STG_E_FILEALREADYEXISTS, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stg3); +#endif + + /* CreateStorage on read-only storage, name does not exist */ + hr = IStorage_CreateStorage( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); + ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + if (SUCCEEDED(hr)) + IStream_Release(stg3); + + /* DestroyElement on read-only storage, name exists */ + hr = IStorage_DestroyElement( stg2, streamW ); + todo_wine ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + + /* DestroyElement on read-only storage, name does not exist */ + hr = IStorage_DestroyElement( stg2, storageW ); + todo_wine ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); + } + + DeleteFileA("winetest"); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -1280,4 +1360,5 @@ START_TEST(storage32) test_ReadClassStm(); test_access(); test_writeclassstg(); + test_readonly(); }

1 0

Vincent Povirk : ole32: Fix crash when calling CreateStream on read only storage.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 4a0901fb87a6272b65f69529411fe039f1c3e665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0901fb87a6272b65f695294… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:30:56 2009 -0500 ole32: Fix crash when calling CreateStream on read only storage. --- dlls/ole32/storage32.c | 4 ++++ dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 748eac8..d68f09f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -979,6 +979,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( (grfMode & STGM_TRANSACTED)) return STG_E_INVALIDFUNCTION; + /* Can't create a stream on read-only storage */ + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + return STG_E_ACCESSDENIED; + /* * Check that we're compatible with the parent's storage mode * if not in transacted mode diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7d4fb30..f932765 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1302,13 +1302,11 @@ void test_readonly(void) ok(hr == S_OK, "should succeed, res=%x\n", hr); if (SUCCEEDED(hr)) { -#if 0 /* crashes on Wine */ /* CreateStream on read-only storage, name exists */ hr = IStorage_CreateStream( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream ); ok(hr == STG_E_ACCESSDENIED, "should fail, res=%x\n", hr); if (SUCCEEDED(hr)) IStream_Release(stream); -#endif /* CreateStream on read-only storage, name does not exist */ hr = IStorage_CreateStream( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stream );

1 0

Vincent Povirk : ole32: Fix crash when calling CreateStorage on read only storage.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 93a155381fe3dbba61ac7e367e060cdf7f873bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a155381fe3dbba61ac7e367… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 29 16:40:15 2009 -0500 ole32: Fix crash when calling CreateStorage on read only storage. --- dlls/ole32/storage32.c | 3 ++- dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d68f09f..9f3930e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1230,7 +1230,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( /* * An element with this name already exists */ - if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) + if (STGM_CREATE_MODE(grfMode) == STGM_CREATE && + STGM_ACCESS_MODE(This->base.openFlags) != STGM_READ) IStorage_DestroyElement(iface, pwcsName); else { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index f932765..84c4b0f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1314,13 +1314,11 @@ void test_readonly(void) if (SUCCEEDED(hr)) IStream_Release(stream); -#if 0 /* crashes on Wine */ /* CreateStorage on read-only storage, name exists */ hr = IStorage_CreateStorage( stg2, streamW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 ); ok(hr == STG_E_FILEALREADYEXISTS, "should fail, res=%x\n", hr); if (SUCCEEDED(hr)) IStream_Release(stg3); -#endif /* CreateStorage on read-only storage, name does not exist */ hr = IStorage_CreateStorage( stg2, storageW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READ, 0, 0, &stg3 );

1 0