wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Eric Pouech : winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell).
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e862e7d84c255fb66089831270415a89b4b0343b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e862e7d84c255fb6608983127… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:08 2008 +0200 winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell). --- programs/winhelp/hlpfile.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 4424319..815e7f1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -882,6 +882,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) long size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; + BOOL in_table = FALSE; for (paragraphptr = &page->first_paragraph; *paragraphptr; paragraphptr = &(*paragraphptr)->next) /* Nothing */; @@ -925,6 +926,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) { char type; + in_table = TRUE; ncol = *format++; WINE_TRACE("#cols %u\n", ncol); @@ -934,15 +936,17 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) format += ncol * 4; } - for (nc = 0; nc < ncol; nc++) + for (nc = 0; nc < ncol; /**/) { - WINE_TRACE("looking for format at offset %lu for column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); - if (buf[0x14] == 0x23) + WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); + if (in_table) + { + nc = GET_SHORT(format, 0); + if (nc == -1) break; format += 5; - if (buf[0x14] == 0x01) - format += 6; - else - format += 4; + } + else nc++; + format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) fetch_short(&format);

1 0

Eric Pouech : winhelp: Fix window caption index in |SYSTEM.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e0032f0ceb8cc6bb86e8d4c0cd245505f877ebf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0032f0ceb8cc6bb86e8d4c0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:03 2008 +0200 winhelp: Fix window caption index in |SYSTEM. --- programs/winhelp/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2bbc68a..4424319 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1549,7 +1549,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) else wi->type[0] = '\0'; if (flags & 0x0002) strcpy(wi->name, &str[12]); else wi->name[0] = '\0'; - if (flags & 0x0004) strcpy(wi->caption, &str[23]); + if (flags & 0x0004) strcpy(wi->caption, &str[21]); else lstrcpynA(wi->caption, hlpfile->lpszTitle, sizeof(wi->caption)); wi->origin.x = (flags & 0x0008) ? GET_USHORT(ptr, 76) : CW_USEDEFAULT; wi->origin.y = (flags & 0x0010) ? GET_USHORT(ptr, 78) : CW_USEDEFAULT;

1 0

Eric Pouech : winhelp: Properly handle the back button (in multiple windows , in empty stack...).
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ccd75350dde23805d82000a9c290cf5d584cdded URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd75350dde23805d82000a9c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:57 2008 +0200 winhelp: Properly handle the back button (in multiple windows, in empty stack...). --- programs/winhelp/macro.c | 12 +----------- programs/winhelp/winhelp.c | 22 +++++++++++++++++++--- programs/winhelp/winhelp.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index ca11b5a..877d33f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -230,17 +230,7 @@ void CALLBACK MACRO_BackFlush(void) WINE_TRACE("()\n"); - if (win) - { - unsigned int i; - - for (i = 0; i < win->back.index; i++) - { - HLPFILE_FreeHlpFile(win->back.set[i].page->file); - win->back.set[i].page = NULL; - } - win->back.index = 0; - } + if (win) WINHELP_DeleteBackSet(win); } void CALLBACK MACRO_BookmarkDefine(void) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 2011d2a..a33c470 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -549,6 +549,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) wpage->wininfo->size.cy != CW_USEDEFAULT) SetWindowPos(win->hMainWnd, HWND_TOP, 0, 0, wpage->wininfo->size.cx, wpage->wininfo->size.cy, SWP_NOMOVE); + if (wpage->page && wpage->page->file != win->page->file) + WINHELP_DeleteBackSet(win); WINHELP_InitFonts(win->hMainWnd); win->page = wpage->page; @@ -1814,6 +1816,22 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW* win) win->first_button = NULL; } +/****************************************************************** + * WINHELP_DeleteBackSet + * + */ +void WINHELP_DeleteBackSet(WINHELP_WINDOW* win) +{ + unsigned int i; + + for (i = 0; i < win->back.index; i++) + { + HLPFILE_FreeHlpFile(win->back.set[i].page->file); + win->back.set[i].page = NULL; + } + win->back.index = 0; +} + /*********************************************************************** * * WINHELP_DeleteWindow @@ -1821,7 +1839,6 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW* win) static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; - unsigned int i; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -1846,8 +1863,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) DeleteObject(win->hBrush); - for (i = 0; i < win->back.index; i++) - HLPFILE_FreeHlpFile(win->back.set[i].page->file); + WINHELP_DeleteBackSet(win); if (win->page) HLPFILE_FreeHlpFile(win->page->file); WINHELP_DeleteLines(win); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 5b23994..f1f67d2 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -183,6 +183,7 @@ BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); +void WINHELP_DeleteBackSet(WINHELP_WINDOW*); INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);

1 0

Eric Pouech : winhelp: Present correctly the history when dealing with multiple files.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: d95bcb73a9a06a6985fe33c31b98d4ebccf0c1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95bcb73a9a06a6985fe33c31… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:51 2008 +0200 winhelp: Present correctly the history when dealing with multiple files. --- programs/winhelp/winhelp.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index e5860fa..2011d2a 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -481,14 +481,11 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) { - unsigned i, num; + unsigned num; /* FIXME: when using back, we shouldn't update the history... */ - for (i = 0; i < Globals.history.index; i++) - if (Globals.history.set[i].page == page) break; - - /* if the new page is already in the history, do nothing */ - if (i == Globals.history.index) + /* add to history only if different from top of history */ + if (!Globals.history.index || Globals.history.set[0].page != page) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); /* we're full, remove latest entry */ @@ -503,8 +500,8 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) Globals.history.set[0].wininfo = win->info; Globals.history.index++; page->file->wRefCount++; - if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); } + if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); num = sizeof(win->back.set) / sizeof(win->back.set[0]); if (win->back.index == num) @@ -1298,9 +1295,31 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara for (i = 0; i < Globals.history.index; i++) { - TextOut(hDc, 0, i * tm.tmHeight, - Globals.history.set[i].page->lpszTitle, - strlen(Globals.history.set[i].page->lpszTitle)); + if (Globals.history.set[i].page->file == Globals.active_win->page->file) + { + TextOut(hDc, 0, i * tm.tmHeight, + Globals.history.set[i].page->lpszTitle, + strlen(Globals.history.set[i].page->lpszTitle)); + } + else + { + char buffer[1024]; + const char* ptr1; + const char* ptr2; + unsigned len; + + ptr1 = strrchr(Globals.history.set[i].page->file->lpszPath, '\\'); + if (!ptr1) ptr1 = Globals.history.set[i].page->file->lpszPath; + else ptr1++; + ptr2 = strrchr(ptr1, '.'); + len = ptr2 ? ptr2 - ptr1 : strlen(ptr1); + if (len > sizeof(buffer)) len = sizeof(buffer); + memcpy(buffer, ptr1, len); + if (len < sizeof(buffer)) buffer[len++] = ':'; + strncpy(&buffer[len], Globals.history.set[i].page->lpszTitle, sizeof(buffer) - len); + buffer[sizeof(buffer) - 1] = '\0'; + TextOut(hDc, 0, i * tm.tmHeight, buffer, strlen(buffer)); + } } EndPaint(hWnd, &ps); break;

1 0

Eric Pouech : winhelp: Store the history in correct order.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: db5902baeeb24d926b6351ed55eccf4be35e9988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5902baeeb24d926b6351ed5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:45 2008 +0200 winhelp: Store the history in correct order. --- programs/winhelp/winhelp.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index e0f2532..e5860fa 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -491,16 +491,17 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) if (i == Globals.history.index) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); + /* we're full, remove latest entry */ if (Globals.history.index == num) { - /* we're full, remove latest entry */ - HLPFILE_FreeHlpFile(Globals.history.set[0].page->file); - memmove(&Globals.history.set[0], &Globals.history.set[1], - (num - 1) * sizeof(Globals.history.set[0])); + HLPFILE_FreeHlpFile(Globals.history.set[num - 1].page->file); Globals.history.index--; } - Globals.history.set[Globals.history.index].page = page; - Globals.history.set[Globals.history.index++].wininfo = win->info; + memmove(&Globals.history.set[1], &Globals.history.set[0], + Globals.history.index * sizeof(Globals.history.set[0])); + Globals.history.set[0].page = page; + Globals.history.set[0].wininfo = win->info; + Globals.history.index++; page->file->wRefCount++; if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); } @@ -1297,7 +1298,8 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara for (i = 0; i < Globals.history.index; i++) { - TextOut(hDc, 0, i * tm.tmHeight, Globals.history.set[i].page->lpszTitle, + TextOut(hDc, 0, i * tm.tmHeight, + Globals.history.set[i].page->lpszTitle, strlen(Globals.history.set[i].page->lpszTitle)); } EndPaint(hWnd, &ps);

1 0

Eric Pouech : winhelp: Added the notion of WINHELP_WNDPAGE and use it to move the history to the global variables .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 6d40dbe3da1cecd770961b633e326a375396a9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d40dbe3da1cecd770961b633… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:38 2008 +0200 winhelp: Added the notion of WINHELP_WNDPAGE and use it to move the history to the global variables. --- programs/winhelp/macro.c | 39 ++++++------ programs/winhelp/winhelp.c | 144 ++++++++++++++++++++++---------------------- programs/winhelp/winhelp.h | 22 +++++-- 3 files changed, 109 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d40dbe3da1cecd770961…

1 0

Eric Pouech : winhelp: Get rid of the reuse concept for Windows and refactor the code a bit for window creation / deletion.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7a608ea627612f83339ebb6adeacd491478145d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a608ea627612f83339ebb6ad… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:31 2008 +0200 winhelp: Get rid of the reuse concept for Windows and refactor the code a bit for window creation / deletion. --- programs/winhelp/winhelp.c | 259 ++++++++++++++++++++------------------------ 1 files changed, 118 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a608ea627612f83339eb…

1 0

Dan Kegel : winecfg: Restrict dpi slider to sane values.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: faaccca59be08be547ec4e1948b6306eff3808a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaccca59be08be547ec4e194… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Apr 22 17:56:36 2008 -0700 winecfg: Restrict dpi slider to sane values. --- programs/winecfg/x11drvdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index bfa6ec5..c0ec058 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -35,9 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); -#define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ +#define RES_MAXLEN 5 /* max number of digits in a screen dimension. 5 digits should be plenty */ #define MINDPI 96 -#define MAXDPI 480 +#define MAXDPI 144 /* making this too high surprises and hurts users */ #define DEFDPI 96 #define IDT_DPIEDIT 0x1234

1 0

Dan Hipschman : wininet: Remove custom content-length/ type headers from redirects.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a1ebffb4527e083d3a39762851fbc3d76b5ecfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ebffb4527e083d3a3976285… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 22 15:48:28 2008 -0700 wininet: Remove custom content-length/type headers from redirects. --- dlls/wininet/http.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c47a994..3f50d5c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2861,10 +2861,13 @@ static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) */ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { + static const WCHAR szContentType[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + static const WCHAR szContentLength[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[INTERNET_MAX_URL_LENGTH]; + int index; if(lpszUrl[0]=='/') { @@ -3051,6 +3054,14 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) } } + /* Remove custom content-type/length headers on redirects. */ + index = HTTP_GetCustomHeaderIndex(lpwhr, szContentType, 0, TRUE); + if (0 <= index) + HTTP_DeleteCustomHeader(lpwhr, index); + index = HTTP_GetCustomHeaderIndex(lpwhr, szContentLength, 0, TRUE); + if (0 <= index) + HTTP_DeleteCustomHeader(lpwhr, index); + return TRUE; }

1 0

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 34480aef09a6aa840d93f5eb4325db22fcd15bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34480aef09a6aa840d93f5eb4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:56 2008 +0100 netapi32: Remove unused variable. --- dlls/netapi32/wksta.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 1eb22d6..6914d02 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -348,7 +348,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, { PWKSTA_USER_INFO_1 ui; PWKSTA_USER_INFO_0 ui0; - DWORD dwSize; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; @@ -405,7 +404,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, oth_domains_sz * sizeof(WCHAR)); /* get data */ - dwSize = username_sz; lstrcpyW(ui->wkui1_username, ui0->wkui0_username); NetApiBufferFree(ui0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008