wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Ken Thomases : secur32: Eliminate a dead store.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: e39e67ec3deefa048b950513cad038fc62052a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39e67ec3deefa048b950513c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:15:46 2011 -0600 secur32: Eliminate a dead store. --- dlls/secur32/dispatcher.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 666baea0..ba59231 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -285,7 +285,6 @@ void cleanup_helper(PNegoHelper helper) close(helper->pipe_out); close(helper->pipe_in); - helper->helper_pid = 0; HeapFree(GetProcessHeap(), 0, helper); }

1 0

André Hentschel : ntdll: Move a return out of a #ifdef .
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 3f90cb8c9e9c542faa5a8535dbea192b21aeb425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f90cb8c9e9c542faa5a8535d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 30 01:13:22 2011 +0100 ntdll: Move a return out of a #ifdef. --- dlls/ntdll/signal_sparc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index ac9ee9c..798397d 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -818,9 +818,9 @@ void signal_init_process(void) this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ __asm__("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ - return; #endif + return; error: perror("sigaction"); exit(1);

1 0

André Hentschel : configure: Add checks for sparc64 and powerpc64.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: fca621f20b27ca5cfbbd502042444ed52fec59b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca621f20b27ca5cfbbd50204… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 30 01:07:33 2011 +0100 configure: Add checks for sparc64 and powerpc64. --- configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 76c7995..f573540 100755 --- a/configure +++ b/configure @@ -14123,6 +14123,32 @@ if test $ac_cv_cpp_def___x86_64__ = yes; then : CFLAGS="$CFLAGS -D__x86_64__" LINTFLAGS="$LINTFLAGS -D__x86_64__" fi ;; + *sparc64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc64__" >&5 +$as_echo_n "checking whether we need to define __sparc64__... " >&6; } +if ${ac_cv_cpp_def___sparc64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __sparc64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___sparc64__=yes +else + ac_cv_cpp_def___sparc64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___sparc64__" >&5 +$as_echo "$ac_cv_cpp_def___sparc64__" >&6; } +if test $ac_cv_cpp_def___sparc64__ = yes; then : + CFLAGS="$CFLAGS -D__sparc64__" + LINTFLAGS="$LINTFLAGS -D__sparc64__" +fi ;; *sparc*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc__" >&5 $as_echo_n "checking whether we need to define __sparc__... " >&6; } if ${ac_cv_cpp_def___sparc__+:} false; then : @@ -14149,6 +14175,32 @@ if test $ac_cv_cpp_def___sparc__ = yes; then : CFLAGS="$CFLAGS -D__sparc__" LINTFLAGS="$LINTFLAGS -D__sparc__" fi ;; + *powerpc64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc64__" >&5 +$as_echo_n "checking whether we need to define __powerpc64__... " >&6; } +if ${ac_cv_cpp_def___powerpc64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __powerpc64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___powerpc64__=yes +else + ac_cv_cpp_def___powerpc64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___powerpc64__" >&5 +$as_echo "$ac_cv_cpp_def___powerpc64__" >&6; } +if test $ac_cv_cpp_def___powerpc64__ = yes; then : + CFLAGS="$CFLAGS -D__powerpc64__" + LINTFLAGS="$LINTFLAGS -D__powerpc64__" +fi ;; *powerpc*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc__" >&5 $as_echo_n "checking whether we need to define __powerpc__... " >&6; } if ${ac_cv_cpp_def___powerpc__+:} false; then : diff --git a/configure.ac b/configure.ac index dda1684..d6f5e6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2314,7 +2314,9 @@ dnl *** check for the need to define platform-specific symbols case $host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; + *sparc64*) WINE_CHECK_DEFINE([__sparc64__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; + *powerpc64*) WINE_CHECK_DEFINE([__powerpc64__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; *arm*) WINE_CHECK_DEFINE([__arm__]) ;; esac

1 0

Frédéric Delanoy : gameux: Remove duplicate "if" condition.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 5a04819709d355122d1882b418a0835bfdf5d23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a04819709d355122d1882b41… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:50 2011 +0100 gameux: Remove duplicate "if" condition. --- dlls/gameux/gamestatistics.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 96b35d5..cfe14b9 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -176,8 +176,6 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) } if(SUCCEEDED(hr)) - - if(SUCCEEDED(hr)) for(i=0; i<MAX_CATEGORIES; ++i) { if(lstrlenW(stats->categories[i].sName)==0)

1 0

Frédéric Delanoy : cmd: Reorder global vars declarations/definitions to improve readability.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: a5becedd0e869ec979e933fda61a8010aedca9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5becedd0e869ec979e933fda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:52 2011 +0100 cmd: Reorder global vars declarations/definitions to improve readability. --- programs/cmd/builtins.c | 23 ++++++++++------------- programs/cmd/wcmdmain.c | 29 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a8f897..60f9f99 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -37,12 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -static HINSTANCE hinst; -static struct env_stack *saved_environment; struct env_stack *pushd_directories; - -static BOOL verify_mode = FALSE; - +const WCHAR dotW[] = {'.','\0'}; +const WCHAR dotdotW[] = {'.','.','\0'}; +const WCHAR nullW[] = {'\0'}; +const WCHAR starW[] = {'*','\0'}; +const WCHAR slashW[] = {'\\','\0'}; +const WCHAR equalW[] = {'=','\0'}; const WCHAR inbuilt[][10] = { {'C','A','L','L','\0'}, {'C','D','\0'}, @@ -90,24 +91,20 @@ const WCHAR inbuilt[][10] = { {'C','H','O','I','C','E','\0'}, {'E','X','I','T','\0'} }; - static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; - -const WCHAR dotW[] = {'.','\0'}; -const WCHAR dotdotW[] = {'.','.','\0'}; -const WCHAR nullW[] = {'\0'}; -const WCHAR starW[] = {'*','\0'}; -const WCHAR slashW[] = {'\\','\0'}; -const WCHAR equalW[] = {'=','\0'}; static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; +static HINSTANCE hinst; +static struct env_stack *saved_environment; +static BOOL verify_mode = FALSE; + /************************************************************************** * WCMD_ask_confirm * diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 94ce9de..df4f9cb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -32,19 +32,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern const WCHAR inbuilt[][10]; +extern struct env_stack *pushd_directories; + +BATCH_CONTEXT *context = NULL; DWORD errorlevel; +WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; + int defaultColor = 7; BOOL echo_mode = TRUE; -static BOOL opt_c, opt_k, opt_s; + +WCHAR anykey[100], version_string[100]; const WCHAR newline[] = {'\r','\n','\0'}; const WCHAR space[] = {' ','\0'}; -WCHAR anykey[100]; -WCHAR version_string[100]; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; -BATCH_CONTEXT *context = NULL; -extern struct env_stack *pushd_directories; + +static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; + +/* Variables pertaining to paging */ +static BOOL paged_mode; static const WCHAR *pagedMessage = NULL; -static BOOL unicodeOutput = FALSE; +static int line_count; +static int max_height; +static int max_width; +static int numChars; #define MAX_WRITECONSOLE_SIZE 65535 @@ -151,12 +160,6 @@ void WCMD_output_stderr (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); } -static int line_count; -static int max_height; -static int max_width; -static BOOL paged_mode; -static int numChars; - void WCMD_enter_paged_mode(const WCHAR *msg) { CONSOLE_SCREEN_BUFFER_INFO consoleInfo;

1 0

Frédéric Delanoy : cmd: Move commonly used global vars declarations to header file.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 44a1e7d1993596c012334ed903bb85b315a8d0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a1e7d1993596c012334ed90… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:51 2011 +0100 cmd: Move commonly used global vars declarations to header file. --- programs/cmd/batch.c | 4 ---- programs/cmd/builtins.c | 10 ---------- programs/cmd/directory.c | 10 ---------- programs/cmd/wcmd.h | 15 ++++++++++++--- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 10af36b..bf8f1b7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -24,10 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; - /**************************************************************************** * WCMD_batch * diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a418d92..7a8f897 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -20,13 +20,6 @@ */ /* - * NOTES: - * On entry to each function, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - -/* * FIXME: * - No support for pipes, shell parameters * - Lots of functionality missing from builtins @@ -43,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; static HINSTANCE hinst; static struct env_stack *saved_environment; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index a5447f5..7fc60a7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -19,13 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * NOTES: - * On entry, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - #define WIN32_LEAN_AND_MEAN #include "wcmd.h" @@ -33,9 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern DWORD errorlevel; - typedef enum _DISPLAYTIME { Creation = 0, diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c45bc88..fe16805 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -30,6 +30,9 @@ #include <ctype.h> #include <wine/unicode.h> +/* msdn specified max for Win XP */ +#define MAXSTRING 8192 + /* Data structure to hold commands delimitors/separators */ typedef enum _CMDdelimiters { @@ -155,6 +158,15 @@ typedef struct _DIRECTORY_STACK WCHAR *fileName; } DIRECTORY_STACK; +/* + * Global variables quals, param1, param2 contain the current qualifiers + * (uppercased and concatenated) and parameters entered, with environment + * variables and batch parameters substitution already done. + */ +extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern DWORD errorlevel; +extern BATCH_CONTEXT *context; + #endif /* !RC_INVOKED */ /* @@ -264,6 +276,3 @@ extern WCHAR version_string[]; #define WCMD_VERSION 1033 #define WCMD_MOREPROMPT 1034 #define WCMD_LINETOOLONG 1035 - -/* msdn specified max for Win XP */ -#define MAXSTRING 8192

1 0

Frédéric Delanoy : cmd: Move a global var to the file using it.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: ad81871f1568df82c537643ff8947568390cc0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81871f1568df82c537643ff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:49 2011 +0100 cmd: Move a global var to the file using it. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5197297..a418d92 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern HINSTANCE hinst; extern int defaultColor; extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; +static HINSTANCE hinst; static struct env_stack *saved_environment; struct env_stack *pushd_directories; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1947884..94ce9de 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -31,8 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR inbuilt[][10]; -HINSTANCE hinst; +extern const WCHAR inbuilt[][10]; DWORD errorlevel; int defaultColor = 7; BOOL echo_mode = TRUE;

1 0

Alexandre Julliard : ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again , otherwise we may not wake up.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 0f3e60747f1958eaa6ef5ff31f65eb3e77da146f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3e60747f1958eaa6ef5ff31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 21:22:40 2011 +0100 ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again, otherwise we may not wake up. --- dlls/ole32/compobj.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4579f0a..72ba32a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3650,7 +3650,7 @@ HRESULT WINAPI CoRevertToSelf(void) static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ - return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || + return PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); @@ -3712,7 +3712,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_ALLINPUT, wait_flags); + QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { @@ -3746,11 +3746,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - /* note: using "if" here instead of "while" might seem less - * efficient, but only if we are optimising for quick delivery - * of pending messages, rather than quick completion of the - * COM call */ - if (COM_PeekMessage(apt, &msg)) + while (COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); @@ -3761,6 +3757,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, PostQuitMessage(msg.wParam); /* no longer need to process messages */ message_loop = FALSE; + break; } } continue;

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 8a1d690ad47199c0574dc63c1399e3b5a00f5e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1d690ad47199c0574dc63c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 29 19:04:06 2011 +0100 po: Update German translation. --- po/de.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 7c0dc12..99d2fe2 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-24 22:08+0100\n" +"PO-Revision-Date: 2011-11-29 18:54+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -12282,7 +12282,6 @@ msgstr "" "Wir entschuldigen uns für die Unannehmlichkeit." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -12292,11 +12291,12 @@ msgid "" "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. Sie " -"können unter http://appdb.winehq.org Tipps zum ausführen der Anwendung " -"einholen.\n" +"können in der <a href=\"http://appdb.winehq.org\">Anwendungsdatenbank</a> " +"Tipps zum ausführen der Anwendung einholen.\n" "\n" "Tritt dieses Problem unter Windows nicht auf und wurde es noch nicht " -"gemeldet, können Sie unter http://bugs.winehq.org einen Eintrag hinterlassen." +"gemeldet, können Sie <a href=\"http://wiki.winehq.org/Bugs\">einen " +"Fehlerbericht hinterlassen</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Frédéric Delanoy : cmd: Rename unicodePipes variable.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 513ee9a3aa081175c88fdd34ab3f95db9ce80fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513ee9a3aa081175c88fdd34a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 14:39:28 2011 +0100 cmd: Rename unicodePipes variable. --- programs/cmd/wcmdmain.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c3c71a9..1947884 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -45,7 +45,7 @@ WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; BATCH_CONTEXT *context = NULL; extern struct env_stack *pushd_directories; static const WCHAR *pagedMessage = NULL; -static BOOL unicodePipes = FALSE; +static BOOL unicodeOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 @@ -89,7 +89,7 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) DWORD convertedChars; char *buffer; - if (!unicodePipes) { + if (!unicodeOutput) { if (!(buffer = get_file_buffer())) return; @@ -2259,9 +2259,9 @@ int wmain (int argc, WCHAR *argvW[]) } else if (tolowerW(c)=='s') { opt_s = TRUE; } else if (tolowerW(c)=='a') { - unicodePipes=FALSE; + unicodeOutput = FALSE; } else if (tolowerW(c)=='u') { - unicodePipes=TRUE; + unicodeOutput = TRUE; } else if (tolowerW(c)=='t' && (*argvW)[2]==':') { opt_t=strtoulW(&(*argvW)[3], NULL, 16); } else if (tolowerW(c)=='x' || tolowerW(c)=='y') {

1 0

← Newer
1
2
3
4
5
6
7
8
...
86
Older →

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 November 2011