git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Steffen Prohaska <prohaska@zib.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Johannes Sixt <j6t@kdbg.org>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 03/11 v2] Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
Date: Mon,  1 Jun 2009 08:04:16 +0200	[thread overview]
Message-ID: <1243836256-11958-1-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <4A22C674.603@kdbg.org>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

The function FillConsoleOutputCharacterA() was pretty content in XP to take a NULL
pointer if we did not want to store the number of written columns.  In Windows 7,
it crashes, but only when called from within Git Bash, not from within cmd.exe.
Go figure.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 compat/winansi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

I squashed the second chunk of 05/11, as suggested by Hannes.

diff --git a/compat/winansi.c b/compat/winansi.c
index 44dc293..9217c24 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -80,6 +80,7 @@ static void set_console_attr(void)
 static void erase_in_line(void)
 {
 	CONSOLE_SCREEN_BUFFER_INFO sbi;
+	DWORD dummy; /* Needed for Windows 7 (or Vista) regression */
 
 	if (!console)
 		return;
@@ -87,7 +88,7 @@ static void erase_in_line(void)
 	GetConsoleScreenBufferInfo(console, &sbi);
 	FillConsoleOutputCharacterA(console, ' ',
 		sbi.dwSize.X - sbi.dwCursorPosition.X, sbi.dwCursorPosition,
-		NULL);
+		&dummy);
 }
 
 
-- 
1.6.3.1.54.g99dd

  parent reply	other threads:[~2009-06-01  6:04 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-31 16:15 [PATCH 00/11] Various msysgit patches Steffen Prohaska
2009-05-31 16:15 ` [PATCH 01/11] MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore Steffen Prohaska
2009-05-31 16:15   ` [PATCH 02/11] Quiet make: do not leave Windows behind Steffen Prohaska
2009-05-31 16:15     ` [PATCH 03/11] Work around a regression in Windows 7, causing erase_in_line() to crash sometimes Steffen Prohaska
2009-05-31 16:15       ` [PATCH 04/11] test-chmtime: work around Windows limitation Steffen Prohaska
2009-05-31 16:15         ` [PATCH 05/11] winansi: fix compile warnings Steffen Prohaska
2009-05-31 16:15           ` [PATCH 06/11] git: browsing paths with spaces when using the start command Steffen Prohaska
2009-05-31 16:15             ` [PATCH 07/11] connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows Steffen Prohaska
2009-05-31 16:15               ` [PATCH 08/11] MinGW readdir reimplementation to support d_type Steffen Prohaska
     [not found]                 ` <1243786525-4493-10-git-send-email-prohaska@zib.de>
2009-05-31 16:15                   ` [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 Steffen Prohaska
2009-05-31 16:15                     ` [PATCH 11/11] MinGW: Teach Makefile to detect msysgit and apply specific settings Steffen Prohaska
2009-06-01  7:43                     ` [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 Junio C Hamano
2009-06-01  8:57                       ` Johannes Schindelin
2009-06-01 16:33                         ` Junio C Hamano
2009-06-01 23:38                           ` GeunSik Lim
2009-06-02 12:52                           ` Johannes Schindelin
2009-06-02 15:50                             ` Junio C Hamano
2009-06-03 12:57                               ` Johannes Schindelin
     [not found]                                 ` <7vprdl9qon.fsf@alter.siames  e.dyndns.org>
2009-06-03 17:23                                 ` Junio C Hamano
2009-06-08 14:46                                   ` [PATCH 10/11 v2] " Johannes Schindelin
2009-06-08 16:50                                     ` Junio C Hamano
2009-06-08 18:24                                       ` Johannes Sixt
2009-06-09  6:06                                       ` Steffen Prohaska
2009-06-10  9:27                                         ` Johannes Sixt
2009-06-11 20:52                                           ` [PATCH] Fix typo in nedmalloc warning fix Johannes Sixt
2009-06-11 20:56                                             ` [PATCH] compat/ has subdirectories: do not omit them in 'make clean' Johannes Sixt
2009-06-11 21:13                                             ` [PATCH] Fix typo in nedmalloc warning fix Johannes Schindelin
2009-05-31 18:03           ` [PATCH 05/11] winansi: fix compile warnings Johannes Sixt
2009-05-31 19:52             ` Johannes Sixt
2009-06-01  6:41               ` [PATCH 05/11 v2] MinGW: fix warning about implicit declaration of _getch() Steffen Prohaska
2009-06-01  6:04             ` Steffen Prohaska [this message]
2009-06-01  8:25               ` [PATCH 03/11 v2] Work around a regression in Windows 7, causing erase_in_line() to crash sometimes Johannes Schindelin
2009-06-01 10:26                 ` Steffen Prohaska
2009-06-01 10:41                   ` Johannes Schindelin
2009-06-01  7:43         ` [PATCH 04/11] test-chmtime: work around Windows limitation Junio C Hamano
2009-06-01  9:00           ` Johannes Schindelin
2009-05-31 20:06 ` [PATCH 00/11] Various msysgit patches Johannes Sixt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1243836256-11958-1-git-send-email-prohaska@zib.de \
    --to=prohaska@zib.de \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).