September 2011 - Wine-Commits

Erich Hoover : hhctrl.ocx: When called as a program, quit when HtmlHelp call fails.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 4cf842e75ddd77898070c2ebcbb16d82d5716678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf842e75ddd77898070c2ebc… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:02:32 2011 -0600 hhctrl.ocx: When called as a program, quit when HtmlHelp call fails. --- dlls/hhctrl.ocx/hhctrl.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 400f920..7647abb 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -349,6 +349,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) int len, buflen, mapid = -1; WCHAR *filename; char *endq = NULL; + HWND hwnd; hh_process = TRUE; @@ -404,12 +405,18 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) /* Open a specific help topic */ if(mapid != -1) - HtmlHelpW(GetDesktopWindow(), filename, HH_HELP_CONTEXT, mapid); + hwnd = HtmlHelpW(GetDesktopWindow(), filename, HH_HELP_CONTEXT, mapid); else - HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); + hwnd = HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); heap_free(filename); + if (!hwnd) + { + ERR("Failed to open HTML Help file '%s'.\n", szCmdLine); + return 0; + } + while (GetMessageW(&msg, 0, 0, 0)) { TranslateMessage(&msg);

1 0

Erich Hoover : hhctrl.ocx: Use the correct values for current_tab when some tabs are disabled.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 3228b4d1c3a0edca8ac061dc7882ea0255355684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3228b4d1c3a0edca8ac061dc7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:00:10 2011 -0600 hhctrl.ocx: Use the correct values for current_tab when some tabs are disabled. --- dlls/hhctrl.ocx/help.c | 19 ++++++++++++++++++- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d710d3b..fb9ea08 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -448,6 +448,7 @@ static LRESULT Child_OnSize(HWND hwnd) static LRESULT OnTabChange(HWND hwnd) { HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + int tab_id, tab_index, i; TRACE("%p\n", hwnd); @@ -457,7 +458,23 @@ static LRESULT OnTabChange(HWND hwnd) if(info->tabs[info->current_tab].hwnd) ShowWindow(info->tabs[info->current_tab].hwnd, SW_HIDE); - info->current_tab = SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0); + tab_id = (int) SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0); + /* convert the ID of the tab to an index in our tab list */ + tab_index = -1; + for (i=0; i<TAB_NUMTABS; i++) + { + if (info->tabs[i].id == tab_id) + { + tab_index = i; + break; + } + } + if (tab_index == -1) + { + FIXME("Tab ID %d does not correspond to a valid index in the tab list.\n", tab_id); + return 0; + } + info->current_tab = tab_index; if(info->tabs[info->current_tab].hwnd) ShowWindow(info->tabs[info->current_tab].hwnd, SW_SHOW); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 8e63545..3e496f9 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -111,6 +111,7 @@ typedef struct CHMInfo #define TAB_INDEX 1 #define TAB_SEARCH 2 #define TAB_FAVORITES 3 +#define TAB_NUMTABS TAB_FAVORITES typedef struct { HWND hwnd;

1 0

Frédéric Delanoy : cmd: Get rid of unused parameter in WCMD_ReadFile.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 29b57ca82d69ef1195c1fd1655d9b42b410b52d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b57ca82d69ef1195c1fd165… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:22 2011 +0200 cmd: Get rid of unused parameter in WCMD_ReadFile. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 29 +++++++++++------------------ programs/cmd/wcmd.h | 3 +-- programs/cmd/wcmdmain.c | 11 ++++------- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09bb9c4..447eccd 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -197,7 +197,7 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) /* TODO: More intelligent buffering for reading lines from files */ do { - status = WCMD_ReadFile (h, s, 1, &bytes, NULL); + status = WCMD_ReadFile(h, s, 1, &bytes); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL; if (*s == '\n') bytes = 0; else if (*s != '\r') { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b7900fc..ca0d4fe 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -115,8 +115,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, WCMD_output_asis (Abuffer); } WCMD_output_asis (endBkt); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, - sizeof(answer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); answer[0] = toupperW(answer[0]); } @@ -306,7 +305,7 @@ void WCMD_choice (const WCHAR * command) { while (TRUE) { /* FIXME: Add support for option /T */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count); if (!opt_s) answer[0] = toupperW(answer[0]); @@ -1697,8 +1696,7 @@ void WCMD_pause (void) { WCHAR string[32]; WCMD_output (anykey); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } /**************************************************************************** @@ -2146,8 +2144,7 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), - buffer, sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2265,8 +2262,7 @@ void WCMD_setshow_env (WCHAR *s) { if (strlenW(p) != 0) WCMD_output(p); /* Read the reply */ - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -2376,8 +2372,7 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2474,7 +2469,7 @@ void WCMD_type (WCHAR *command) { static const WCHAR fmt[] = {'\n','%','s','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2528,7 +2523,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage); - while (WCMD_ReadFile (hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2559,8 +2554,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt2, moreStr, 100); WCMD_leave_paged_mode(); WCMD_output_asis(moreStrPage); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); WCMD_enter_paged_mode(moreStrPage); } @@ -2582,7 +2576,7 @@ void WCMD_more (WCHAR *command) { fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow; needsPause = TRUE; - while (WCMD_ReadFile (h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; curPos += count; @@ -2683,8 +2677,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) curdir[0], label, HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5133d20..98e1246 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,8 +108,7 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused); +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom, const BOOL is_console_handle); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a6aee38..3f2cfcf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -237,11 +237,9 @@ void WCMD_leave_paged_mode(void) * WCMD_Readfile * * Read characters in from a console/file, returning result in Unicode - * with signature identical to ReadFile */ -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused) { - +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead) +{ BOOL res; /* Try to read from console as Unicode */ @@ -258,7 +256,7 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, return FALSE; /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, buffer, maxChars, &numRead, unused); + res = ReadFile(hIn, buffer, maxChars, &numRead, NULL); /* Convert from OEM */ *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, @@ -293,8 +291,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { if (++line_count >= max_height - 1) { line_count = 0; WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } } } while (((message = ptr) != NULL) && (*ptr));

1 0

Frédéric Delanoy : cmd: Avoid checking whether we 're in console mode for every read.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: d6f4f7308ae3de22280c0c3b0b5847180c75e204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f4f7308ae3de22280c0c3b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:21 2011 +0200 cmd: Avoid checking whether we're in console mode for every read. --- programs/cmd/batch.c | 12 +++++------- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 5 +++-- programs/cmd/wcmdmain.c | 21 +++++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5007db3..09bb9c4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN while (context -> skip_rest == FALSE) { CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - if (WCMD_ReadAndParseLine(NULL, &toExecute, h) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, h, FALSE)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); @@ -181,22 +181,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) { DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; - if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + if (is_console_handle) { + status = ReadConsoleW(h, s, noChars, &charsRead, NULL); + if (!status) return NULL; s[charsRead-2] = '\0'; /* Strip \r\n */ return p; } - /* Continue only if we have no console (i.e. a file) handle */ - if (GetLastError() != ERROR_INVALID_HANDLE) - return NULL; - /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9fe50d9..b7900fc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1134,7 +1134,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR buffer[MAXSTRING] = {'\0'}; WCHAR *where, *parm; - while (WCMD_fgets (buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input, FALSE)) { /* Skip blank lines*/ parm = WCMD_parameter (buffer, 0, &where, NULL); @@ -1394,7 +1394,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (*paramStart == ':') paramStart++; SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h, FALSE)) { str = string; while (isspaceW (*str)) str++; if (*str == ':') { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d370764..5133d20 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,7 +97,7 @@ void WCMD_verify (const WCHAR *command); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *command); -WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); +WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream, const BOOL is_console_handle); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); @@ -111,7 +111,8 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int le BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead, const LPOVERLAPPED unused); -WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom); +WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle); CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket, const WCHAR *var, const WCHAR *val); void WCMD_free_commands(CMD_LIST *cmds); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8e222a3..a6aee38 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1786,8 +1786,9 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex) * - Anything else gets put into the command string (including * redirects) */ -WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE readFrom) { - +WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle) +{ WCHAR *curPos; int inQuotes = 0; WCHAR curString[MAXSTRING]; @@ -1831,7 +1832,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } else if (readFrom == INVALID_HANDLE_VALUE) { WINE_FIXME("No command nor handle supplied\n"); } else { - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) return NULL; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + return NULL; } curPos = extraSpace; @@ -2191,7 +2193,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Read more, skipping any blank lines */ while (*extraSpace == 0x00) { if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) break; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + break; } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); @@ -2282,6 +2285,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR string[1024]; WCHAR envvar[4]; int opt_q; + BOOL is_console; + DWORD dummy; int opt_t = 0; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; @@ -2497,7 +2502,7 @@ int wmain (int argc, WCHAR *argvW[]) */ /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2593,7 +2598,7 @@ int wmain (int argc, WCHAR *argvW[]) if (opt_k) { /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2606,13 +2611,13 @@ int wmain (int argc, WCHAR *argvW[]) SetEnvironmentVariableW(promptW, defaultpromptW); WCMD_version (); + is_console = !!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &dummy); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ if (echo_mode) WCMD_show_prompt(); - if (WCMD_ReadAndParseLine(NULL, &toExecute, - GetStdHandle(STD_INPUT_HANDLE)) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE), is_console)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute);

1 0

Alexandre Julliard : makedep: Ensure that error messages contain "error".
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 54f71a0d8e9da5d5e565d8fd7e98e5d66c9cd3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f71a0d8e9da5d5e565d8fd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 12:55:16 2011 +0200 makedep: Ensure that error messages contain "error". Suggested by Dan Kegel. --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 799c6e0..2d3e5b4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -108,7 +108,7 @@ static void *xmalloc( size_t size ) { void *res; if (!(res = malloc (size ? size : 1))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -121,7 +121,7 @@ static void *xrealloc (void *ptr, size_t size) void *res; assert( size ); if (!(res = realloc( ptr, size ))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -131,7 +131,7 @@ static void *xrealloc (void *ptr, size_t size) static char *xstrdup( const char *str ) { char *res = strdup( str ); - if (!res) fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + if (!res) fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -286,36 +286,36 @@ static INCL_FILE *add_include( INCL_FILE *pFile, const char *name, int line, int for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break; if (pos >= MAX_INCLUDES) - fatal_error( "%s: %s: too many included files, please fix MAX_INCLUDES\n", + fatal_error( "%s: %s: error: too many included files, please fix MAX_INCLUDES\n", ProgramName, pFile->name ); /* enforce some rules for the Wine tree */ if (!memcmp( name, "../", 3 )) - fatal_error( "%s:%d: #include directive with relative path not allowed\n", + fatal_error( "%s:%d: error: #include directive with relative path not allowed\n", pFile->filename, line ); if (!strcmp( name, "config.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: config.h must not be included by a header file\n", + fatal_error( "%s:%d: error: config.h must not be included by a header file\n", pFile->filename, line ); if (pos) - fatal_error( "%s:%d: config.h must be included before anything else\n", + fatal_error( "%s:%d: error: config.h must be included before anything else\n", pFile->filename, line ); } else if (!strcmp( name, "wine/port.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: wine/port.h must not be included by a header file\n", + fatal_error( "%s:%d: error: wine/port.h must not be included by a header file\n", pFile->filename, line ); - if (!pos) fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + if (!pos) fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); if (pos > 1) - fatal_error( "%s:%d: wine/port.h must be included before everything except config.h\n", + fatal_error( "%s:%d: error: wine/port.h must be included before everything except config.h\n", pFile->filename, line ); if (strcmp( pFile->files[0]->name, "config.h" )) - fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); } @@ -356,6 +356,7 @@ static FILE *open_src_file( INCL_FILE *pFile ) } if (!file) { + fprintf( stderr, "%s: error: ", ProgramName ); perror( pFile->name ); exit(1); } @@ -527,13 +528,15 @@ static FILE *open_include_file( INCL_FILE *pFile ) free( filename ); } + fprintf( stderr, "%s:%d: error: ", pFile->included_by->filename, pFile->included_line ); perror( pFile->name ); - while (pFile->included_by) + pFile = pFile->included_by; + while (pFile && pFile->included_by) { const char *parent = pFile->included_by->sourcename; if (!parent) parent = pFile->included_by->name; - fprintf( stderr, " %s was first included from %s:%d\n", - pFile->name, parent, pFile->included_line ); + fprintf( stderr, "%s:%d: note: %s was first included here\n", + parent, pFile->included_line, pFile->name ); pFile = pFile->included_by; } exit(1); @@ -575,7 +578,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (*p != '"') continue; include = ++p; while (*p && (*p != '"')) p++; - if (!*p) fatal_error( "%s:%d: Malformed import directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed import directive\n", + pFile->filename, input_line ); *p = 0; if (for_h_file && strendswith( include, ".idl" )) strcpy( p - 4, ".h" ); add_include( pFile, include, input_line, 0 ); @@ -608,7 +612,7 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) include = p; while (*p && (*p != quote)) p++; if (!*p || (quote == '"' && p[-1] != '\\')) - fatal_error( "%s:%d: Malformed #include directive inside cpp_quote\n", + fatal_error( "%s:%d: error: Malformed #include directive inside cpp_quote\n", pFile->filename, input_line ); if (quote == '"') p--; /* remove backslash */ *p = 0; @@ -627,7 +631,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", + pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); } @@ -656,7 +661,7 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); @@ -697,7 +702,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) while (*p && !isspace(*p) && *p != '*') p++; } if (!*p) - fatal_error( "%s:%d: Malformed makedep comment\n", pFile->filename, input_line ); + fatal_error( "%s:%d: error: Malformed makedep comment\n", pFile->filename, input_line ); *p = 0; } else /* check for #include */ @@ -712,7 +717,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; } @@ -954,7 +959,8 @@ static FILE *create_temp_file( char **tmp_name ) if (errno != EEXIST) break; id += 7777; } - if (!ret) fatal_error( "failed to create output file for '%s'\n", OutputFileName ); + if (!ret) fatal_error( "%s: error: failed to create output file for '%s'\n", + ProgramName, OutputFileName ); *tmp_name = name; return ret; } @@ -979,7 +985,7 @@ static void output_dependencies(void) while (fgets( buffer, sizeof(buffer), file ) && !found) { if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) - fatal_error( "error writing to %s\n", tmp_name ); + fatal_error( "%s: error: failed to write to %s\n", ProgramName, tmp_name ); found = !strncmp( buffer, Separator, strlen(Separator) ); } fclose( file ); @@ -1017,7 +1023,8 @@ static void output_dependencies(void) if (ret == -1) { unlink( tmp_name ); - fatal_error( "failed to rename output file to '%s'\n", OutputFileName ); + fatal_error( "%s: error: failed to rename output file to '%s'\n", + ProgramName, OutputFileName ); } free( tmp_name ); } @@ -1070,7 +1077,8 @@ int main( int argc, char *argv[] ) INCL_PATH *path, *next; int i, j; - ProgramName = argv[0]; + if ((ProgramName = strrchr( argv[0], '/' ))) ProgramName++; + else ProgramName = argv[0]; i = 1; while (i < argc)

1 0

Erich Hoover : hhctrl.ocx: Open a specific topic when requested.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: f1b7bb4eaaeb1668169877d691a0d984b89a441d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b7bb4eaaeb1668169877d69… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:02:11 2011 -0600 hhctrl.ocx: Open a specific topic when requested. --- dlls/hhctrl.ocx/hhctrl.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 2747dcb..400f920 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -166,15 +166,17 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat NMHDR nmhdr; const WCHAR *index = NULL; int tab_index = TAB_CONTENTS; + const WCHAR *default_index = NULL; if (!filename) return NULL; - if (!resolve_filename(filename, fullname, MAX_PATH, &index, NULL)) + if (!resolve_filename(filename, fullname, MAX_PATH, &default_index, NULL)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; } + index = default_index; info = CreateHelpViewer(fullname); if(!info) @@ -183,10 +185,20 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if(!index) index = info->WinType.pszFile; + /* called to load a specified topic */ + switch(command) + { + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + if (data) + index = (const WCHAR *)data; + break; + } + res = NavigateToChm(info, info->pCHMInfo->szFile, index); - if (index != info->WinType.pszFile) - heap_free((WCHAR*)index); + if (default_index) + heap_free((WCHAR*)default_index); if(!res) { @@ -199,8 +211,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: tab_index = TAB_CONTENTS; - if (data) - FIXME("Should jump to topic '%s'.\n", debugstr_w((WCHAR *)data)); break; case HH_DISPLAY_INDEX: tab_index = TAB_INDEX;

1 0

Alexandre Julliard : winex11: Fall back to the DIB engine for client-side stretching.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 6861f4c252fc4d2932679f3f161501d283566325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6861f4c252fc4d2932679f3f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:27:19 2011 +0200 winex11: Fall back to the DIB engine for client-side stretching. --- dlls/winex11.drv/bitblt.c | 350 +-------------------------------------------- 1 files changed, 4 insertions(+), 346 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6861f4c252fc4d2932679…

1 0

Andrew Eikum : dsound: Eliminate leftover driver structures.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 6c33e8725966c31857a67771e3fde283ec4d1787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c33e8725966c31857a67771e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 15:19:04 2011 -0500 dsound: Eliminate leftover driver structures. --- dlls/dsound/capture.c | 2 - dlls/dsound/dsound.c | 6 +--- dlls/dsound/dsound_private.h | 58 +---------------------------------------- dlls/dsound/primary.c | 1 - 4 files changed, 4 insertions(+), 63 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9a56e65..7569254 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1029,8 +1029,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( device->mmdevice = mmdevice; - device->drvdesc.dwFlags = 0; - device->drvcaps.dwFlags = 0; device->drvcaps.dwFormats = 0; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 49b39a1..8006f5d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1335,10 +1335,8 @@ HRESULT DirectSoundDevice_GetCaps( lpDSCaps->dwTotalHwMemBytes = device->drvcaps.dwTotalHwMemBytes; lpDSCaps->dwFreeHwMemBytes = device->drvcaps.dwFreeHwMemBytes; lpDSCaps->dwMaxContigFreeHwMemBytes = device->drvcaps.dwMaxContigFreeHwMemBytes; - - /* driver doesn't have these */ - lpDSCaps->dwUnlockTransferRateHwBuffers = 4096; /* But we have none... */ - lpDSCaps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */ + lpDSCaps->dwUnlockTransferRateHwBuffers = device->drvcaps.dwUnlockTransferRateHwBuffers; + lpDSCaps->dwPlayCpuOverheadSwBuffers = device->drvcaps.dwPlayCpuOverheadSwBuffers; return DS_OK; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b6f7e7d..075f914 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -65,47 +65,6 @@ extern const mixfunc mixfunctions[4] DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; -typedef struct _DSDRIVERDESC -{ - DWORD dwFlags; - CHAR szDesc[256]; - CHAR szDrvname[256]; - DWORD dnDevNode; - WORD wVxdId; - WORD wReserved; - ULONG ulDeviceNum; - DWORD dwHeapType; - LPVOID pvDirectDrawHeap; - DWORD dwMemStartAddress; - DWORD dwMemEndAddress; - DWORD dwMemAllocExtra; - LPVOID pvReserved1; - LPVOID pvReserved2; -} DSDRIVERDESC,*PDSDRIVERDESC; - -typedef struct _DSDRIVERCAPS -{ - DWORD dwFlags; - DWORD dwMinSecondarySampleRate; - DWORD dwMaxSecondarySampleRate; - DWORD dwPrimaryBuffers; - DWORD dwMaxHwMixingAllBuffers; - DWORD dwMaxHwMixingStaticBuffers; - DWORD dwMaxHwMixingStreamingBuffers; - DWORD dwFreeHwMixingAllBuffers; - DWORD dwFreeHwMixingStaticBuffers; - DWORD dwFreeHwMixingStreamingBuffers; - DWORD dwMaxHw3DAllBuffers; - DWORD dwMaxHw3DStaticBuffers; - DWORD dwMaxHw3DStreamingBuffers; - DWORD dwFreeHw3DAllBuffers; - DWORD dwFreeHw3DStaticBuffers; - DWORD dwFreeHw3DStreamingBuffers; - DWORD dwTotalHwMemBytes; - DWORD dwFreeHwMemBytes; - DWORD dwMaxContigFreeHwMemBytes; -} DSDRIVERCAPS,*PDSDRIVERCAPS; - typedef struct _DSVOLUMEPAN { DWORD dwTotalLeftAmpFactor; @@ -117,14 +76,6 @@ typedef struct _DSVOLUMEPAN DWORD dwPanRightAmpFactor; } DSVOLUMEPAN,*PDSVOLUMEPAN; -typedef struct _DSCDRIVERCAPS -{ - DWORD dwSize; - DWORD dwFlags; - DWORD dwFormats; - DWORD dwChannels; -} DSCDRIVERCAPS,*PDSCDRIVERCAPS; - /***************************************************************************** * IDirectSoundDevice implementation structure */ @@ -133,8 +84,7 @@ struct DirectSoundDevice LONG ref; GUID guid; - DSDRIVERDESC drvdesc; - DSDRIVERCAPS drvcaps; + DSCAPS drvcaps; DWORD priolevel; PWAVEFORMATEX pwfx; UINT timerID, pwplay, pwqueue, prebuf, helfrags; @@ -272,15 +222,11 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; */ struct DirectSoundCaptureDevice { - /* IDirectSoundCaptureImpl fields */ GUID guid; LONG ref; - /* DirectSound driver stuff */ - DSDRIVERDESC drvdesc; - DSCDRIVERCAPS drvcaps; + DSCCAPS drvcaps; - /* more stuff */ LPBYTE buffer; DWORD buflen, write_pos_bytes; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 24db07d..7243cc6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -105,7 +105,6 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->volume = NULL; } - device->drvdesc.dwFlags = 0; hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&device->client); if(FAILED(hres)){

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 9775124da00c8543e6a5f0b811c151b4bc3b2b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9775124da00c8543e6a5f0b81… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 27 22:34:38 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3f5ba70..f246326 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8989,9 +8989,8 @@ msgid "version 1.0" msgstr "versija 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib failai (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -10406,12 +10405,11 @@ msgstr "Wine konfigūravimas: %s" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "Parinkta tvarkyklė: %s" #: winecfg.rc:88 -#, fuzzy msgid "(None)" -msgstr "Joks" +msgstr "(jokia)" #: winecfg.rc:51 msgid "" @@ -10450,9 +10448,8 @@ msgid "Default Settings" msgstr "Numatytosios nuostatos" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine programos (*.exe,*.exe.so)" +msgstr "Wine programos (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -11197,9 +11194,8 @@ msgid "Unicode text document" msgstr "Teksto unikodu dokumentas" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "Spausdintuvo failai (*.PRN)" +msgstr "Spausdintuvo failai (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Dmitry Timoshkov : ntdll: Use STATUS_INVALID_PAGE_PROTECTION as return value for invalid protections .
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 988307e87b67560ece29cb3c4c94e978fc8cfc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988307e87b67560ece29cb3c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 28 14:47:06 2011 +0900 ntdll: Use STATUS_INVALID_PAGE_PROTECTION as return value for invalid protections. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 10fba17..5e69eb9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -584,7 +584,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = 0; break; default: - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PAGE_PROTECTION; } if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; if (protect & PAGE_NOCACHE) *vprot |= VPROT_NOCACHE; @@ -2501,7 +2501,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p access = SECTION_MAP_READ; break; default: - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PAGE_PROTECTION; } if (process != NtCurrentProcess())

1 0