From 7cae558bdc68f9bfa8bc300e69468c0edfc2829a Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 1 Jun 2002 02:55:48 +0000 Subject: [PATCH] Removed some more trailing whitespace. --- Make.rules.in | 2 +- configure.ac | 20 +-- debugger/dbg.y | 64 +++---- debugger/debug.l | 12 +- dlls/Makedll.rules.in | 2 +- dlls/comctl32/comctl32.spec | 6 +- dlls/comctl32/comctl_De.rc | 4 +- dlls/comctl32/comctl_En.rc | 4 +- dlls/comctl32/rsrc.rc | 2 +- dlls/commdlg/cdlg_Ca.rc | 2 +- dlls/commdlg/cdlg_Da.rc | 2 +- dlls/commdlg/cdlg_De.rc | 12 +- dlls/commdlg/cdlg_En.rc | 20 +-- dlls/commdlg/cdlg_Fi.rc | 2 +- dlls/commdlg/cdlg_Fr.rc | 12 +- dlls/commdlg/cdlg_It.rc | 2 +- dlls/commdlg/cdlg_Ja.rc | 17 +- dlls/commdlg/cdlg_Nl.rc | 8 +- dlls/commdlg/cdlg_No.rc | 2 +- dlls/commdlg/cdlg_Pl.rc | 10 +- dlls/commdlg/cdlg_Pt.rc | 24 +-- dlls/commdlg/cdlg_Ru.rc | 20 +-- dlls/commdlg/cdlg_Sk.rc | 16 +- dlls/commdlg/cdlg_Sv.rc | 26 ++- dlls/commdlg/cdlg_Wa.rc | 6 +- dlls/commdlg/cdlg_Zh.rc | 19 +- dlls/commdlg/cdlg_xx.rc | 6 +- dlls/gdi/gdi.exe.spec | 2 +- dlls/gdi/gdi32.spec | 2 +- dlls/icmp/Makefile.in | 5 +- dlls/kernel/kernel32.spec | 14 +- dlls/kernel/krnl386.exe.spec | 9 +- dlls/lzexpand/lzexpand.spec | 2 +- dlls/mpr/mpr.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ntdll/ntdll.spec | 4 +- dlls/odbc32/Makefile.in | 3 +- dlls/ole32/ole32.spec | 4 +- dlls/ole32/storage.spec | 2 +- dlls/oleaut32/typelib.spec | 20 +-- dlls/olepro32/olepro32.spec | 2 +- dlls/opengl32/make_opengl | 164 ++++++++--------- dlls/psapi/psapi.spec | 2 +- dlls/rasapi32/Makefile.in | 3 +- dlls/setupapi/setupapi.rc | 2 +- dlls/shell32/shell.spec | 2 +- dlls/shell32/shell32.spec | 84 ++++----- dlls/shell32/shell32_De.rc | 2 +- dlls/shell32/shell32_En.rc | 2 +- dlls/shell32/shell32_Ja.rc | 2 +- dlls/shell32/shell32_Zh.rc | 2 +- dlls/shell32/shres.rc | 14 +- dlls/user/resources/display.rc | 4 +- dlls/user/resources/mouse.rc | 2 +- dlls/user/resources/user32_De.rc | 3 +- dlls/user/resources/user32_En.rc | 4 +- dlls/user/resources/user32_Ja.rc | 2 +- dlls/user/resources/user32_Sk.rc | 4 +- dlls/user/resources/user32_Wa.rc | 3 +- dlls/user/resources/user32_Zh.rc | 88 ++++----- dlls/user/user.exe.spec | 2 +- dlls/user/user32.spec | 2 +- dlls/wineps/wps_De.rc | 2 +- dlls/wineps/wps_En.rc | 2 +- dlls/wineps/wps_Ru.rc | 2 +- dlls/wineps/wps_Sk.rc | 2 +- dlls/wininet/wininet.spec | 6 +- dlls/winmm/winmm.spec | 2 +- dlls/winmm/winmm_Es.rc | 4 +- dlls/winmm/winmm_Fr.rc | 2 +- dlls/winmm/winmm_Nl.rc | 2 +- dlls/winsock/winsock.spec | 5 - dlls/winsock/ws2_32.spec | 2 +- include/Makefile.in | 2 +- programs/clock/Da.rc | 2 +- programs/clock/De.rc | 2 +- programs/clock/En.rc | 2 +- programs/clock/Es.rc | 2 +- programs/clock/Fi.rc | 2 +- programs/clock/Fr.rc | 2 +- programs/clock/Pt.rc | 2 +- programs/clock/Sk.rc | 2 +- programs/clock/Sw.rc | 4 +- programs/clock/Wa.rc | 2 +- programs/cmdlgtst/cmdlgr.rc | 4 +- programs/notepad/Da.rc | 3 +- programs/notepad/De.rc | 5 +- programs/notepad/En.rc | 3 +- programs/notepad/Es.rc | 3 +- programs/notepad/Fi.rc | 3 +- programs/notepad/Fr.rc | 3 +- programs/notepad/Pt.rc | 3 +- programs/notepad/Sk.rc | 3 +- programs/notepad/Sw.rc | 3 +- programs/notepad/Wa.rc | 3 +- programs/notepad/notepad.rc | 7 +- programs/progman/Ru.rc | 6 +- programs/progman/Xx.rc | 11 +- programs/regapi/regFixer.pl | 9 +- programs/regapi/regRestorer.pl | 4 +- programs/regapi/regSet.sh | 16 +- programs/uninstaller/rsrc.rc | 4 +- programs/view/viewrc.rc | 5 +- programs/wcmd/wcmdrc.rc | 6 +- programs/wineconsole/wineconsole_En.rc | 3 +- programs/winemine/rsrc.rc | 27 ++- programs/winetest/make_cygwin_makefiles | 2 +- programs/winhelp/Da.rc | 8 +- programs/winhelp/De.rc | 8 +- programs/winhelp/En.rc | 8 +- programs/winhelp/Es.rc | 8 +- programs/winhelp/Fi.rc | 8 +- programs/winhelp/Fr.rc | 8 +- programs/winhelp/Hu.rc | 8 +- programs/winhelp/It.rc | 8 +- programs/winhelp/Ko.rc | 8 +- programs/winhelp/Pt.rc | 8 +- programs/winhelp/Sk.rc | 2 +- programs/winhelp/Sw.rc | 8 +- programs/winhelp/Va.rc | 8 +- programs/winhelp/Wa.rc | 8 +- tools/Makefile.in | 2 +- tools/bug_report.pl | 113 ++++++------ tools/c2man.pl | 33 ++-- tools/examine-relay | 4 +- tools/font_convert.sh | 25 ++- tools/genpatch | 2 +- tools/make_X11wrappers | 16 +- tools/testrun | 12 +- tools/winapi/c_function.pm | 28 +-- tools/winapi/c_parser.pm | 54 +++--- tools/winapi/config.pm | 6 +- tools/winapi/function.pm | 28 +-- tools/winapi/make_filter | 2 +- tools/winapi/make_parser.pm | 14 +- tools/winapi/options.pm | 34 ++-- tools/winapi/output.pm | 4 +- tools/winapi/setup.pm | 6 +- tools/winapi/trampoline | 2 +- tools/winapi/util.pm | 4 +- tools/winapi/winapi_check_options.pm | 32 ++-- tools/winapi/winapi_extract | 40 ++--- tools/winapi/winapi_fixup | 23 ++- tools/winapi/winapi_fixup_documentation.pm | 90 +++++----- tools/winapi/winapi_fixup_editor.pm | 30 ++-- tools/winapi/winapi_fixup_options.pm | 2 +- tools/winapi/winapi_fixup_statements.pm | 18 +- tools/winapi/winapi_module_user.pm | 18 +- tools/winapi_check/modules.pm | 10 +- tools/winapi_check/nativeapi.pm | 4 +- tools/winapi_check/preprocessor.pm | 8 +- tools/winapi_check/winapi.pm | 24 +-- tools/winapi_check/winapi_check | 81 +++++---- tools/winapi_check/winapi_documentation.pm | 22 +-- tools/winapi_check/winapi_function.pm | 22 +-- tools/winapi_check/winapi_local.pm | 37 ++-- tools/winapi_check/winapi_parser.pm | 46 ++--- tools/winecheck | 6 +- tools/wineconf | 24 +-- tools/wineconf.tcl | 2 +- tools/winedump/function_grep.pl | 10 +- tools/wineinstall | 18 +- tools/winelauncher.in | 20 +-- tools/winemaker | 200 ++++++++++----------- tools/wmc/mcy.y | 1 - tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 31 ++-- tools/wrc/ppl.l | 14 +- tools/wrc/ppy.y | 11 +- unicode/cpmap.pl | 8 +- 170 files changed, 1137 insertions(+), 1191 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 62d0edb71f0..c3d77fbae38 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -63,7 +63,7 @@ MANSPECS = -w $(TOPSRCDIR)/dlls/gdi/gdi32.spec \ -w $(TOPSRCDIR)/dlls/user/user32.spec \ -w $(TOPSRCDIR)/dlls/comctl32/comctl32.spec \ -w $(TOPSRCDIR)/dlls/commdlg/comdlg32.spec \ - -w $(TOPSRCDIR)/dlls/kernel/kernel32.spec + -w $(TOPSRCDIR)/dlls/kernel/kernel32.spec LINT = @LINT@ LINTFLAGS = @LINTFLAGS@ ALLLINTFLAGS = $(LINTFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL) diff --git a/configure.ac b/configure.ac index f1fb53bffab..948abe36f6e 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[ AC_PREREQ(2.53) AC_INIT([Wine],WINE_VERSION) -AC_CONFIG_SRCDIR(server/atom.c) +AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) @@ -169,10 +169,10 @@ then ], AC_MSG_WARN([[XShape extension not found, Wine will be built without it]]), [#include ]) - + dnl *** Check for XFree86 DGA / DGA 2.0 extension AC_CHECK_HEADERS(X11/extensions/xf86dga.h, - [ dnl *** If X11/extensions/xf86dga.h exists, check + [ dnl *** If X11/extensions/xf86dga.h exists, check dnl *** for XDGAQueryExtension()... AC_CHECK_LIB(Xxf86dga, XDGAQueryExtension, [ dnl *** If found... @@ -251,7 +251,7 @@ This prevents linking to OpenGL. Delete the file and restart configure.]) ) dnl Check for the thread-safety of the OpenGL library - AC_CACHE_CHECK([for thread-safe OpenGL version], + AC_CACHE_CHECK([for thread-safe OpenGL version], wine_cv_opengl_version_threadsafe, [saved_libs=$LIBS LIBS="$X_LIBS -lGL" @@ -605,7 +605,7 @@ int main(void) { for(i=0; i tNUM tFORMAT %token tSYMBOLFILE tRUN tATTACH tDETACH tNOPROCESS -%token tCHAR tSHORT tINT tLONG tFLOAT tDOUBLE tUNSIGNED tSIGNED +%token tCHAR tSHORT tINT tLONG tFLOAT tDOUBLE tUNSIGNED tSIGNED %token tSTRUCT tUNION tENUM /* %left ',' */ @@ -85,7 +85,7 @@ int yyerror(char *); %left '.' '[' OP_DRF %nonassoc ':' -%type expr lval lvalue +%type expr lval lvalue %type type_expr %type expr_addr lval_addr %type expr_value @@ -99,7 +99,7 @@ input: line | input line ; -line: command +line: command | tEOL | error tEOL { yyerrok; } ; @@ -108,26 +108,26 @@ command: tQUIT tEOL { DEBUG_ExitMode = EXIT_QUIT; return 1; } | tHELP tEOL { DEBUG_Help(); } | tHELP tINFO tEOL { DEBUG_HelpInfo(); } - | tCONT tEOL { DEBUG_CurrThread->exec_count = 1; + | tCONT tEOL { DEBUG_CurrThread->exec_count = 1; DEBUG_CurrThread->exec_mode = EXEC_CONT; return 1; } | tPASS tEOL { DEBUG_ExitMode = EXIT_PASS; return 1; } - | tCONT tNUM tEOL { DEBUG_CurrThread->exec_count = $2; + | tCONT tNUM tEOL { DEBUG_CurrThread->exec_count = $2; DEBUG_CurrThread->exec_mode = EXEC_CONT; return 1; } - | tSTEP tEOL { DEBUG_CurrThread->exec_count = 1; + | tSTEP tEOL { DEBUG_CurrThread->exec_count = 1; DEBUG_CurrThread->exec_mode = EXEC_STEP_INSTR; return 1; } - | tNEXT tEOL { DEBUG_CurrThread->exec_count = 1; + | tNEXT tEOL { DEBUG_CurrThread->exec_count = 1; DEBUG_CurrThread->exec_mode = EXEC_STEP_OVER; return 1; } - | tSTEP tNUM tEOL { DEBUG_CurrThread->exec_count = $2; + | tSTEP tNUM tEOL { DEBUG_CurrThread->exec_count = $2; DEBUG_CurrThread->exec_mode = EXEC_STEP_INSTR; return 1; } - | tNEXT tNUM tEOL { DEBUG_CurrThread->exec_count = $2; + | tNEXT tNUM tEOL { DEBUG_CurrThread->exec_count = $2; DEBUG_CurrThread->exec_mode = EXEC_STEP_OVER; return 1; } - | tSTEPI tEOL { DEBUG_CurrThread->exec_count = 1; + | tSTEPI tEOL { DEBUG_CurrThread->exec_count = 1; DEBUG_CurrThread->exec_mode = EXEC_STEPI_INSTR; return 1; } - | tNEXTI tEOL { DEBUG_CurrThread->exec_count = 1; + | tNEXTI tEOL { DEBUG_CurrThread->exec_count = 1; DEBUG_CurrThread->exec_mode = EXEC_STEPI_OVER; return 1; } - | tSTEPI tNUM tEOL { DEBUG_CurrThread->exec_count = $2; + | tSTEPI tNUM tEOL { DEBUG_CurrThread->exec_count = $2; DEBUG_CurrThread->exec_mode = EXEC_STEPI_INSTR; return 1; } - | tNEXTI tNUM tEOL { DEBUG_CurrThread->exec_count = $2; + | tNEXTI tNUM tEOL { DEBUG_CurrThread->exec_count = $2; DEBUG_CurrThread->exec_mode = EXEC_STEPI_OVER; return 1; } | tABORT tEOL { kill(getpid(), SIGABRT); } | tMODE tNUM tEOL { mode_command($2); } @@ -200,19 +200,19 @@ list_arg: | pathname ':' tNUM { $$.sourcefile = $1; $$.line = $3; } | tIDENTIFIER { DEBUG_GetFuncInfo( & $$, NULL, $1); } | pathname ':' tIDENTIFIER { DEBUG_GetFuncInfo( & $$, $1, $3); } - | '*' expr_addr { DEBUG_FindNearestSymbol( & $2.addr, FALSE, NULL, 0, & $$ ); + | '*' expr_addr { DEBUG_FindNearestSymbol( & $2.addr, FALSE, NULL, 0, & $$ ); DEBUG_FreeExprMem(); } ; x_command: tEXAM expr_addr tEOL { DEBUG_ExamineMemory( &$2, 1, 'x'); DEBUG_FreeExprMem(); } - | tEXAM tFORMAT expr_addr tEOL { DEBUG_ExamineMemory( &$3, $2>>8, $2&0xff ); + | tEXAM tFORMAT expr_addr tEOL { DEBUG_ExamineMemory( &$3, $2>>8, $2&0xff ); DEBUG_FreeExprMem(); } ; print_command: tPRINT expr_addr tEOL { DEBUG_Print( &$2, 1, 0, 0 ); DEBUG_FreeExprMem(); } - | tPRINT tFORMAT expr_addr tEOL { DEBUG_Print( &$3, $2 >> 8, $2 & 0xff, 0 ); + | tPRINT tFORMAT expr_addr tEOL { DEBUG_Print( &$3, $2 >> 8, $2 & 0xff, 0 ); DEBUG_FreeExprMem(); } ; @@ -306,16 +306,16 @@ expr: | tSTRING { $$ = DEBUG_StringExpr($1); } | tINTVAR { $$ = DEBUG_IntVarExpr($1); } | tIDENTIFIER { $$ = DEBUG_SymbolExpr($1); } - | expr OP_DRF tIDENTIFIER { $$ = DEBUG_StructPExpr($1, $3); } - | expr '.' tIDENTIFIER { $$ = DEBUG_StructExpr($1, $3); } - | tIDENTIFIER '(' ')' { $$ = DEBUG_CallExpr($1, 0); } - | tIDENTIFIER '(' expr ')' { $$ = DEBUG_CallExpr($1, 1, $3); } - | tIDENTIFIER '(' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 2, $3, $5); } - | tIDENTIFIER '(' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 3, $3, $5, $7); } - | tIDENTIFIER '(' expr ',' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 4, $3, $5, $7, $9); } - | tIDENTIFIER '(' expr ',' expr ',' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 5, $3, $5, $7, $9, $11); } - | expr '[' expr ']' { $$ = DEBUG_BinopExpr(EXP_OP_ARR, $1, $3); } - | expr ':' expr { $$ = DEBUG_BinopExpr(EXP_OP_SEG, $1, $3); } + | expr OP_DRF tIDENTIFIER { $$ = DEBUG_StructPExpr($1, $3); } + | expr '.' tIDENTIFIER { $$ = DEBUG_StructExpr($1, $3); } + | tIDENTIFIER '(' ')' { $$ = DEBUG_CallExpr($1, 0); } + | tIDENTIFIER '(' expr ')' { $$ = DEBUG_CallExpr($1, 1, $3); } + | tIDENTIFIER '(' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 2, $3, $5); } + | tIDENTIFIER '(' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 3, $3, $5, $7); } + | tIDENTIFIER '(' expr ',' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 4, $3, $5, $7, $9); } + | tIDENTIFIER '(' expr ',' expr ',' expr ',' expr ',' expr ')' { $$ = DEBUG_CallExpr($1, 5, $3, $5, $7, $9, $11); } + | expr '[' expr ']' { $$ = DEBUG_BinopExpr(EXP_OP_ARR, $1, $3); } + | expr ':' expr { $$ = DEBUG_BinopExpr(EXP_OP_SEG, $1, $3); } | expr OP_LOR expr { $$ = DEBUG_BinopExpr(EXP_OP_LOR, $1, $3); } | expr OP_LAND expr { $$ = DEBUG_BinopExpr(EXP_OP_LAND, $1, $3); } | expr '|' expr { $$ = DEBUG_BinopExpr(EXP_OP_OR, $1, $3); } @@ -341,7 +341,7 @@ expr: | '(' expr ')' { $$ = $2; } | '*' expr %prec OP_DEREF { $$ = DEBUG_UnopExpr(EXP_OP_DEREF, $2); } | '&' expr %prec OP_DEREF { $$ = DEBUG_UnopExpr(EXP_OP_ADDR, $2); } - | '(' type_expr ')' expr %prec OP_DEREF { $$ = DEBUG_TypeCastExpr($2, $4); } + | '(' type_expr ')' expr %prec OP_DEREF { $$ = DEBUG_TypeCastExpr($2, $4); } ; /* @@ -358,18 +358,18 @@ lval: lvalue { $$ = $1; } lvalue: tNUM { $$ = DEBUG_ConstExpr($1); } | tINTVAR { $$ = DEBUG_IntVarExpr($1); } | tIDENTIFIER { $$ = DEBUG_SymbolExpr($1); } - | lvalue OP_DRF tIDENTIFIER { $$ = DEBUG_StructPExpr($1, $3); } - | lvalue '.' tIDENTIFIER { $$ = DEBUG_StructExpr($1, $3); } - | lvalue '[' expr ']' { $$ = DEBUG_BinopExpr(EXP_OP_ARR, $1, $3); } + | lvalue OP_DRF tIDENTIFIER { $$ = DEBUG_StructPExpr($1, $3); } + | lvalue '.' tIDENTIFIER { $$ = DEBUG_StructExpr($1, $3); } + | lvalue '[' expr ']' { $$ = DEBUG_BinopExpr(EXP_OP_ARR, $1, $3); } ; identifier: tIDENTIFIER { $$ = $1; } | identifier '.' tIDENTIFIER { char* ptr = DBG_alloc(strlen($1) + 1 + strlen($3)+ 1); sprintf(ptr, "%s.%s", $1, $3); $$ = DEBUG_MakeSymbol(ptr); - DBG_free(ptr); } + DBG_free(ptr); } | identifier ':' ':' tIDENTIFIER { char* ptr = DBG_alloc(strlen($1) + 2 + strlen($4) + 1); sprintf(ptr, "%s::%s", $1, $4); $$ = DEBUG_MakeSymbol(ptr); - DBG_free(ptr); } + DBG_free(ptr); } ; %% diff --git a/debugger/debug.l b/debugger/debug.l index 0774f06a76d..9ecc868d279 100644 --- a/debugger/debug.l +++ b/debugger/debug.l @@ -61,7 +61,7 @@ STRING \"[^\n"]+\" /* set to special state when no process is loaded. */ if (!DEBUG_CurrProcess && YYSTATE == INITIAL) {BEGIN(NOPROCESS);} -<*>\n { BEGIN(INITIAL); syntax_error = 0; return tEOL; } +<*>\n { BEGIN(INITIAL); syntax_error = 0; return tEOL; } /* Indicates end of command. Reset state. */ "||" { return OP_LOR; } @@ -149,7 +149,7 @@ STRING \"[^\n"]+\" info|inf|in { return tINFO; } vm86 { return tVM86; } -directories|directorie|directori|director|directo|direct|direc|direc|dir { +directories|directorie|directori|director|directo|direct|direc|direc|dir { BEGIN(PATH_EXPECTED); return tDIR; } char { return tCHAR; } @@ -169,11 +169,11 @@ enum { return tENUM; } {PATHNAME} { yylval.string = DEBUG_MakeSymbol(yytext); return tPATH; } -<*>[ \t]+ /* Eat up whitespace */ +<*>[ \t]+ /* Eat up whitespace */ . { BEGIN(ASTRING_EXPECTED); yyless(0); return tNOPROCESS;} <*>. { if (syntax_error == 0) { - syntax_error++; + syntax_error++; DEBUG_Printf(DBG_CHN_MESG, "Syntax Error (%s)\n", yytext); } } %% @@ -235,11 +235,11 @@ int DEBUG_ReadLine(const char* pfx, char * buf, int size, int flush_sym, int kee static char last_line[256] = ""; /* If there is anything left, add it to the history list and execute it. Otherwise, re-execute last command. */ - + if (*buf_line) { strncpy( last_line, buf_line, sizeof(last_line) - 1 ); - last_line[sizeof(last_line) - 1] = '\0'; + last_line[sizeof(last_line) - 1] = '\0'; } ptr = last_line; } diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 9829173cb7c..7a201fc2266 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -54,7 +54,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) Makedll.rules: $(TOPSRCDIR)/Makedll.rules.in $(TOPSRCDIR)/configure @echo $? is newer than 'Makedll.rules', please rerun ./configure! - @exit 1 + @exit 1 # Rules for installation diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 68da71c5959..d85e2df6eb5 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -1,8 +1,8 @@ name comctl32 init COMCTL32_LibMain -# Functions exported by the Win95 comctl32.dll -# (these need to have these exact ordinals, because some win95 dlls +# Functions exported by the Win95 comctl32.dll +# (these need to have these exact ordinals, because some win95 dlls # import comctl32.dll by ordinal) # This list was created from a comctl32.dll v5.81 (IE5.01). @@ -100,7 +100,7 @@ init COMCTL32_LibMain 151 stdcall CreateMRUListA(ptr) CreateMRUListA 152 stdcall FreeMRUList(long) FreeMRUList 153 stdcall AddMRUStringA(long str) AddMRUStringA -154 stdcall EnumMRUListA(long long ptr long) EnumMRUListA +154 stdcall EnumMRUListA(long long ptr long) EnumMRUListA 155 stdcall FindMRUStringA(long str ptr) FindMRUStringA 156 stdcall DelMRUString(long long) DelMRUString 157 stdcall CreateMRUListLazyA(ptr long long long) CreateMRUListLazyA diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc index 77b80c5a1c4..54651426ed6 100644 --- a/dlls/comctl32/comctl_De.rc +++ b/dlls/comctl32/comctl_De.rc @@ -22,8 +22,8 @@ STRINGTABLE DISCARDABLE { IDS_CLOSE "Schlieﾟen" } - -STRINGTABLE DISCARDABLE + +STRINGTABLE DISCARDABLE { IDM_TODAY "Heute:" IDM_GOTODAY "Gehe zu Heute" diff --git a/dlls/comctl32/comctl_En.rc b/dlls/comctl32/comctl_En.rc index 8001d592792..e77af1b71c7 100644 --- a/dlls/comctl32/comctl_En.rc +++ b/dlls/comctl32/comctl_En.rc @@ -68,8 +68,8 @@ STRINGTABLE DISCARDABLE { IDS_CLOSE "Close" } - -STRINGTABLE DISCARDABLE + +STRINGTABLE DISCARDABLE { IDM_TODAY "Today:" IDM_GOTODAY "Go to today" diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index b8b7a2c827d..a06bf5d34af 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDT_CHECK BITMAP LOADONCALL DISCARDABLE -{ +{ '42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00' '00 00 1F 00 00 00 10 00 00 00 01 00 04 00 02 00' '00 00 30 01 00 00 01 00 00 00 01 00 00 00 0A 00' diff --git a/dlls/commdlg/cdlg_Ca.rc b/dlls/commdlg/cdlg_Ca.rc index 51c9f4ab231..f684df6c63e 100644 --- a/dlls/commdlg/cdlg_Ca.rc +++ b/dlls/commdlg/cdlg_Ca.rc @@ -140,7 +140,7 @@ FONT 8, "Helv" } -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Color" FONT 8, "Helv" diff --git a/dlls/commdlg/cdlg_Da.rc b/dlls/commdlg/cdlg_Da.rc index 09c7312f8a8..39856c85c7f 100644 --- a/dlls/commdlg/cdlg_Da.rc +++ b/dlls/commdlg/cdlg_Da.rc @@ -131,7 +131,7 @@ FONT 8, "Helv" PUSHBUTTON "&Hj詬p" , 1038,218,57,40,14,WS_GROUP GROUPBOX "Effekter",1072,6,72,84,34,WS_GROUP CHECKBOX "&Gennemstreget", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Understreget", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Understreget", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Farve:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_De.rc b/dlls/commdlg/cdlg_De.rc index b04360b00a5..5a40211cdc6 100644 --- a/dlls/commdlg/cdlg_De.rc +++ b/dlls/commdlg/cdlg_De.rc @@ -161,7 +161,7 @@ FONT 8, "Helv" PUSHBUTTON "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP GROUPBOX "Darstellung",1072,6,72,84,34,WS_GROUP CHECKBOX "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Farbe:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -250,10 +250,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 122, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "File&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "File&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -333,14 +333,14 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Zufuhr:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "Orientierung", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "&Hochformat", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 CONTROL "&Querformat", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "ﾜ&ber den Folderpicker" IDS_DOCUMENTFOLDERS "Dokumenten Ordner" @@ -352,7 +352,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "Mein Computer" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "System Ordner" IDS_LOCALHARDRIVES "Lokale Hard Disks" diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc index 225411562d0..b83a40f5b9a 100644 --- a/dlls/commdlg/cdlg_En.rc +++ b/dlls/commdlg/cdlg_En.rc @@ -125,13 +125,13 @@ FONT 8, "Helv" LTEXT "&Size:",1090,179,3,30,9 COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Apply", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effects",1072,6,72,84,34,WS_GROUP CHECKBOX "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Color:", 1091 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -187,7 +187,7 @@ FONT 8, "Helv" CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,7 +205,7 @@ FONT 8, "Helv" CHECKBOX "Match &Whole Word Only", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Match &Case", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Find Next", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&Find Next", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Replace", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Replace &All", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP @@ -281,7 +281,7 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Source:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 @@ -330,10 +330,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -344,7 +344,7 @@ FONT 8, "helv" PUSHBUTTON "&Help", pshHelp,222,145,50,14 } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&About FolderPicker Test" IDS_DOCUMENTFOLDERS "Document Folders" @@ -356,7 +356,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "My Computer" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "System Folders" IDS_LOCALHARDRIVES "Local Hard Drives" @@ -377,7 +377,7 @@ STRINGTABLE DISCARDABLE IDS_LISTVIEW "List" IDS_REPORTVIEW "Details" IDS_TODESKTOP "Browse to Desktop" -} +} STRINGTABLE DISCARDABLE { diff --git a/dlls/commdlg/cdlg_Fi.rc b/dlls/commdlg/cdlg_Fi.rc index a9130a28003..8ea55066371 100644 --- a/dlls/commdlg/cdlg_Fi.rc +++ b/dlls/commdlg/cdlg_Fi.rc @@ -131,7 +131,7 @@ FONT 8, "Helv" PUSHBUTTON "&Ohje" , 1038,218,57,40,14,WS_GROUP GROUPBOX "Efektit",1072,6,72,84,34,WS_GROUP CHECKBOX "Yli&viivattu", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "V&舐i:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_Fr.rc b/dlls/commdlg/cdlg_Fr.rc index c37b228f561..001282b894c 100644 --- a/dlls/commdlg/cdlg_Fr.rc +++ b/dlls/commdlg/cdlg_Fr.rc @@ -197,7 +197,7 @@ FONT 8, "Helv" DEFPUSHBUTTON "Ok", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Aide", 1038,100,166, 44, 14 - PUSHBUTTON "A&jouter couleur personnalis馥s", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&jouter couleur personnalis馥s", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&D馭inir couleurs personnalis馥s >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -248,10 +248,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 122, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "&Nom du fichier:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "&Type du fichier",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -331,14 +331,14 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Source:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "&Portrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 CONTROL "&Paysage", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "A propos du choix de r駱ertoires" IDS_DOCUMENTFOLDERS "R駱ertoire Documents" @@ -350,7 +350,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "Poste de travail" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "R駱ertoires syst鑪e" IDS_LOCALHARDRIVES "Disques locaux" diff --git a/dlls/commdlg/cdlg_It.rc b/dlls/commdlg/cdlg_It.rc index 9d3a9577f2e..8a6131e9082 100644 --- a/dlls/commdlg/cdlg_It.rc +++ b/dlls/commdlg/cdlg_It.rc @@ -130,7 +130,7 @@ FONT 8, "Helv" PUSHBUTTON "&Aiuto" , 1038,218,57,40,14,WS_GROUP GROUPBOX "Effetti",1072,6,72,84,34,WS_GROUP CHECKBOX "&Barrato", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Sottolineato", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Sottolineato", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Colore:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_Ja.rc b/dlls/commdlg/cdlg_Ja.rc index 41227ca5d10..39ed5bbaa04 100644 --- a/dlls/commdlg/cdlg_Ja.rc +++ b/dlls/commdlg/cdlg_Ja.rc @@ -131,7 +131,7 @@ FONT 8, " PUSHBUTTON "ﾍﾙﾌﾟ(&H)" , 1038,218,57,40,14,WS_GROUP GROUPBOX "文字飾り",1072,6,72,84,34,WS_GROUP CHECKBOX "取り消し線(&K)", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "下線(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "下線(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "色(&C):", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -186,7 +186,7 @@ FONT 8, " GROUPBOX "検索する方向", 1072, 107, 26, 68, 28 CONTROL "上へ向かって(&U)", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "下へ向かって(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - + DEFPUSHBUTTON "次を検索(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ｷｬﾝｾﾙ", 2, IDCANCEL, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾍﾙﾌﾟ(&H)", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP @@ -204,7 +204,7 @@ FONT 8, " EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "単語単位で検索(&W)", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "大文字と小文字を区別する(&C)", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - + DEFPUSHBUTTON "次を検索(&F)", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "置換して次に(&R)", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "すべてを置換(&A)", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP @@ -281,7 +281,7 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Source:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "印刷方向", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "縦(&O)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 @@ -299,10 +299,10 @@ FONT 8, " LTEXT "" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "ﾌｧｲﾙ名(&N):",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY EDITTEXT IDC_FILENAME,56,110,153,12,ES_AUTOHSCROLL - + LTEXT "ﾌｧｲﾙの種類(&T):",IDC_FILETYPESTATIC,5,128,52,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,56,126,153,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -313,7 +313,7 @@ FONT 8, " PUSHBUTTON "ﾍﾙﾌﾟ(&H)", pshHelp,222,145,50,14 } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&About FolderPicker Test" IDS_DOCUMENTFOLDERS "Document Folders" @@ -325,7 +325,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "ﾏｲ ｺﾝﾋﾟｭｰﾀ" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "System Folders" IDS_LOCALHARDRIVES "Local Hard Drives" @@ -333,4 +333,3 @@ STRINGTABLE DISCARDABLE IDS_VERIFYFILE "ﾌｧｲﾙ名を確認してください。" IDS_CREATEFILE "このﾌｧｲﾙは存在しません。\n作成しますか?" } - diff --git a/dlls/commdlg/cdlg_Nl.rc b/dlls/commdlg/cdlg_Nl.rc index 620c0bd5ef8..5744606d8a0 100644 --- a/dlls/commdlg/cdlg_Nl.rc +++ b/dlls/commdlg/cdlg_Nl.rc @@ -125,13 +125,13 @@ FONT 8, "Helv" LTEXT "&Grootte:",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuleren",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Toepassen", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effecten",1072,6,72,84,34,WS_GROUP CHECKBOX "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Kleur:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -187,7 +187,7 @@ FONT 8, "Helv" CONTROL "&Omhoog", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "Om&laag", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuleren", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,7 +205,7 @@ FONT 8, "Helv" CHECKBOX "Heel &woord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "Volgende zoeken", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "Volgende zoeken", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Ve&rvangen", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Alles vervangen", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_No.rc b/dlls/commdlg/cdlg_No.rc index c0f8cd4f683..d33f5829e3f 100644 --- a/dlls/commdlg/cdlg_No.rc +++ b/dlls/commdlg/cdlg_No.rc @@ -169,7 +169,7 @@ FONT 8, "Helv" { LTEXT "&Finn hva:", -1, 4, 9, 48, 8 EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Bytt med:", -1, 4, 26, 48, 8 + LTEXT "&Bytt med:", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Skill p store/sm bokstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_Pl.rc b/dlls/commdlg/cdlg_Pl.rc index 97d365b3066..8d28ebdcf64 100644 --- a/dlls/commdlg/cdlg_Pl.rc +++ b/dlls/commdlg/cdlg_Pl.rc @@ -52,7 +52,7 @@ BEGIN CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9 LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Pokazuj pliki &typu:", 1089, 6, 104, 90, 9, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36 + CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36 LTEXT "&Stacje dyskw:", 1091, 110, 104, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68 CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 6, 56, 14 @@ -115,7 +115,7 @@ FONT 8, "Helv" BEGIN LTEXT "&Czcionka:", 1088, 6,3,40,9, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", 1136, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | -CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 6,13,94,54 +CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 6,13,94,54 LTEXT "St&yl:", 1089, 108,3,44,9, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", 1137, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 108,13,64,54 @@ -124,12 +124,12 @@ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 108,13,64,54 WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT, 179,13,32,54 CONTROL "OK", IDOK, "BUTTON", WS_GROUP, 218,6,40,14 CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,23,40,14 - CONTROL "&Zastosuj", 1026, "BUTTON", WS_GROUP, 218,40,40,14 + CONTROL "&Zastosuj", 1026, "BUTTON", WS_GROUP, 218,40,40,14 CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,57,40,14 CONTROL "Efekty specialne", 1072, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6,72,84,34 CONTROL "Prz&ekre徑ona", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 82, 58, 10 CONTROL "P&odkre徑ona", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10,94,50,10 - LTEXT "&Kolor:", 1091, 6,110,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Kolor:", 1091, 6,110,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", 1139, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6,120,84,100 CONTROL "Przykｳad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49 @@ -174,7 +174,7 @@ BEGIN CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 56, 68, 14 CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 75, 68, 14 END - + CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Color" diff --git a/dlls/commdlg/cdlg_Pt.rc b/dlls/commdlg/cdlg_Pt.rc index 3e00cb53938..5e634881b6c 100644 --- a/dlls/commdlg/cdlg_Pt.rc +++ b/dlls/commdlg/cdlg_Pt.rc @@ -131,7 +131,7 @@ FONT 8, "Helv" PUSHBUTTON "A&juda" , 1038,218,57,40,14,WS_GROUP GROUPBOX "Efeitos",1072,6,72,84,34,WS_GROUP CHECKBOX "&Riscado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Sublinhado", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Sublinhado", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Cor:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -222,7 +222,7 @@ FONT 8, "Helv" DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 48,14, WS_GROUP - + GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Imprimir em arqui&vo", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "Propri&edades", psh2, 212, 17, 60,14, WS_GROUP @@ -236,13 +236,13 @@ FONT 8, "Helv" LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Coment疵io:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - + GROUPBOX "Cpias", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nmero de &cpias:", stc5, 168,108, 68, 8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "&Agrupar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - + GROUPBOX "Faixa de impress縊", grp1, 8,92, 144,64, WS_GROUP CONTROL "&Todos", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "P&ginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 @@ -295,18 +295,18 @@ FONT 8, "helv" { LTEXT "Olhar &em",IDC_LOOKINSTATIC,7,6,27,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,36,3,138,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - + LTEXT "" , IDC_TOOLBARSTATIC, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "Nome do &arquivo:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL - + LTEXT "Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - + CONTROL "Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 - + DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,13 PUSHBUTTON "Cancel", IDCANCEL,222,128,50,14 PUSHBUTTON "&Help", pshHelp,222,145,50,14 @@ -337,7 +337,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { PD32_PRINT_TITLE "Print" - + PD32_VALUE_UREADABLE "Entrada Ilegvel" PD32_INVALID_PAGE_RANGE "Este valor n縊 se encaixa na faixa de p疊inas\n\ Por favor entre um valor entre %d e %d" @@ -353,14 +353,14 @@ pela sua impressora.\nPor favor entre um valor entre 1 e %d" PD32_OUT_OF_MEMORY "Memria insulficiente" PD32_GENERIC_ERROR "Ocorreu algum erro" PD32_DRIVER_UNKNOWN "Driver de impressora desconhecido" - + PD32_DEFAULT_PRINTER "Impressora Padr縊; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila" PD32_PRINT_ALL_X_PAGES "&Todas %d p疊inas" PD32_MARGINS_IN_INCHES "Margens [polegadas]" PD32_MARGINS_IN_MILIMETERS "Margens [mm]" PD32_MILIMETERS "mm" - + PD32_PRINTER_STATUS_READY "Pronto" PD32_PRINTER_STATUS_PAUSED "Pausado; " PD32_PRINTER_STATUS_ERROR "Erro; " diff --git a/dlls/commdlg/cdlg_Ru.rc b/dlls/commdlg/cdlg_Ru.rc index 3c54ac18562..28b4cce27c1 100644 --- a/dlls/commdlg/cdlg_Ru.rc +++ b/dlls/commdlg/cdlg_Ru.rc @@ -125,13 +125,13 @@ FONT 8, "Ms Sans Serif" LTEXT "&ﾐ珸褞:",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ﾎ褊",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&ﾏ韲褊頸", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&ﾑ珞" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "ﾀ鞦",1072,6,72,84,34,WS_GROUP CHECKBOX "&ﾇ璞褞", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "ﾏ&褞", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "ﾏ&褞", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "ﾖ&粢:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -187,7 +187,7 @@ FONT 8, "Ms Sans Serif" CONTROL "&ﾂ粢", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "ﾂ&韈", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&ﾍ琺 萵裹", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&ﾍ琺 萵裹", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ﾎ褊", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&ﾑ珞", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,7 +205,7 @@ FONT 8, "Ms Sans Serif" CHECKBOX "&ﾒ 粽 褄韭", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "ﾑ &褪 裙頌", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&ﾍ琺 萵裹", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&ﾍ琺 萵裹", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&ﾇ瑟褊頸", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾇ瑟褊頸 &糂", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾎ褊", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP @@ -280,7 +280,7 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&ﾈ韭:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "ﾎ韃璋", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "&ﾏ褪", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 @@ -298,10 +298,10 @@ FONT 8, "Ms Sans Serif" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "ﾈ &琺:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "ﾔ琺 &韵",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -312,7 +312,7 @@ FONT 8, "Ms Sans Serif" PUSHBUTTON "&ﾑ珞", pshHelp,222,145,50,14 } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&ﾎ 褥 ﾂ碚ﾏ瑜" IDS_DOCUMENTFOLDERS "ﾏ瑜 蒡褊" @@ -324,7 +324,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "ﾌ 褞" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "ﾑ頌褌 瑜" IDS_LOCALHARDRIVES "ﾋ琿 趺韃 蒻" @@ -345,7 +345,7 @@ STRINGTABLE DISCARDABLE IDS_LISTVIEW "ﾑ頌" IDS_REPORTVIEW "ﾏ蓿硼" IDS_TODESKTOP "ﾏ褞襄 珮韜 " -} +} STRINGTABLE DISCARDABLE { diff --git a/dlls/commdlg/cdlg_Sk.rc b/dlls/commdlg/cdlg_Sk.rc index 5319e8ea254..01a2eebfdcb 100644 --- a/dlls/commdlg/cdlg_Sk.rc +++ b/dlls/commdlg/cdlg_Sk.rc @@ -127,13 +127,13 @@ FONT 8, "Helv" LTEXT "&Veｾkos:",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Zru喨",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Aplikova", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Efekty",1072,6,72,84,34,WS_GROUP CHECKBOX "P&re鑛arknut", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Pod鑛arknut", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Pod鑛arknut", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Farba:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -282,7 +282,7 @@ BEGIN COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "&Zdroj:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - + GROUPBOX "Orient當ia", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "&Na v嗅u", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 @@ -300,10 +300,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "&Meno sboru:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "&Typ sborov",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -314,7 +314,7 @@ FONT 8, "helv" PUSHBUTTON "&Pomoc", pshHelp,222,145,50,14 } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&O teste uchopovania adres疵ov" IDS_DOCUMENTFOLDERS "Adres疵 dokumentov" @@ -326,7 +326,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "Mj po竟ta" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "Syst駑ov adres疵e" IDS_LOCALHARDRIVES "Lok疝ne pevn disky" @@ -347,7 +347,7 @@ STRINGTABLE DISCARDABLE IDS_LISTVIEW "Zoznam" IDS_REPORTVIEW "Detaily" IDS_TODESKTOP "Listova pracovn plochu" -} +} STRINGTABLE DISCARDABLE { diff --git a/dlls/commdlg/cdlg_Sv.rc b/dlls/commdlg/cdlg_Sv.rc index 929f1097258..8c9ee8a6d03 100644 --- a/dlls/commdlg/cdlg_Sv.rc +++ b/dlls/commdlg/cdlg_Sv.rc @@ -129,7 +129,7 @@ FONT 8, "Helv" PUSHBUTTON "&Hj舁p" , 1038,218,57,40,14,WS_GROUP GROUPBOX "Effekter",1072,6,72,84,34,WS_GROUP CHECKBOX "&Genomstruken", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Understruken", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Understruken", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&F舐g:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -217,7 +217,7 @@ FONT 8, "Helv" DEFPUSHBUTTON "Ok", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&Hj舁p", pshHelp, 50, 161, 48,14, WS_GROUP - + GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Skr&iv till fil",chx1,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP @@ -246,9 +246,9 @@ FONT 8, "Helv" EDITTEXT edt2, 118,122, 26,12, WS_GROUP |ES_NUMBER RTEXT "&fr蚣:", stc2, 52,124, 20,8 RTEXT "&till:", stc3, 100,124, 16,8 - + } - + PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK @@ -257,7 +257,7 @@ FONT 8, "Helv" BEGIN DEFPUSHBUTTON "Ok",IDOK,180,156,48,14,WS_GROUP PUSHBUTTON "Avbryt",IDCANCEL,232,156,48,14 - + GROUPBOX "Skrivare", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Namn:", stc6, 16, 20, 36,8 @@ -268,7 +268,7 @@ BEGIN LTEXT "Dum typ", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Plats:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "Dum plats", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Kommentar:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Kommentar:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Dum kommnetar", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papper", grp2, 8, 92, 164,56, WS_GROUP LTEXT "St&orlek:", stc2, 16,108, 36, 8 @@ -321,10 +321,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "Fil&namn:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - + LTEXT "&Filformat",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -346,7 +346,7 @@ STRINGTABLE DISCARDABLE IDS_FONTS "Typsnitt" IDS_MYCOMPUTER "Den h舐 datorn" } - + STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "Systemmappar" @@ -360,7 +360,7 @@ STRINGTABLE DISCARDABLE IDS_PATHNOTEXISTING "Skv臠en finns inte" IDS_FILENOTEXISTING "Filen finns inte" } - + STRINGTABLE DISCARDABLE { IDS_UPFOLDER "Upp en niv" @@ -373,7 +373,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { PD32_PRINT_TITLE "Skriv ut" - + PD32_VALUE_UREADABLE "Ol舖bart f舁t" PD32_INVALID_PAGE_RANGE "Detta v舐det ligger inte inom sidourvalet.\n\ Var god skriv in ett v舐de mellan %d och %d." @@ -395,7 +395,7 @@ pappersgr PD32_MARGINS_IN_INCHES "Marginaler [inches]" PD32_MARGINS_IN_MILIMETERS "Marginaler [millimeter]" PD32_MILIMETERS "millimeter" - + PD32_PRINTER_STATUS_READY "Redo" PD32_PRINTER_STATUS_PAUSED "Stannad; " PD32_PRINTER_STATUS_ERROR "Fel; " @@ -423,5 +423,3 @@ pappersgr PD32_PRINTER_STATUS_SERVER_UNKNOWN "Skrivarserver ok舅d; " PD32_PRINTER_STATUS_POWER_SAVE "Fels臾ert l臠e; " } - - diff --git a/dlls/commdlg/cdlg_Wa.rc b/dlls/commdlg/cdlg_Wa.rc index 1ecbc4e27e3..93c55bbe7b6 100644 --- a/dlls/commdlg/cdlg_Wa.rc +++ b/dlls/commdlg/cdlg_Wa.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_WALON, SUBLANG_DEFAULT -/* +/* * Si vos voloz aider avou li ratornaedje des libes programes walon, * vos poloz scrre a l' adresse emile */ @@ -173,7 +173,7 @@ FONT 8, "Helv" DEFPUSHBUTTON "I Va", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Rinonc", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Aide", 1038,100,166, 44, 14 - PUSHBUTTON "Rad&jouter des coleur da vosse", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Rad&jouter des coleur da vosse", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Defini les coleurs da vosse >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&u",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -216,5 +216,3 @@ FONT 8, "Helv" PUSHBUTTON "Rinonc",IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Aide", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } - - diff --git a/dlls/commdlg/cdlg_Zh.rc b/dlls/commdlg/cdlg_Zh.rc index 3a7beb6cbc6..e601d387917 100644 --- a/dlls/commdlg/cdlg_Zh.rc +++ b/dlls/commdlg/cdlg_Zh.rc @@ -75,13 +75,13 @@ FONT 8, "Helv" LTEXT "ｴﾐ｡(&S):",1090,209,3,30,9 COMBOBOX 1138,209,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "ｴ_ｶｨ",IDOK,248,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "ｴ_ｶｨ",IDOK,248,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ﾈ｡ﾏ",IDCANCEL,248,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾌﾗﾓﾃ(&A)", 1026,248,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾇﾖ(&H)" , 1038,248,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "ﾐｧｹ",1072,6,72,84,34,WS_GROUP CHECKBOX "hｳｾ(&K)", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "ｵﾗｾ(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "ｵﾗｾ(&U)", 1041, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "ﾉｫｲﾊ(&C):", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -137,7 +137,7 @@ FONT 8, "Helv" CONTROL "ﾏﾉﾏ(&U)", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 100, 38, 45, 12 CONTROL "ﾏﾏﾂ(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 145, 38, 45, 12 - DEFPUSHBUTTON "ﾕﾒﾏﾂﾒｻ(&F)", IDOK, 199, 5, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "ﾕﾒﾏﾂﾒｻ(&F)", IDOK, 199, 5, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL , 199, 23, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾇﾖ(&H)", pshHelp , 199, 45, 60, 14, WS_GROUP | WS_TABSTOP } @@ -155,7 +155,7 @@ FONT 8, "Helv" CHECKBOX "ﾈｫﾗﾖﾆｴ倦垤ｺﾏ(&W)", 1040, 5, 46, 89, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "ｴﾐ｡倦ﾒ服鰕ｮ(&C)", 1041, 5, 62, 89, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "ﾕﾒﾏﾂﾒｻ(&F)", IDOK, 199, 4, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "ﾕﾒﾏﾂﾒｻ(&F)", IDOK, 199, 4, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ﾈ｡ｴ(&R)", psh1 , 199, 21, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾈ｡ｴﾈｫｲｿ(&A)", psh2 , 199, 38, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL , 199, 55, 60, 14, WS_GROUP | WS_TABSTOP @@ -172,10 +172,10 @@ FONT 8, "helv" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - + LTEXT "冢ｰｸﾃｷQ(&N):",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,59,110,155,12,ES_AUTOHSCROLL - + LTEXT "冢ｰｸ籍ﾍ(&T):",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,59,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -186,7 +186,7 @@ FONT 8, "helv" PUSHBUTTON "ﾇﾖ(&H)", pshHelp,222,145,50,14 } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&About FolderPicker Test" IDS_DOCUMENTFOLDERS "ﾎﾄｼ晦" @@ -198,7 +198,7 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "ﾎﾒｵﾄ監X" } -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "System Folders" IDS_LOCALHARDRIVES "Local Hard Drives" @@ -219,5 +219,4 @@ STRINGTABLE DISCARDABLE IDS_LISTVIEW "ﾇ蜀ﾎ" IDS_REPORTVIEW "ﾔ半壑Yﾁﾏ" IDS_TODESKTOP "@ﾊｾﾗﾀﾃ" -} - +} diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/commdlg/cdlg_xx.rc index 2e08dbcb5a3..faa1a05a7da 100644 --- a/dlls/commdlg/cdlg_xx.rc +++ b/dlls/commdlg/cdlg_xx.rc @@ -148,7 +148,7 @@ PD32_COLLATE ICON DISCARDABLE LOADONCALL /* BINRES pd32_nocollate.ico */ -PD32_NOCOLLATE ICON +PD32_NOCOLLATE ICON { '00 00 01 00 01 00 4C 18 10 00 00 00 00 00 48 05' '00 00 16 00 00 00 28 00 00 00 4C 00 00 00 30 00' @@ -239,7 +239,7 @@ PD32_NOCOLLATE ICON } /* BINRES pd32_portrait.ico */ -PD32_PORTRAIT ICON +PD32_PORTRAIT ICON { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' @@ -292,7 +292,7 @@ PD32_PORTRAIT ICON } /* BINRES pd32_landscape.ico */ -PD32_LANDSCAPE ICON +PD32_LANDSCAPE ICON { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' diff --git a/dlls/gdi/gdi.exe.spec b/dlls/gdi/gdi.exe.spec index e5373142033..776ed6c7ef7 100644 --- a/dlls/gdi/gdi.exe.spec +++ b/dlls/gdi/gdi.exe.spec @@ -55,7 +55,7 @@ rsrc version16.res 43 pascal16 PaintRgn(word word) PaintRgn16 44 pascal16 SelectClipRgn(word word) SelectClipRgn16 45 pascal16 SelectObject(word word) SelectObject16 -46 stub BITMAPBITS # W1.1, W2.0 +46 stub BITMAPBITS # W1.1, W2.0 47 pascal16 CombineRgn(word word word s_word) CombineRgn16 48 pascal16 CreateBitmap(word word word word ptr) CreateBitmap16 49 pascal16 CreateBitmapIndirect(ptr) CreateBitmapIndirect16 diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 6741a4766bf..7a12d6e03b9 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -387,7 +387,7 @@ init MAIN_GdiInit @ stdcall SetWorldTransform(long ptr) SetWorldTransform @ stdcall StartDocA(long ptr) StartDocA @ stdcall StartDocW(long ptr) StartDocW -@ stdcall StartPage(long) StartPage +@ stdcall StartPage(long) StartPage @ stdcall StretchBlt(long long long long long long long long long long long) StretchBlt @ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) StretchDIBits @ stdcall StrokeAndFillPath(long) StrokeAndFillPath diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index b5f6a2bbfdd..efda7f5635f 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -8,11 +8,8 @@ IMPORTS = kernel32 LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o -C_SRCS = icmp_main.c +C_SRCS = icmp_main.c @MAKE_DLL_RULES@ ### Dependencies: - - - diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 26c74082648..5df5a5640f1 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1,8 +1,8 @@ name kernel32 init MAIN_KernelInit -# Functions exported by the Win95 kernel32.dll -# (these need to have these exact ordinals, for some win95 dlls +# Functions exported by the Win95 kernel32.dll +# (these need to have these exact ordinals, for some win95 dlls # import kernel32.dll by ordinal) # names of undocumented ordinal only calls are taken from: @@ -55,7 +55,7 @@ init MAIN_KernelInit 42 stdcall -register -i386 LogApiThkLSF(str) LogApiThkLSF 43 stdcall ThunkInitLS(long str long str str) ThunkInitLS 44 stdcall -register -i386 LogApiThkSL(str) LogApiThkSL - 45 stdcall -register -i386 Common32ThkLS() Common32ThkLS + 45 stdcall -register -i386 Common32ThkLS() Common32ThkLS 46 stdcall ThunkInitSL(long str long str str) ThunkInitSL 47 stdcall -register -i386 LogCBThkSL(str) LogCBThkSL 48 stdcall ReleaseThunkLock(ptr) ReleaseThunkLock @@ -611,7 +611,7 @@ init MAIN_KernelInit @ stdcall RaiseException(long long long ptr) RaiseException @ stdcall ReadConsoleA(long ptr long ptr ptr) ReadConsoleA @ stdcall ReadConsoleInputA(long ptr long ptr) ReadConsoleInputA -@ stdcall ReadConsoleInputW(long ptr long ptr) ReadConsoleInputW +@ stdcall ReadConsoleInputW(long ptr long ptr) ReadConsoleInputW @ stdcall ReadConsoleOutputA(long ptr long long ptr) ReadConsoleOutputA @ stdcall ReadConsoleOutputAttribute(long ptr long long ptr) ReadConsoleOutputAttribute @ stdcall ReadConsoleOutputCharacterA(long ptr long long ptr) ReadConsoleOutputCharacterA @@ -822,9 +822,9 @@ init MAIN_KernelInit @ stdcall lstrlen(str) lstrlenA @ stdcall lstrlenA(str) lstrlenA @ stdcall lstrlenW(wstr) lstrlenW -# +# # Functions exported by kernel32.dll in NT 3.51 -# +# @ stub AddConsoleAliasA @ stub AddConsoleAliasW @ stub BaseAttachCompleteThunk @@ -918,7 +918,7 @@ init MAIN_KernelInit @ stdcall GetFileAttributesExA(str long ptr) GetFileAttributesExA @ stdcall GetFileAttributesExW(wstr long ptr) GetFileAttributesExW @ stub GetProcessPriorityBoost -@ stdcall GetThreadPriorityBoost(long ptr) GetThreadPriorityBoost +@ stdcall GetThreadPriorityBoost(long ptr) GetThreadPriorityBoost @ stdcall InterlockedCompareExchange (ptr long long) InterlockedCompareExchange @ stdcall InterlockedExchangeAdd (ptr long ) InterlockedExchangeAdd @ stdcall IsProcessorFeaturePresent(long) IsProcessorFeaturePresent diff --git a/dlls/kernel/krnl386.exe.spec b/dlls/kernel/krnl386.exe.spec index 5a6025ff5fd..97d9d742683 100644 --- a/dlls/kernel/krnl386.exe.spec +++ b/dlls/kernel/krnl386.exe.spec @@ -61,7 +61,7 @@ rsrc version16.res 52 pascal16 FreeProcInstance(segptr) FreeProcInstance16 53 stub CallProcInstance 54 pascal16 GetInstanceData(word word word) GetInstanceData16 -55 pascal -register Catch(ptr) Catch16 +55 pascal -register Catch(ptr) Catch16 56 pascal -register Throw(ptr word) Throw16 57 pascal16 GetProfileInt(str str s_word) GetProfileInt16 58 pascal16 GetProfileString(str str str ptr word) GetProfileString16 @@ -304,7 +304,7 @@ rsrc version16.res # 357-365 are present in Win95 only -# Note that from here on most of the Win95-only functions are exported +# Note that from here on most of the Win95-only functions are exported # ordinal-only; the names given here are mostly guesses :-) 357 pascal MapSL(segptr) MapSL @@ -340,7 +340,7 @@ rsrc version16.res 419 pascal16 GetProfileSection(str ptr word) GetProfileSection16 420 pascal GetFileAttributes(ptr) GetFileAttributes16 421 pascal16 SetFileAttributes(ptr long) SetFileAttributes16 -422 pascal16 GetDiskFreeSpace(ptr ptr ptr ptr ptr) GetDiskFreeSpace16 +422 pascal16 GetDiskFreeSpace(ptr ptr ptr ptr ptr) GetDiskFreeSpace16 423 pascal16 LogApiThk(str) LogApiThk 431 pascal16 IsPeFormat(str word) IsPeFormat16 432 stub FileTimeToLocalFileTime @@ -521,7 +521,7 @@ rsrc version16.res 666 pascal UTGlue16(ptr long ptr long) UTGlue16 667 pascal EntryAddrProc(word word) EntryAddrProc16 668 pascal MyAlloc(word word word) MyAlloc16 - + # 700-704 are Win95 only @@ -535,4 +535,3 @@ rsrc version16.res # Win95 krnl386.exe also exports ordinals 802-864, # however, those seem to be only callback stubs that are # never called directly by other modules ... - diff --git a/dlls/lzexpand/lzexpand.spec b/dlls/lzexpand/lzexpand.spec index 6c8a0f1b822..541ff31eea4 100644 --- a/dlls/lzexpand/lzexpand.spec +++ b/dlls/lzexpand/lzexpand.spec @@ -13,4 +13,4 @@ owner lz32 9 pascal16 LZDone() LZDone 10 pascal16 GetExpandedName(str ptr) GetExpandedName16 #11 WEP -#12 ___EXPORTEDSTUB +#12 ___EXPORTEDSTUB diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 5f9068f9bbf..fb8492a70fb 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -101,7 +101,7 @@ name mpr @ stdcall WNetRestoreConnectionW(long wstr) WNetRestoreConnectionW @ stdcall WNetSetConnectionA(str long ptr) WNetSetConnectionA @ stdcall WNetSetConnectionW(wstr long ptr) WNetSetConnectionW -@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) WNetUseConnectionA +@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) WNetUseConnectionA @ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) WNetUseConnectionW @ stdcall WNetVerifyPasswordA(str ptr) WNetVerifyPasswordA @ stdcall WNetVerifyPasswordW(wstr ptr) WNetVerifyPasswordW diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d1a59c0286d..e47a82d0ae5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -165,7 +165,7 @@ init MSVCRT_Init @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl @ stub _atoi64 #(str) -@ stub _atoldbl +@ stub _atoldbl @ cdecl _beep(long long) _beep @ cdecl _beginthread (ptr long ptr) _beginthread @ cdecl _beginthreadex (ptr long ptr ptr long ptr) _beginthreadex diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0fbefe1d451..1f7b9eee096 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1,6 +1,6 @@ name ntdll -#note that the Zw... functions are alternate names for the +#note that the Zw... functions are alternate names for the #Nt... functions. (see www.sysinternals.com for details) #if you change a Nt.. function DON'T FORGET to change the #Zw one too. @@ -191,7 +191,7 @@ name ntdll @ stub NtReleaseProcessMutant @ stdcall NtReleaseSemaphore(long long ptr) NtReleaseSemaphore @ stub NtRemoveIoCompletion -@ stdcall NtReplaceKey(ptr long ptr) NtReplaceKey +@ stdcall NtReplaceKey(ptr long ptr) NtReplaceKey @ stub NtReplyPort @ stdcall NtReplyWaitReceivePort(long long long long) NtReplyWaitReceivePort @ stub NtReplyWaitReceivePortEx diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 346e37ce083..62a9184c058 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -8,9 +8,8 @@ LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o C_SRCS = \ - proxyodbc.c + proxyodbc.c @MAKE_DLL_RULES@ ### Dependencies: - diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 4639af7bc78..c7a86f50121 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -22,7 +22,7 @@ init OLE32_DllEntryPoint 19 stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) CoGetInterfaceAndReleaseStream 20 stdcall CoGetMalloc(long ptr) CoGetMalloc 21 stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) CoGetMarshalSizeMax - 22 stdcall CoGetPSClsid(ptr ptr) CoGetPSClsid + 22 stdcall CoGetPSClsid(ptr ptr) CoGetPSClsid 23 stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) CoGetStandardMarshal 24 stub CoGetState 25 stub CoGetTreatAsClass # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED @@ -74,7 +74,7 @@ init OLE32_DllEntryPoint 71 stdcall GetHGlobalFromStream(ptr ptr) GetHGlobalFromStream 72 stub GetHookInterface 73 stdcall GetRunningObjectTable(long ptr) GetRunningObjectTable - 74 stdcall IIDFromString(wstr ptr) CLSIDFromString + 74 stdcall IIDFromString(wstr ptr) CLSIDFromString 75 stdcall IsAccelerator(long long ptr long) IsAccelerator 76 stdcall IsEqualGUID(ptr ptr) IsEqualGUID 77 stub IsValidIid diff --git a/dlls/ole32/storage.spec b/dlls/ole32/storage.spec index 1827711701f..81f4706acd6 100644 --- a/dlls/ole32/storage.spec +++ b/dlls/ole32/storage.spec @@ -4,7 +4,7 @@ name storage type win16 owner ole32 - + 1 pascal StgCreateDocFileA(str long long ptr) StgCreateDocFile16 2 stub StgCreateDocFileOnILockBytes 3 pascal StgOpenStorage(str ptr long ptr long ptr) StgOpenStorage16 diff --git a/dlls/oleaut32/typelib.spec b/dlls/oleaut32/typelib.spec index 798980f3682..6aa6f957c9e 100644 --- a/dlls/oleaut32/typelib.spec +++ b/dlls/oleaut32/typelib.spec @@ -2,15 +2,15 @@ name typelib type win16 owner oleaut32 -2 stub CREATETYPELIB +2 stub CREATETYPELIB 3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16 -4 stub LHASHVALOFNAMESYS -5 stub _IID_ICREATETYPEINFO -6 stub _IID_ICREATETYPELIB -7 stub _IID_ITYPECOMP -8 stub _IID_ITYPEINFO -9 stub _IID_ITYPELIB -10 stub REGISTERTYPELIB -11 stub LOADREGTYPELIB +4 stub LHASHVALOFNAMESYS +5 stub _IID_ICREATETYPEINFO +6 stub _IID_ICREATETYPELIB +7 stub _IID_ITYPECOMP +8 stub _IID_ITYPEINFO +9 stub _IID_ITYPELIB +10 stub REGISTERTYPELIB +11 stub LOADREGTYPELIB 14 pascal QueryPathOfRegTypeLib(ptr word word word ptr) QueryPathOfRegTypeLib16 -15 pascal OaBuildVersion() OaBuildVersion16 +15 pascal OaBuildVersion() OaBuildVersion16 diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec index 39878067768..586f97cc3fa 100644 --- a/dlls/olepro32/olepro32.spec +++ b/dlls/olepro32/olepro32.spec @@ -10,4 +10,4 @@ name olepro32 255 stdcall DllCanUnloadNow() OLEPRO32_DllCanUnloadNow 256 stdcall DllGetClassObject( ptr ptr ptr ) OLEPRO32_DllGetClassObject 257 stdcall DllRegisterServer() OLEPRO32_DllRegisterServer -258 stdcall DllUnregisterServer() OLEPRO32_DllUnregisterServer +258 stdcall DllUnregisterServer() OLEPRO32_DllUnregisterServer diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 58e67a88da8..88745655219 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -68,21 +68,21 @@ $gen_traces = 1; # # List of categories to put in the 'opengl_norm.c' file # -%cat_1_0 = ( "display-list" => 1, - "drawing" => 1, - "drawing-control" => 1, - "feedback" => 1, - "framebuf" => 1, - "misc" => 1, - "modeling" => 1, - "pixel-op" => 1, - "pixel-rw" => 1, - "state-req" => 1, +%cat_1_0 = ( "display-list" => 1, + "drawing" => 1, + "drawing-control" => 1, + "feedback" => 1, + "framebuf" => 1, + "misc" => 1, + "modeling" => 1, + "pixel-op" => 1, + "pixel-rw" => 1, + "state-req" => 1, "xform" => 1 ); -%cat_1_1 = ( %cat_1_0, +%cat_1_1 = ( %cat_1_0, "1_1" => 1 ); -%cat_1_2 = ( %cat_1_1, - "VERSION_1_2" => 1, +%cat_1_2 = ( %cat_1_1, + "VERSION_1_2" => 1, "ARB_multitexture" => 1 ); %norm_categories = (); @@ -91,7 +91,7 @@ $gen_traces = 1; # This hash table gives the conversion between OpenGL types and what # is used by the TRACE printfs # -%debug_conv = +%debug_conv = ("GLbitfield" => "%d", "GLboolean" => "%d", "GLbyte" => "%d", @@ -114,7 +114,7 @@ $gen_traces = 1; # This hash table gives the conversion between OpenGL types and what # is used in the .spec file # -%arg_conv = +%arg_conv = ("GLbitfield" => [ "long", 4 ], "GLboolean" => [ "long", 4 ], "GLbyte" => [ "long", 4 ], @@ -280,110 +280,110 @@ $pseudo_to_opengl{"IglooParameterSGIX"} = "GLint"; # [ "GLubyte *", "bitmap"] ] ]; # %norm_functions = (); -%ext_functions = +%ext_functions = ( "glMTexCoord2fSGIS" => [ "glMTexCoord2fSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat", "s" ], [ "GLfloat", "t" ] ], "glMTexCoord2fSGIS" ], - "glMTexCoord2fvSGIS" => [ "glMTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ], + "glMTexCoord2fvSGIS" => [ "glMTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat *", "v" ] ], "glMTexCoord2fvSGIS" ], - "glMultiTexCoord1dSGIS" => [ "glMultiTexCoord1dSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1dSGIS" => [ "glMultiTexCoord1dSGIS", "void", [ [ "GLenum", "target" ], [ "GLdouble", "s" ] ], "glMultiTexCoord1dSGIS" ], - "glMultiTexCoord1dvSGIS" => [ "glMultiTexCoord1dvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1dvSGIS" => [ "glMultiTexCoord1dvSGIS", "void", [ [ "GLenum", "target" ], [ "GLdouble *", "v" ] ], "glMultiTexCoord1dvSGIS" ], - "glMultiTexCoord1fSGIS" => [ "glMultiTexCoord1fSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1fSGIS" => [ "glMultiTexCoord1fSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat", "s" ] ], "glMultiTexCoord1fSGIS" ], - "glMultiTexCoord1fvSGIS" => [ "glMultiTexCoord1fvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1fvSGIS" => [ "glMultiTexCoord1fvSGIS", "void", [ [ "GLenum", "target" ], [ "const GLfloat *", "v" ] ], "glMultiTexCoord1fvSGIS" ], - "glMultiTexCoord1iSGIS" => [ "glMultiTexCoord1iSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1iSGIS" => [ "glMultiTexCoord1iSGIS", "void", [ [ "GLenum", "target" ], [ "GLint", "s" ] ], "glMultiTexCoord1iSGIS" ], - "glMultiTexCoord1ivSGIS" => [ "glMultiTexCoord1ivSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1ivSGIS" => [ "glMultiTexCoord1ivSGIS", "void", [ [ "GLenum", "target" ], [ "GLint *", "v" ] ], "glMultiTexCoord1ivSGIS" ], - "glMultiTexCoord1sSGIS" => [ "glMultiTexCoord1sSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1sSGIS" => [ "glMultiTexCoord1sSGIS", "void", [ [ "GLenum", "target" ], [ "GLshort", "s" ] ], "glMultiTexCoord1sSGIS" ], - "glMultiTexCoord1svSGIS" => [ "glMultiTexCoord1svSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord1svSGIS" => [ "glMultiTexCoord1svSGIS", "void", [ [ "GLenum", "target" ], [ "GLshort *", "v" ] ], "glMultiTexCoord1svSGIS" ], - "glMultiTexCoord2dSGIS" => [ "glMultiTexCoord2dSGIS", "void", [ [ "GLenum", "target" ], - [ "GLdouble", "s"], + "glMultiTexCoord2dSGIS" => [ "glMultiTexCoord2dSGIS", "void", [ [ "GLenum", "target" ], + [ "GLdouble", "s"], [ "GLdouble", "t" ] ], "glMultiTexCoord2dSGIS" ], - "glMultiTexCoord2dvSGIS" => [ "glMultiTexCoord2dvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord2dvSGIS" => [ "glMultiTexCoord2dvSGIS", "void", [ [ "GLenum", "target" ], [ "GLdouble *", "v" ] ], "glMultiTexCoord2dvSGIS" ], - "glMultiTexCoord2fSGIS" => [ "glMultiTexCoord2fSGIS", "void", [ [ "GLenum", "target" ], - [ "GLfloat", "s" ], + "glMultiTexCoord2fSGIS" => [ "glMultiTexCoord2fSGIS", "void", [ [ "GLenum", "target" ], + [ "GLfloat", "s" ], [ "GLfloat", "t" ] ], "glMultiTexCoord2fSGIS" ], - "glMultiTexCoord2fvSGIS" => [ "glMultiTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord2fvSGIS" => [ "glMultiTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat *", "v" ] ], "glMultiTexCoord2fvSGIS" ], - "glMultiTexCoord2iSGIS" => [ "glMultiTexCoord2iSGIS", "void", [ [ "GLenum", "target" ], - [ "GLint", "s" ], + "glMultiTexCoord2iSGIS" => [ "glMultiTexCoord2iSGIS", "void", [ [ "GLenum", "target" ], + [ "GLint", "s" ], [ "GLint", "t" ] ], "glMultiTexCoord2iSGIS" ], - "glMultiTexCoord2ivSGIS" => [ "glMultiTexCoord2ivSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord2ivSGIS" => [ "glMultiTexCoord2ivSGIS", "void", [ [ "GLenum", "target" ], [ "GLint *", "v" ] ], "glMultiTexCoord2ivSGIS" ], - "glMultiTexCoord2sSGIS" => [ "glMultiTexCoord2sSGIS", "void", [ [ "GLenum", "target" ], - [ "GLshort", "s" ], + "glMultiTexCoord2sSGIS" => [ "glMultiTexCoord2sSGIS", "void", [ [ "GLenum", "target" ], + [ "GLshort", "s" ], [ "GLshort", "t" ] ], "glMultiTexCoord2sSGIS" ], - "glMultiTexCoord2svSGIS" => [ "glMultiTexCoord2svSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord2svSGIS" => [ "glMultiTexCoord2svSGIS", "void", [ [ "GLenum", "target" ], [ "GLshort *", "v" ] ], "glMultiTexCoord2svSGIS" ], - "glMultiTexCoord3dSGIS" => [ "glMultiTexCoord3dSGIS", "void", [ [ "GLenum", "target" ], - [ "GLdouble", "s" ], - [ "GLdouble", "t" ], + "glMultiTexCoord3dSGIS" => [ "glMultiTexCoord3dSGIS", "void", [ [ "GLenum", "target" ], + [ "GLdouble", "s" ], + [ "GLdouble", "t" ], [ "GLdouble", "r" ] ], "glMultiTexCoord3dSGIS" ], "glMultiTexCoord3dvSGIS" => [ "glMultiTexCoord3dvSGIS", "void", [ [ "GLenum", "target" ], [ "GLdouble *", "v" ] ], "glMultiTexCoord3dvSGIS" ], - "glMultiTexCoord3fSGIS" => [ "glMultiTexCoord3fSGIS", "void", [ [ "GLenum", "target" ], - [ "GLfloat", "s" ], - [ "GLfloat", "t" ], + "glMultiTexCoord3fSGIS" => [ "glMultiTexCoord3fSGIS", "void", [ [ "GLenum", "target" ], + [ "GLfloat", "s" ], + [ "GLfloat", "t" ], [ "GLfloat", "r" ] ], "glMultiTexCoord3fSGIS" ], - "glMultiTexCoord3fvSGIS" => [ "glMultiTexCoord3fvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord3fvSGIS" => [ "glMultiTexCoord3fvSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat *", "v" ] ], "glMultiTexCoord3fvSGIS" ], - "glMultiTexCoord3iSGIS" => [ "glMultiTexCoord3iSGIS", "void", [ [ "GLenum", "target" ], - [ "GLint", "s" ], - [ "GLint", "t" ], + "glMultiTexCoord3iSGIS" => [ "glMultiTexCoord3iSGIS", "void", [ [ "GLenum", "target" ], + [ "GLint", "s" ], + [ "GLint", "t" ], [ "GLint", "r" ] ], "glMultiTexCoord3iSGIS" ], - "glMultiTexCoord3ivSGIS" => [ "glMultiTexCoord3ivSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord3ivSGIS" => [ "glMultiTexCoord3ivSGIS", "void", [ [ "GLenum", "target" ], [ "GLint *", "v" ] ], "glMultiTexCoord3ivSGIS" ], - "glMultiTexCoord3sSGIS" => [ "glMultiTexCoord3sSGIS", "void", [ [ "GLenum", "target" ], - [ "GLshort", "s" ], - [ "GLshort", "t" ], + "glMultiTexCoord3sSGIS" => [ "glMultiTexCoord3sSGIS", "void", [ [ "GLenum", "target" ], + [ "GLshort", "s" ], + [ "GLshort", "t" ], [ "GLshort", "r" ] ], "glMultiTexCoord3sSGIS" ], - "glMultiTexCoord3svSGIS" => [ "glMultiTexCoord3svSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord3svSGIS" => [ "glMultiTexCoord3svSGIS", "void", [ [ "GLenum", "target" ], [ "GLshort *", "v" ] ], "glMultiTexCoord3svSGIS" ], - "glMultiTexCoord4dSGIS" => [ "glMultiTexCoord4dSGIS", "void", [ [ "GLenum", "target" ], - [ "GLdouble", "s" ], - [ "GLdouble", "t" ], - [ "GLdouble", "r" ], + "glMultiTexCoord4dSGIS" => [ "glMultiTexCoord4dSGIS", "void", [ [ "GLenum", "target" ], + [ "GLdouble", "s" ], + [ "GLdouble", "t" ], + [ "GLdouble", "r" ], [ "GLdouble", "q" ] ], "glMultiTexCoord4dSGIS" ], - "glMultiTexCoord4dvSGIS" => [ "glMultiTexCoord4dvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord4dvSGIS" => [ "glMultiTexCoord4dvSGIS", "void", [ [ "GLenum", "target" ], [ "GLdouble *", "v" ] ], "glMultiTexCoord4dvSGIS" ], - "glMultiTexCoord4fSGIS" => [ "glMultiTexCoord4fSGIS", "void", [ [ "GLenum", "target" ], - [ "GLfloat", "s" ], - [ "GLfloat", "t" ], - [ "GLfloat", "r" ], + "glMultiTexCoord4fSGIS" => [ "glMultiTexCoord4fSGIS", "void", [ [ "GLenum", "target" ], + [ "GLfloat", "s" ], + [ "GLfloat", "t" ], + [ "GLfloat", "r" ], [ "GLfloat", "q" ] ], "glMultiTexCoord4fSGIS" ], - "glMultiTexCoord4fvSGIS" => [ "glMultiTexCoord4fvSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord4fvSGIS" => [ "glMultiTexCoord4fvSGIS", "void", [ [ "GLenum", "target" ], [ "GLfloat *", "v" ] ], "glMultiTexCoord4fvSGIS" ], - "glMultiTexCoord4iSGIS" => [ "glMultiTexCoord4iSGIS", "void", [ [ "GLenum", "target" ], - [ "GLint", "s" ], - [ "GLint", "t" ], - [ "GLint", "r" ], + "glMultiTexCoord4iSGIS" => [ "glMultiTexCoord4iSGIS", "void", [ [ "GLenum", "target" ], + [ "GLint", "s" ], + [ "GLint", "t" ], + [ "GLint", "r" ], [ "GLint", "q" ] ], "glMultiTexCoord4iSGIS" ], - "glMultiTexCoord4ivSGIS" => [ "glMultiTexCoord4ivSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord4ivSGIS" => [ "glMultiTexCoord4ivSGIS", "void", [ [ "GLenum", "target" ], [ "GLint *", "v" ] ], "glMultiTexCoord4ivSGIS" ], - "glMultiTexCoord4sSGIS" => [ "glMultiTexCoord4sSGIS", "void", [ [ "GLenum", "target" ], - [ "GLshort", "s" ], - [ "GLshort", "t" ], - [ "GLshort", "r" ], + "glMultiTexCoord4sSGIS" => [ "glMultiTexCoord4sSGIS", "void", [ [ "GLenum", "target" ], + [ "GLshort", "s" ], + [ "GLshort", "t" ], + [ "GLshort", "r" ], [ "GLshort", "q" ] ], "glMultiTexCoord4sSGIS" ], - "glMultiTexCoord4svSGIS" => [ "glMultiTexCoord4svSGIS", "void", [ [ "GLenum", "target" ], + "glMultiTexCoord4svSGIS" => [ "glMultiTexCoord4svSGIS", "void", [ [ "GLenum", "target" ], [ "GLshort *", "v" ] ], "glMultiTexCoord4svSGIS" ], - "glMultiTexCoordPointerSGIS" => [ "glMultiTexCoordPointerSGIS", "void", [ [ "GLenum", "target" ], - [ "GLint", "size" ], + "glMultiTexCoordPointerSGIS" => [ "glMultiTexCoordPointerSGIS", "void", [ [ "GLenum", "target" ], + [ "GLint", "size" ], [ "GLenum", "type" ], - [ "GLsizei", "stride" ], + [ "GLsizei", "stride" ], [ "GLvoid *", "pointer" ] ], "glMultiTexCoordPointerSGIS" ], "glSelectTextureSGIS" => [ "glSelectTextureSGIS", "void", [ [ "GLenum", "target" ] ], "glSelectTextureSGIS" ], "glSelectTextureCoordSetSGIS" => [ "glSelectTextureCoordSetSGIS", "void", [ [ "GLenum", "target" ] ], "glSelectTextureCoordSetSGIS" ], "wglAllocateMemoryNV" => [ "wglAllocateMemoryNV", "void *", [ [ "GLsizei", "size" ], [ "GLfloat", "readfreq" ], - [ "GLfloat", "writefreq"], + [ "GLfloat", "writefreq"], [ "GLfloat", "priority" ] ], "glXAllocateMemoryNV" ], "wglFreeMemoryNV" => [ "wglFreeMemoryNV", "void", [ [ "GLvoid *", "pointer" ] ], "glXFreeMemoryNV" ] ); @@ -395,7 +395,7 @@ while ($line = ) { ($funcname, $args) = ($line =~ /^(\w*)\((.*)\)/); # and the argument names @arg_names = split /\s*,\s*/, $args; - + # After get : # - the return type # - the argument types @@ -423,7 +423,7 @@ while ($line = ) { } elsif ($line =~ /^\t*param/) { ($name, $base_type, $ext) = ($line =~ /\t*param\s*(\w*)\s*(\w*) (.*)/); $ptr = 0; - unless (defined($name)) { + unless (defined($name)) { chomp $line; die "Broken spec file line $line in function $funcname\n"; } @@ -447,7 +447,7 @@ while ($line = ) { if ($ptr) { $type = $type . "*"; } - + $arg_types{$name} = $type; } } @@ -462,14 +462,14 @@ while ($line = ) { } die "Undefined type for $arg_names[$i] in function $funcname\n"; } - + push @$arg_ref, [ $arg_types{$arg_names[$i]}, $arg_names[$i] ]; } - $func_ref = [ "gl" . $funcname, + $func_ref = [ "gl" . $funcname, $ret_type, $arg_ref, "gl" . $funcname ]; - + # Now, put in one or the other hash table if ($norm_categories{$category}) { $norm_functions{"gl" . $funcname} = $func_ref; diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index d6f02759d24..d0e98498412 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -12,7 +12,7 @@ name psapi @ stdcall GetMappedFileNameW(long ptr wstr long) GetMappedFileNameW @ stdcall GetModuleBaseNameA(long long str long) GetModuleBaseNameA @ stdcall GetModuleBaseNameW(long long wstr long) GetModuleBaseNameW -@ stdcall GetModuleFileNameExA(long long str long) GetModuleFileNameExA +@ stdcall GetModuleFileNameExA(long long str long) GetModuleFileNameExA @ stdcall GetModuleFileNameExW(long long wstr long) GetModuleFileNameExW @ stdcall GetModuleInformation(long long ptr long) GetModuleInformation @ stdcall GetProcessMemoryInfo(long ptr long) GetProcessMemoryInfo diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index 55de5eae61f..ac8e0ae4c8d 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -9,9 +9,8 @@ ALTNAMES = rasapi16.dll LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o -C_SRCS = rasapi.c +C_SRCS = rasapi.c @MAKE_DLL_RULES@ ### Dependencies: - diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index 4e588d2071d..952fcba0334 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -45,5 +45,5 @@ BEGIN LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/dlls/shell32/shell.spec b/dlls/shell32/shell.spec index d91cd1b4360..e41240b8bdf 100644 --- a/dlls/shell32/shell.spec +++ b/dlls/shell32/shell.spec @@ -45,5 +45,5 @@ owner shell32 401 stub SHCHECKDRIVE # 402 _RUNDLLCHECKDRIVE -# 8 WEP +# 8 WEP #32 WCI diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 5875a9bb8ef..6834884c5d6 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -1,8 +1,8 @@ name shell32 init Shell32LibMain -# Functions exported by the Win95 shell32.dll -# (these need to have these exact ordinals, for some +# Functions exported by the Win95 shell32.dll +# (these need to have these exact ordinals, for some # win95 and winNT dlls import shell32.dll by ordinal) # This list was updated to dll version 4.72 @@ -67,7 +67,7 @@ init Shell32LibMain 70 stdcall SHCreateDefClassObject(long long long long long)SHCreateDefClassObject 71 stdcall Shell_GetImageList(ptr ptr) Shell_GetImageList 72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW - 73 stdcall SHShellFolderView_Message(long long long) SHShellFolderView_Message + 73 stdcall SHShellFolderView_Message(long long long) SHShellFolderView_Message 74 stub SHCreateStdEnumFmtEtc 75 stdcall PathYetAnotherMakeUniqueName(ptr ptr ptr ptr) PathYetAnotherMakeUniqueNameA 76 stub DragQueryInfo @@ -233,11 +233,11 @@ init Shell32LibMain 298 stdcall Shell_NotifyIconW(long ptr) Shell_NotifyIconW 299 stub Shl1632_ThunkData32 300 stub Shl3216_ThunkData32 - 301 forward StrChrA shlwapi.StrChrA + 301 forward StrChrA shlwapi.StrChrA 302 forward StrChrIA shlwapi.StrChrIA 303 forward StrChrIW shlwapi.StrChrIW 304 forward StrChrW shlwapi.StrChrW - 305 forward StrCmpNA shlwapi.StrCmpNA + 305 forward StrCmpNA shlwapi.StrCmpNA 306 forward StrCmpNIA shlwapi.StrCmpNIA 307 forward StrCmpNIW shlwapi.StrCmpNIW 308 forward StrCmpNW shlwapi.StrCmpNW @@ -272,7 +272,7 @@ init Shell32LibMain 512 stdcall SHRegDeleteKeyW (long wstr) SHRegDeleteKeyW 520 stdcall SHAllocShared (long long long) SHAllocShared - 521 stdcall SHLockShared (long long) SHLockShared + 521 stdcall SHLockShared (long long) SHLockShared 522 stdcall SHUnlockShared (long) SHUnlockShared 523 stdcall SHFreeShared (long long) SHFreeShared 524 stub RealDriveType@8 @@ -323,22 +323,22 @@ init Shell32LibMain @ stdcall DoEnvironmentSubstW(wstr wstr)DoEnvironmentSubstW @ stub DragQueryFileAorW @ stdcall DuplicateIcon(long long) DuplicateIcon -@ stdcall ExtractAssociatedIconA(long ptr long)ExtractAssociatedIconA -@ stdcall ExtractAssociatedIconExA(long long long long)ExtractAssociatedIconExA -@ stdcall ExtractAssociatedIconExW(long long long long)ExtractAssociatedIconExW -@ stub ExtractAssociatedIconW -@ stdcall ExtractIconA(long str long)ExtractIconA +@ stdcall ExtractAssociatedIconA(long ptr long)ExtractAssociatedIconA +@ stdcall ExtractAssociatedIconExA(long long long long)ExtractAssociatedIconExA +@ stdcall ExtractAssociatedIconExW(long long long long)ExtractAssociatedIconExW +@ stub ExtractAssociatedIconW +@ stdcall ExtractIconA(long str long)ExtractIconA @ stdcall ExtractIconEx(ptr long ptr ptr long)ExtractIconExAW @ stdcall ExtractIconExA(str long ptr ptr long)ExtractIconExA @ stdcall ExtractIconExW(wstr long ptr ptr long)ExtractIconExW -@ stdcall ExtractIconW(long wstr long)ExtractIconW -@ stub ExtractIconResInfoA -@ stub ExtractIconResInfoW -@ stub ExtractVersionResource16W -@ stub FindExeDlgProc -@ stdcall FindExecutableA(ptr ptr ptr) FindExecutableA -@ stdcall FindExecutableW(wstr wstr wstr) FindExecutableW -@ stdcall FreeIconList(long) FreeIconList +@ stdcall ExtractIconW(long wstr long)ExtractIconW +@ stub ExtractIconResInfoA +@ stub ExtractIconResInfoW +@ stub ExtractVersionResource16W +@ stub FindExeDlgProc +@ stdcall FindExecutableA(ptr ptr ptr) FindExecutableA +@ stdcall FindExecutableW(wstr wstr wstr) FindExecutableW +@ stdcall FreeIconList(long) FreeIconList @ stub InternalExtractIconListA @ stub InternalExtractIconListW @ stub OpenAs_RunDLL @@ -347,25 +347,25 @@ init Shell32LibMain @ stub PrintersGetCommand_RunDLL @ stub PrintersGetCommand_RunDLLA @ stub PrintersGetCommand_RunDLLW -@ stub RealShellExecuteA -@ stub RealShellExecuteExA -@ stub RealShellExecuteExW -@ stub RealShellExecuteW -@ stub RegenerateUserEnvironment -@ stdcall SHAddToRecentDocs (long ptr) SHAddToRecentDocs -@ stdcall SHAppBarMessage(long ptr) SHAppBarMessage -@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA -@ stdcall SHBrowseForFolderA(ptr) SHBrowseForFolderA -@ stub SHBrowseForFolderW@4 -@ stdcall SHChangeNotify (long long ptr ptr) SHChangeNotifyAW +@ stub RealShellExecuteA +@ stub RealShellExecuteExA +@ stub RealShellExecuteExW +@ stub RealShellExecuteW +@ stub RegenerateUserEnvironment +@ stdcall SHAddToRecentDocs (long ptr) SHAddToRecentDocs +@ stdcall SHAppBarMessage(long ptr) SHAppBarMessage +@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA +@ stdcall SHBrowseForFolderA(ptr) SHBrowseForFolderA +@ stub SHBrowseForFolderW@4 +@ stdcall SHChangeNotify (long long ptr ptr) SHChangeNotifyAW @ stub ShellHookProc -@ stub SHEmptyRecycleBinA@12 -@ stub SHEmptyRecycleBinW@12 +@ stub SHEmptyRecycleBinA@12 +@ stub SHEmptyRecycleBinW@12 @ stdcall SHFileOperation(ptr)SHFileOperationAW @ stdcall SHFileOperationA(ptr)SHFileOperationA @ stdcall SHFileOperationW(ptr)SHFileOperationW -@ stub SHFormatDrive@16 -@ stub SHFreeNameMappings@4 +@ stub SHFormatDrive@16 +@ stub SHFreeNameMappings@4 @ stdcall SHGetDesktopFolder(ptr)SHGetDesktopFolder @ stdcall SHGetFileInfo(ptr long ptr long long)SHGetFileInfoAW @ stdcall SHGetFileInfoA(ptr long ptr long long)SHGetFileInfoA @@ -377,14 +377,14 @@ init Shell32LibMain @ stdcall SHGetPathFromIDListA(long long)SHGetPathFromIDListA @ stdcall SHGetPathFromIDListW(long long)SHGetPathFromIDListW @ stdcall SHGetSettings(ptr long) SHGetSettings -@ stdcall SHGetSpecialFolderLocation(long long ptr)SHGetSpecialFolderLocation -@ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLL -@ stub SHHelpShortcuts_RunDLLA@16 -@ stub SHHelpShortcuts_RunDLLW@16 -@ stdcall SHLoadInProc(long) SHLoadInProc -@ stub SHQueryRecycleBinA@8 -@ stub SHQueryRecycleBinW@8 -@ stub SHUpdateRecycleBinIcon@0 +@ stdcall SHGetSpecialFolderLocation(long long ptr)SHGetSpecialFolderLocation +@ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLL +@ stub SHHelpShortcuts_RunDLLA@16 +@ stub SHHelpShortcuts_RunDLLW@16 +@ stdcall SHLoadInProc(long) SHLoadInProc +@ stub SHQueryRecycleBinA@8 +@ stub SHQueryRecycleBinW@8 +@ stub SHUpdateRecycleBinIcon@0 @ stub WOWShellExecute@28 # diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index d5d0151f5f7..ed2fc61319f 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -31,7 +31,7 @@ FONT 10, "Helv" } /* Namen der Header fr die Shellviews */ -STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL BEGIN IDS_SHV_COLUMN1 "Datei" IDS_SHV_COLUMN2 "Grﾟe" diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index e2996ce8c47..f79467897a5 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -31,7 +31,7 @@ FONT 10, "Helv" } /* columns in the shellview */ -STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL BEGIN IDS_SHV_COLUMN1 "File" IDS_SHV_COLUMN2 "Size" diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index 1427e688e27..e1cbd7aab35 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -55,7 +55,7 @@ BEGIN BEGIN MENUITEM "新規フォルダ(&F)", 0x7053 MENUITEM "新規ショートカット(&L)", 0x7052 - MENUITEM SEPARATOR + MENUITEM SEPARATOR END MENUITEM "プロパティ", FCIDM_SHVIEW_PROPERTIES END diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index a4c474c1701..9d0cc9eaa58 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -31,7 +31,7 @@ FONT 8, "System" } /* columns in the shellview */ -STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL BEGIN IDS_SHV_COLUMN1 "冢ｰｸ" IDS_SHV_COLUMN2 "ｴﾐ｡" diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 1d06931bcc4..f864f846b10 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -79,7 +79,7 @@ BEGIN BEGIN MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR + MENUITEM SEPARATOR END MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES @@ -118,7 +118,7 @@ FONT 8, "Helv" LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "Tree1",IDD_TREEVIEW,"SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | - WS_BORDER | WS_TABSTOP, + WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 } @@ -160,7 +160,7 @@ BEGIN END /* BINRES 000.ico document */ -0 ICON +0 ICON { '00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01' '00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05' @@ -464,7 +464,7 @@ END /* BINRES 003.ico folder */ -3 ICON +3 ICON { '00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01' '00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05' @@ -764,7 +764,7 @@ END } /* BINRES 004.ico folder */ -4 ICON +4 ICON { '00 00 01 00 01 00 10 10 10 00 00 00 00 00 68 05' '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00' @@ -857,7 +857,7 @@ END } /* BINRES 008.ico drive */ -8 ICON +8 ICON { '00 00 01 00 04 00 10 10 10 00 01 00 04 00 28 01' '00 00 46 00 00 00 10 10 00 00 01 00 08 00 68 05' @@ -1236,7 +1236,7 @@ END /* BINRES 034.ico desktop */ -34 ICON +34 ICON { '00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01' '00 00 26 00 00 00 20 20 10 00 00 00 00 00 E8 02' diff --git a/dlls/user/resources/display.rc b/dlls/user/resources/display.rc index fceb068b66d..eaadf920d26 100644 --- a/dlls/user/resources/display.rc +++ b/dlls/user/resources/display.rc @@ -19,7 +19,7 @@ */ 1 OEMBIN -{ +{ 0x11, /* vertical thumb height (in pixels) */ 0x11, /* horizontal thumb width (in pixels) */ 0x02, /* icon width (in pixels) */ @@ -58,5 +58,3 @@ DUMMY1 1 { 0x0 } - - diff --git a/dlls/user/resources/mouse.rc b/dlls/user/resources/mouse.rc index 64774cfae9c..ff6d278e231 100644 --- a/dlls/user/resources/mouse.rc +++ b/dlls/user/resources/mouse.rc @@ -20,7 +20,7 @@ /* this ought to be VERSION_INFO */ DUMMY1 1 -{ +{ 0x1, 0x2, 0x3, diff --git a/dlls/user/resources/user32_De.rc b/dlls/user/resources/user32_De.rc index 9f1034a4334..d144bb5d894 100644 --- a/dlls/user/resources/user32_De.rc +++ b/dlls/user/resources/user32_De.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT -SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Wiederherstellen", 61728 MENUITEM "&Verschieben", 61456 @@ -63,4 +63,3 @@ BEGIN PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nein", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END - diff --git a/dlls/user/resources/user32_En.rc b/dlls/user/resources/user32_En.rc index 53fb3e59835..f4980217e0f 100644 --- a/dlls/user/resources/user32_En.rc +++ b/dlls/user/resources/user32_En.rc @@ -75,7 +75,7 @@ BEGIN END -STRINGTABLE DISCARDABLE -{ +STRINGTABLE DISCARDABLE +{ MDI_IDS_MOREWINDOWS "&More Windows..." /* defined in mdi.h */ } diff --git a/dlls/user/resources/user32_Ja.rc b/dlls/user/resources/user32_Ja.rc index 0f2af90dfdd..63583d088b0 100644 --- a/dlls/user/resources/user32_Ja.rc +++ b/dlls/user/resources/user32_Ja.rc @@ -36,7 +36,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { - POPUP "" + POPUP "" BEGIN MENUITEM "元に戻す(&U)", EM_UNDO MENUITEM SEPARATOR diff --git a/dlls/user/resources/user32_Sk.rc b/dlls/user/resources/user32_Sk.rc index 9f11df526e8..21a101c5636 100644 --- a/dlls/user/resources/user32_Sk.rc +++ b/dlls/user/resources/user32_Sk.rc @@ -75,7 +75,7 @@ BEGIN END -STRINGTABLE DISCARDABLE -{ +STRINGTABLE DISCARDABLE +{ MDI_IDS_MOREWINDOWS "&Viac okien..." /* defined in mdi.h */ } diff --git a/dlls/user/resources/user32_Wa.rc b/dlls/user/resources/user32_Wa.rc index 1fa2fec9494..9e296da57e5 100644 --- a/dlls/user/resources/user32_Wa.rc +++ b/dlls/user/resources/user32_Wa.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_WALON, SUBLANG_DEFAULT -/* +/* * Si vos voloz aider avou li ratornaedje des libes programes walon, * vos poloz scrre a l' adresse emile */ @@ -68,4 +68,3 @@ BEGIN PUSHBUTTON "&Oyi", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Neni", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END - diff --git a/dlls/user/resources/user32_Zh.rc b/dlls/user/resources/user32_Zh.rc index ee75277bc56..0b16927c3cf 100644 --- a/dlls/user/resources/user32_Zh.rc +++ b/dlls/user/resources/user32_Zh.rc @@ -20,29 +20,29 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { - MENUITEM "ｻﾖｸｴ(&R)", 61728 - MENUITEM "ﾒﾆｶｯ(&M)", 61456 - MENUITEM "ｴﾐ｡(&S)", 61440 - MENUITEM "ﾗﾐ｡ｻｯ(&N)", 61472 - MENUITEM "ﾗｴｻｯ(&X)", 61488 + MENUITEM "ｻﾖｸｴ(&R)", 61728 + MENUITEM "ﾒﾆｶｯ(&M)", 61456 + MENUITEM "ｴﾐ｡(&S)", 61440 + MENUITEM "ﾗﾐ｡ｻｯ(&N)", 61472 + MENUITEM "ﾗｴｻｯ(&X)", 61488 MENUITEM SEPARATOR - MENUITEM "ｹﾘｱﾕ(&N)\tAlt-F4", 61536 + MENUITEM "ｹﾘｱﾕ(&N)\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "ﾇﾐｻｻｵｽ(&S)...\tCtrl-Esc", 61744 + MENUITEM "ﾇﾐｻｻｵｽ(&S)...\tCtrl-Esc", 61744 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { POPUP "" BEGIN - MENUITEM "ｳｷﾏ(&U)", EM_UNDO + MENUITEM "ｳｷﾏ(&U)", EM_UNDO MENUITEM SEPARATOR MENUITEM "ｼﾇﾐ(&T)", WM_CUT MENUITEM "ｸｴﾖﾆ(&C)", WM_COPY - MENUITEM "ﾕｳﾌ(&P)", WM_PASTE - MENUITEM "ﾉｾｳ(&D)", WM_CLEAR + MENUITEM "ﾕｳﾌ(&P)", WM_PASTE + MENUITEM "ﾉｾｳ(&D)", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "ﾈｫﾑ｡(&A)", EM_SETSEL + MENUITEM "ﾈｫﾑ｡(&A)", EM_SETSEL END } @@ -51,57 +51,57 @@ STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSM BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "ﾈｷｶｨ(&O)", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾈ｡ﾏ(&C)", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾖﾐﾖｹ(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾖﾘﾊﾔ(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ｺﾂﾔ(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾊﾇ(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ｷ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾈｷｶｨ(&O)", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾈ｡ﾏ(&C)", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾖﾐﾖｹ(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾖﾘﾊﾔ(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ｺﾂﾔ(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾊﾇ(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ｷ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ﾑ｡ﾔｴｰｿﾚ" +CAPTION "ﾑ｡ﾔｴｰｿﾚ" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ - DEFPUSHBUTTON "ﾈｷｶｨ", IDOK, 75, 100, 35, 14 - PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL, 120, 100, 35, 14 + DEFPUSHBUTTON "ﾈｷｶｨ", IDOK, 75, 100, 35, 14 + PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL, 120, 100, 35, 14 END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "ｸｶ犇ｰｿﾚ(&M)..." /* defined in mdi.h */ + MDI_IDS_MOREWINDOWS "ｸｶ犇ｰｿﾚ(&M)..." /* defined in mdi.h */ } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { - MENUITEM "ｻﾘ章(&R)", 61728 - MENUITEM "ﾒﾆﾓ(&M)", 61456 - MENUITEM "ｴﾐ｡(&S)", 61440 - MENUITEM "ﾗﾐ｡ｻｯ(&N)", 61472 - MENUITEM "ﾗｴｻｯ(&X)", 61488 + MENUITEM "ｻﾘ章(&R)", 61728 + MENUITEM "ﾒﾆﾓ(&M)", 61456 + MENUITEM "ｴﾐ｡(&S)", 61440 + MENUITEM "ﾗﾐ｡ｻｯ(&N)", 61472 + MENUITEM "ﾗｴｻｯ(&X)", 61488 MENUITEM SEPARATOR - MENUITEM "鷄饐(&N)\tAlt-F4", 61536 + MENUITEM "鷄饐(&N)\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "ﾇﾐ轍ｵｽ(&S)...\tCtrl-Esc", 61744 + MENUITEM "ﾇﾐ轍ｵｽ(&S)...\tCtrl-Esc", 61744 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { POPUP "" BEGIN - MENUITEM "ｻﾘ章(&U)", EM_UNDO + MENUITEM "ｻﾘ章(&U)", EM_UNDO MENUITEM SEPARATOR MENUITEM "ｼﾏﾂ(&T)", WM_CUT MENUITEM "章ﾑu(&C)", WM_COPY - MENUITEM "ﾙNﾉﾏ(&P)", WM_PASTE - MENUITEM "hｳ(&D)", WM_CLEAR + MENUITEM "ﾙNﾉﾏ(&P)", WM_PASTE + MENUITEM "hｳ(&D)", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "ﾈｫﾟx(&A)", EM_SETSEL + MENUITEM "ﾈｫﾟx(&A)", EM_SETSEL END } @@ -110,26 +110,26 @@ STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSM BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "ｴ_ｶｨ(&O)", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾈ｡ﾏ(&C)", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾖﾐﾖｹ(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾖﾘﾔ(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ｺﾂﾔ(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ﾊﾇ(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ｷ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ｴ_ｶｨ(&O)", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾈ｡ﾏ(&C)", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾖﾐﾖｹ(&A)", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾖﾘﾔ(&R)", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ｺﾂﾔ(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ﾊﾇ(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ｷ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ﾟx二ﾒ紛ｰ" +CAPTION "ﾟx二ﾒ紛ｰ" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ - DEFPUSHBUTTON "ｴ_ｶｨ", IDOK, 75, 100, 35, 14 - PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL, 120, 100, 35, 14 + DEFPUSHBUTTON "ｴ_ｶｨ", IDOK, 75, 100, 35, 14 + PUSHBUTTON "ﾈ｡ﾏ", IDCANCEL, 120, 100, 35, 14 END STRINGTABLE DISCARDABLE { - MDI_IDS_MOREWINDOWS "ｸｶ默紛ｰ(&M)..." /* defined in mdi.h */ + MDI_IDS_MOREWINDOWS "ｸｶ默紛ｰ(&M)..." /* defined in mdi.h */ } diff --git a/dlls/user/user.exe.spec b/dlls/user/user.exe.spec index 4701c61cf6c..76c2ce38593 100644 --- a/dlls/user/user.exe.spec +++ b/dlls/user/user.exe.spec @@ -540,7 +540,7 @@ rsrc resources/version16.res 804 stub CHOOSECOLOR_CALLBACK16 819 pascal16 PeekMessage32(ptr word word word word word) PeekMessage32_16 820 pascal GetMessage32(ptr word word word word) GetMessage32_16 -821 pascal16 TranslateMessage32(ptr word) TranslateMessage32_16 +821 pascal16 TranslateMessage32(ptr word) TranslateMessage32_16 #821 stub IsDialogMessage32 # FIXME: two ordinal 821??? 822 pascal DispatchMessage32(ptr word) DispatchMessage32_16 823 pascal16 CallMsgFilter32(segptr word word) CallMsgFilter32_16 diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index 003b6d99ded..e078d3513d7 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -57,7 +57,7 @@ init UserClientDllInitialize @ stdcall CloseClipboard() CloseClipboard @ stdcall CloseDesktop(long) CloseDesktop @ stdcall CloseWindow(long) CloseWindow -@ stdcall CloseWindowStation(long) CloseWindowStation +@ stdcall CloseWindowStation(long) CloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) CopyAcceleratorTableA @ stdcall CopyAcceleratorTableW(long ptr long) CopyAcceleratorTableW @ stdcall CopyIcon(long) CopyIcon diff --git a/dlls/wineps/wps_De.rc b/dlls/wineps/wps_De.rc index 0aa957b885a..bcc68a62b30 100644 --- a/dlls/wineps/wps_De.rc +++ b/dlls/wineps/wps_De.rc @@ -27,7 +27,7 @@ FONT 8, "Helv" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Ausrichtung", -1, 10, 80, 200, 50 - CONTROL "&Hochformat", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "&Hochformat", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 CONTROL "&Querformat", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 diff --git a/dlls/wineps/wps_En.rc b/dlls/wineps/wps_En.rc index 66824e874cc..ca0d0d999f5 100644 --- a/dlls/wineps/wps_En.rc +++ b/dlls/wineps/wps_En.rc @@ -27,7 +27,7 @@ FONT 8, "Helv" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Orientation", -1, 10, 80, 200, 50 - CONTROL "&Portrait", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "&Portrait", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 CONTROL "&Landscape", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 diff --git a/dlls/wineps/wps_Ru.rc b/dlls/wineps/wps_Ru.rc index 6b80a0a40c8..85aa699ffb7 100644 --- a/dlls/wineps/wps_Ru.rc +++ b/dlls/wineps/wps_Ru.rc @@ -29,7 +29,7 @@ FONT 8, "Helv" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "ﾎ韃璋", -1, 10, 80, 200, 50 - CONTROL "&ﾊ韆", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "&ﾊ韆", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 CONTROL "&ﾀ碚", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 diff --git a/dlls/wineps/wps_Sk.rc b/dlls/wineps/wps_Sk.rc index fab29421b4d..6571cd6d54e 100644 --- a/dlls/wineps/wps_Sk.rc +++ b/dlls/wineps/wps_Sk.rc @@ -27,7 +27,7 @@ FONT 8, "Helv" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Orient當ia", -1, 10, 80, 200, 50 - CONTROL "Na v&ku", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "Na v&ku", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 CONTROL "&Na 夬rku", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 96b138fd484..e74200d2989 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -43,7 +43,7 @@ init WININET_LibMain @ stub FtpGetFileW @ stdcall FtpOpenFileA(ptr str long long long) FtpOpenFileA @ stub FtpOpenFileW -@ stdcall FtpPutFileA(ptr str str long long) FtpPutFileA +@ stdcall FtpPutFileA(ptr str str long long) FtpPutFileA @ stub FtpPutFileW @ stdcall FtpRemoveDirectoryA(ptr str) FtpRemoveDirectoryA @ stub FtpRemoveDirectoryW @@ -102,7 +102,7 @@ init WININET_LibMain @ stub InternetDebugGetLocalTime @ stub InternetDial @ stub InternetErrorDlg -@ stdcall InternetFindNextFileA(ptr ptr) InternetFindNextFileA +@ stdcall InternetFindNextFileA(ptr ptr) InternetFindNextFileA @ stub InternetFindNextFileW @ stub InternetGetCertByURL @ stdcall InternetGetConnectedState(ptr long) InternetGetConnectedState @@ -121,7 +121,7 @@ init WININET_LibMain @ stub InternetQueryDataAvailable @ stdcall InternetQueryOptionA(ptr long ptr ptr) InternetQueryOptionA @ stub InternetQueryOptionW -@ stdcall InternetReadFile(ptr ptr long ptr) InternetReadFile +@ stdcall InternetReadFile(ptr ptr long ptr) InternetReadFile @ stub InternetReadFileExA @ stub InternetReadFileExW @ stub InternetServerPushParse diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index e7068549cbd..68310ee8425 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -51,7 +51,7 @@ init WINMM_LibMain @ stdcall mciGetErrorStringA(long ptr long) mciGetErrorStringA @ stdcall mciGetErrorStringW(long ptr long) mciGetErrorStringW @ stdcall mciGetYieldProc(long ptr) mciGetYieldProc -@ stdcall mciLoadCommandResource(long wstr long) mciLoadCommandResource +@ stdcall mciLoadCommandResource(long wstr long) mciLoadCommandResource @ stdcall mciSendCommandA(long long long long) mciSendCommandA @ stdcall mciSendCommandW(long long long long) mciSendCommandW @ stdcall mciSendStringA(str ptr long long) mciSendStringA diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc index 81a55cb85d0..ac8aaf85ff8 100644 --- a/dlls/winmm/winmm_Es.rc +++ b/dlls/winmm/winmm_Es.rc @@ -76,7 +76,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MCIERR_FILE_NOT_SAVED, "No puede grabarse el fichero especificado. Asegrese de tener suficiente espacio en disco o de que permanece conectado a la red." MCIERR_DEVICE_TYPE_REQUIRED, "No puede encontrarse el dispositivo especificado. Asegrese de que est instalado o de que el nombre del dispositivo est escrito correctamente." MCIERR_DEVICE_LOCKED, "El dispositivo especificado est siendo cerrado. Espere unos segundos e intente nuevamente." - MCIERR_DUPLICATE_ALIAS, "El alias especificado ya est siendo usado por esta aplicacin. Use un alias nico." + MCIERR_DUPLICATE_ALIAS, "El alias especificado ya est siendo usado por esta aplicacin. Use un alias nico." MCIERR_BAD_CONSTANT, "El par疥etro especificado es inv疝ido para este comando." MCIERR_MUST_USE_SHAREABLE, "El controlador de dispositivo ya est en uso. Para compartirlo, use el par疥etro 'compartible' ('shareable') con cada comando 'abrir' ('open')." MCIERR_MISSING_DEVICE_NAME, "El comando especificado requiere un alias, fichero, controlador o nombre de dispositivo. Por favor provea uno." @@ -105,7 +105,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MCIERR_WAVE_INPUTSINUSE, "Todos los dispositivos que pueden grabar ficheros en este formato est疣 en uso. Espere hasta que se libere un dispositivo e intente nuevamente." MCIERR_WAVE_SETINPUTINUSE, "No puede prepararse el dispositivo de forma de onda para grabacin porque est en uso. Espere hasta que el dispositivo est libre e intente nuevamente." MCIERR_WAVE_OUTPUTUNSPECIFIED, "Cualquier dispositivo compatible de reproduccin de forma de onda puede ser usado." - MCIERR_WAVE_INPUTUNSPECIFIED, "Cualquier dispositivo compatible de grabacin de forma de onda puede ser usado." + MCIERR_WAVE_INPUTUNSPECIFIED, "Cualquier dispositivo compatible de grabacin de forma de onda puede ser usado." MCIERR_WAVE_OUTPUTSUNSUITABLE, "No hay ningn dispositivo de forma de onda instalado capaz de reproducir ficheros en este formato. Use la opcin Dispositivos para instalar el dispositivo de forma de onda." MCIERR_WAVE_SETOUTPUTUNSUITABLE,"El dispositivo con el que intenta reproducir no puede reconocer el formato de fichero." MCIERR_WAVE_INPUTSUNSUITABLE, "No hay ningn dispositivo de forma de onda instalado capaz de grabar ficheros en este formato. Use la opcin Dispositivos para instalar el dispositivo de forma de onda." diff --git a/dlls/winmm/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc index 6214dbea02d..c6ce8408e11 100644 --- a/dlls/winmm/winmm_Fr.rc +++ b/dlls/winmm/winmm_Fr.rc @@ -32,7 +32,7 @@ MMSYSERR_NOTSUPPORTED, "Fonction non prise en charge. Utilisez la fonction Cap MMSYSERR_BADERRNUM, "Un num駻o d'erreur non d馭ini dans le syst鑪e a 騁 sp馗ifi." MMSYSERR_INVALFLAG, "Un indicateur non valide a 騁 transmis une fonction syst鑪e." MMSYSERR_INVALPARAM, "Un param鑼re non valide a 騁 pass une fonction syst鑪e." - + /* WAVE errors */ WAVERR_BADFORMAT, "Le format choisi ne peut 黎re traduit ou utilis. Utilisez Capacit駸 pour voir les formats pris en charge." WAVERR_STILLPLAYING, "Le Lecteur multim馘ia continue lire des donn馥s. R駟nitialisez-le ou attendez que toutes les donn馥s aient 騁 lues." diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc index d7c4dde148d..6ebaccd4de0 100644 --- a/dlls/winmm/winmm_Nl.rc +++ b/dlls/winmm/winmm_Nl.rc @@ -37,7 +37,7 @@ MMSYSERR_INVALPARAM, "Een systeemfunctie kreeg een ongeldige parameter te eten. WAVERR_BADFORMAT, "Het aangegeven formaat wordt niet ondersteund of geconverteerd. Gebruik de 'Capabilities' functie om de ondersteunde formaten te vinden" WAVERR_STILLPLAYING, "Kan deze opdracht niet uitvoeren zolang afgespeeld wordt. Herstart het apparaat of wacht totdat het apparaat klaar is met spelen." WAVERR_UNPREPARED, "De Wave Header was niet aanwezig. Gebruik de 'Prepare' functie om de Header te genereren en probeer het dan opnieuw." -WAVERR_SYNC, "Kan het apparaat niet openen zonder de WAVE_ALLOWSYNC vlag. Zet de vlag en probeer opnieuw." +WAVERR_SYNC, "Kan het apparaat niet openen zonder de WAVE_ALLOWSYNC vlag. Zet de vlag en probeer opnieuw." /* MIDI errors */ MIDIERR_UNPREPARED, "De MIDI Header was niet aanwezig. Gebruik de 'Prepare' functie om de Header te genereren en probeer het dan opnieuw." diff --git a/dlls/winsock/winsock.spec b/dlls/winsock/winsock.spec index 99237b55e9a..197e9440f65 100644 --- a/dlls/winsock/winsock.spec +++ b/dlls/winsock/winsock.spec @@ -1,8 +1,3 @@ -# -# File: winsock.def -# System: MS-Windows 3.x -# Summary: Module definition file for Windows Sockets DLL. -# name winsock type win16 owner ws2_32 diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec index ec45f3f3b5a..423be332c66 100644 --- a/dlls/winsock/ws2_32.spec +++ b/dlls/winsock/ws2_32.spec @@ -122,5 +122,5 @@ init WS_LibMain 151 stdcall __WSAFDIsSet(long ptr) __WSAFDIsSet # 152 ~ 499 UNKNOWN - + 500 stub WEP diff --git a/include/Makefile.in b/include/Makefile.in index 638a0f94470..295f3d9a8d0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -211,7 +211,7 @@ install:: $(MKINSTALLDIRS) $(includedir) $(includedir)/wine $(includedir)/msvcrt $(includedir)/msvcrt/sys for f in $(INSTALLED_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done -# Don't just do a rm -rf on $(includedir) -- don't want to wipe out +# Don't just do a rm -rf on $(includedir) -- don't want to wipe out # anything extra the user may have put there. uninstall:: [ -d $(includedir) ] && cd $(includedir) && $(RM) $(INSTALLED_INCLUDES) || true diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc index 606a2710187..abe1edb1e2c 100644 --- a/programs/clock/Da.rc +++ b/programs/clock/Da.rc @@ -37,7 +37,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL MENUITEM "&NO WARRANTY", 0x10A MENUITEM "&Om Ur...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL { diff --git a/programs/clock/De.rc b/programs/clock/De.rc index 4797aec6aa6..bb2fd207750 100644 --- a/programs/clock/De.rc +++ b/programs/clock/De.rc @@ -37,7 +37,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL MENUITEM "&KEINE GARANTIE", 0x10A MENUITEM "&ﾜber Uhr", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { diff --git a/programs/clock/En.rc b/programs/clock/En.rc index d83441919e5..2758ccecfde 100644 --- a/programs/clock/En.rc +++ b/programs/clock/En.rc @@ -37,7 +37,7 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL MENUITEM "&NO WARRANTY", 0x10A MENUITEM "&About Clock... ", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL { diff --git a/programs/clock/Es.rc b/programs/clock/Es.rc index 063440c75fa..7d61d026bd3 100644 --- a/programs/clock/Es.rc +++ b/programs/clock/Es.rc @@ -38,7 +38,7 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL MENUITEM "&SIN &GARANTﾍA", 0x10A MENUITEM "&Acerca del Reloj...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { diff --git a/programs/clock/Fi.rc b/programs/clock/Fi.rc index d6c5ce16242..767596b6d8c 100644 --- a/programs/clock/Fi.rc +++ b/programs/clock/Fi.rc @@ -37,7 +37,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL MENUITEM "&EI TAKUUTA", 0x10A MENUITEM "&Kellosta...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL { diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index 83c1fbd35d7..b88ea6c0824 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -37,7 +37,7 @@ MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MENUITEM "&AUCUNE GARANTIE", 0x10A MENUITEM "&A propos de Horloge", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { diff --git a/programs/clock/Pt.rc b/programs/clock/Pt.rc index a6999c1d91b..01d815f687d 100644 --- a/programs/clock/Pt.rc +++ b/programs/clock/Pt.rc @@ -38,7 +38,7 @@ MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL MENUITEM "&SEM GARANTIA", 0x10A MENUITEM "&Sobre Clock...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { diff --git a/programs/clock/Sk.rc b/programs/clock/Sk.rc index f182ade4648..f60641edf0a 100644 --- a/programs/clock/Sk.rc +++ b/programs/clock/Sk.rc @@ -38,7 +38,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL MENUITEM "&BEZ ZﾁRUKY", 0x10A MENUITEM "&O hodin當h...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL { diff --git a/programs/clock/Sw.rc b/programs/clock/Sw.rc index ccbac7eb533..4692546448b 100644 --- a/programs/clock/Sw.rc +++ b/programs/clock/Sw.rc @@ -2,7 +2,7 @@ * Clock (Swedish resources) * * Copyright 1998 Marcel Baur - * Translated into Swedish by Karl Backstrm + * Translated into Swedish by Karl Backstrm * Copyright 2002 Sylvain Petreolle * * This library is free software; you can redistribute it and/or @@ -38,7 +38,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MENUITEM "&INGEN GARANTI", 0x10A MENUITEM "&Om Klockan...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { diff --git a/programs/clock/Wa.rc b/programs/clock/Wa.rc index 79f7de39c8e..d44274750b7 100644 --- a/programs/clock/Wa.rc +++ b/programs/clock/Wa.rc @@ -41,7 +41,7 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL MENUITEM "&NOLE WARANTEYE", 0x10A MENUITEM "ﾅ &dfait di l' rlodje...", 0x10B } -} +} STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_NEUTRAL { diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index ceaef4cb201..af68237ecbc 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -23,7 +23,7 @@ #include #include "cmdlgtst.h" -CmdlgtstMenu MENU +CmdlgtstMenu MENU { POPUP "&File" { @@ -184,7 +184,7 @@ FONT 8, "MS Sans Serif" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } -AboutIcon ICON +AboutIcon ICON { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 274f329721a..1aebb5d28f7 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -60,7 +60,7 @@ POPUP "&Hj MENUITEM "&Om WINE", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -123,4 +123,3 @@ denne operation. \nAfslut et eller flere aktive programmer for at frig hukommelse, og prv s igen." } - diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index cdebe25a8f8..03e610e9f0f 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -3,7 +3,7 @@ * * Copyright 1997,98 Marcel Baur * Copyright 2002 Sylvain Petreolle - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -61,7 +61,7 @@ POPUP "&Hilfe" { MENUITEM "&ﾜber Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -126,4 +126,3 @@ um diese Funktion \nabzuschlie } - diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 5168a497c7f..30a714f9c91 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -61,7 +61,7 @@ POPUP "&Help" { MENUITEM "&About Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -124,4 +124,3 @@ task. \nClose one or more applications to increase the amount of \nfree \ memory." } - diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index e046ae55a7b..7fdcc68d131 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -62,7 +62,7 @@ POPUP "&Ayuda" { MENUITEM "&Acerca de Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -126,4 +126,3 @@ memoria libre." } - diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index 4117311b4f6..57d3f05ef34 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -60,7 +60,7 @@ POPUP "&Apua" { MENUITEM "&Tietoja Wine:ista", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -123,4 +123,3 @@ STRING_OUT_OF_MEMORY, "Muistia ei ole riitt muistia." } - diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index f2aab8f9b4c..3fbbd2f54e2 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -61,7 +61,7 @@ POPUP "&Aide" { MENUITEM "&A propos de Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -124,4 +124,3 @@ task. \n Fermez une ou plusier applications pour lib de la m駑oire." } - diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 540e6f91f70..fdd039eacba 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -60,7 +60,7 @@ POPUP "&Ajuda" { MENUITEM "&Sobre Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -123,4 +123,3 @@ tarefa. \nFeche uma ou mais aplica livre." } - diff --git a/programs/notepad/Sk.rc b/programs/notepad/Sk.rc index e760a51ca67..ef0353919c2 100644 --- a/programs/notepad/Sk.rc +++ b/programs/notepad/Sk.rc @@ -61,7 +61,7 @@ POPUP "&Help" { MENUITEM "&About Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -124,4 +124,3 @@ task. \nClose one or more applications to increase the amount of \nfree \ memory." } - diff --git a/programs/notepad/Sw.rc b/programs/notepad/Sw.rc index 107f4ebd9be..a37e5e6f18e 100644 --- a/programs/notepad/Sw.rc +++ b/programs/notepad/Sw.rc @@ -61,7 +61,7 @@ POPUP "&Hj MENUITEM "&Om Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -124,4 +124,3 @@ den h minne." } - diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index f5e42e6329a..91bd298259a 100644 --- a/programs/notepad/Wa.rc +++ b/programs/notepad/Wa.rc @@ -61,7 +61,7 @@ POPUP "&Aide" { MENUITEM "ﾅ &dfait di Wine", 0x137 } } -} +} /* Dialog `Page setup' */ @@ -123,4 +123,3 @@ STRING_OUT_OF_MEMORY, "Li memwere est plinne. \n\ Cloyoz on programe ou pus po monter li memwere libe." } - diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc index b9f62eda14d..c964feedafc 100644 --- a/programs/notepad/notepad.rc +++ b/programs/notepad/notepad.rc @@ -23,14 +23,14 @@ CONCAT(MENU_, LANGUAGE_ID) MENU { POPUP MENU_FILE { - MENUITEM MENU_FILE_NEW, NP_FILE_NEW + MENUITEM MENU_FILE_NEW, NP_FILE_NEW MENUITEM MENU_FILE_OPEN, NP_FILE_OPEN MENUITEM MENU_FILE_SAVE, NP_FILE_SAVE MENUITEM MENU_FILE_SAVEAS, NP_FILE_SAVEAS MENUITEM MENU_FILE_PRINT, NP_FILE_PRINT MENUITEM MENU_FILE_PAGESETUP, NP_FILE_PAGESETUP MENUITEM MENU_FILE_PRINTSETUP, NP_FILE_PRINTSETUP - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM MENU_FILE_EXIT, NP_FILE_EXIT } POPUP MENU_EDIT { @@ -66,7 +66,7 @@ CONCAT(MENU_, LANGUAGE_ID) MENU MENUITEM MENU_INFO_ABOUT_WINE, NP_HELP_ABOUT_WINE } } - + } /* Dialog `Page setup' */ @@ -200,4 +200,3 @@ ADDSTRING(PAGESETUP_BOTTOMVALUE) #undef STRING_NOTSAVED #undef STRING_NOTFOUND #undef STRING_OUT_OF_MEMORY - diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc index 6811054f624..14155720183 100644 --- a/programs/progman/Ru.rc +++ b/programs/progman/Ru.rc @@ -1,4 +1,4 @@ -/* +/* * Program Manager * * Copyright 2000 Vasily Volchenko @@ -17,8 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* There is a difficulty to use correct codepage for messages, menus etc... So I have added the following line. -May be, such line should be present in EVERY ??.rc file, but... I can't test any language except Russian and English :-) +/* There is a difficulty to use correct codepage for messages, menus etc... So I have added the following line. +May be, such line should be present in EVERY ??.rc file, but... I can't test any language except Russian and English :-) So, everyone, test your native languages!!! */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/progman/Xx.rc b/programs/progman/Xx.rc index 0f6379de431..6b0c087ebb4 100644 --- a/programs/progman/Xx.rc +++ b/programs/progman/Xx.rc @@ -23,15 +23,15 @@ CONCAT(MENU_, LANGUAGE_ID) MENU { POPUP MENU_FILE { - MENUITEM MENU_FILE_NEW, PM_NEW + MENUITEM MENU_FILE_NEW, PM_NEW MENUITEM MENU_FILE_OPEN, PM_OPEN MENUITEM MENU_FILE_MOVE, PM_MOVE, GRAYED MENUITEM MENU_FILE_COPY, PM_COPY, GRAYED MENUITEM MENU_FILE_DELETE, PM_DELETE MENUITEM MENU_FILE_ATTRIBUTES, PM_ATTRIBUTES - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM MENU_FILE_EXECUTE, PM_EXECUTE - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM MENU_FILE_EXIT, PM_EXIT } POPUP MENU_OPTIONS { @@ -51,10 +51,10 @@ CONCAT(MENU_, LANGUAGE_ID) MENU POPUP MENU_HELP { MENUITEM MENU_HELP_CONTENTS, PM_CONTENTS MENUITEM MENU_HELP_SEARCH, PM_SEARCH - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM MENU_HELP_HELP_ON_HELP, PM_HELPONHELP MENUITEM MENU_HELP_TUTORIAL, PM_TUTORIAL - MENUITEM SEPARATOR + MENUITEM SEPARATOR POPUP MENU_INFO { MENUITEM MENU_INFO_LICENSE, PM_LICENSE @@ -310,4 +310,3 @@ ADDSTRING(SYMBOLS_ICO) #undef STRING_LIBRARIES_DLL #undef STRING_SYMBOL_FILES #undef STRING_SYMBOLS_ICO - diff --git a/programs/regapi/regFixer.pl b/programs/regapi/regFixer.pl index c497eb568c5..5d4aa07a578 100755 --- a/programs/regapi/regFixer.pl +++ b/programs/regapi/regFixer.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -# This script takes as STDIN an output from the Registry -# (export from regedit.exe) and prefixes every subkey-value +# This script takes as STDIN an output from the Registry +# (export from regedit.exe) and prefixes every subkey-value # pair by their hkey,key data member # # Copyright 1999 Sylvain St-Germain @@ -37,8 +37,5 @@ LINE: while(<>) { next LINE; } - print "${prefix}$_\n"; + print "${prefix}$_\n"; } - - - diff --git a/programs/regapi/regRestorer.pl b/programs/regapi/regRestorer.pl index f3ee9a1910a..0fbe3a1b0fb 100755 --- a/programs/regapi/regRestorer.pl +++ b/programs/regapi/regRestorer.pl @@ -25,8 +25,8 @@ use strict; use diagnostics; -# I do not validate the integrity of the file, I am assuming that -# the input file comes from the output of regFixer.pl, therefore things +# I do not validate the integrity of the file, I am assuming that +# the input file comes from the output of regFixer.pl, therefore things # should be ok, if they are not, submit a bug my $curr_key = ""; diff --git a/programs/regapi/regSet.sh b/programs/regapi/regSet.sh index 959be21d701..89f7d1a2cbe 100755 --- a/programs/regapi/regSet.sh +++ b/programs/regapi/regSet.sh @@ -1,8 +1,8 @@ #!/bin/bash -# This script is the receipe to generate the key that have to be created like -# if an applicaiton was installed by its installer. It processes using a -# registry based on the picture of the registry before the application is +# This script is the receipe to generate the key that have to be created like +# if an applicaiton was installed by its installer. It processes using a +# registry based on the picture of the registry before the application is # installed and the picture of the registry after the application is installed. # # Copyright 1999 Sylvain St-Germain @@ -27,7 +27,7 @@ if [ $# -ne 2 ]; then echo " You must provide 2 arguments." echo " 1 - Registry output before the application's installation." echo " 2 - Registry output after the application's installation." - echo + echo exit 1 fi @@ -45,7 +45,7 @@ DIFF_FILE=`mktemp -q /tmp/file2_diff.XXXXXXXXX` FILE_TOADD_CLEAN=`mktemp -q /tmp/file_toAdd_clean.XXXXXXXXX` FILE_TOADD=`mktemp -q /tmp/file_toAdd.XXXXXXXXX` -if [ $1 != "/dev/null" ]; then +if [ $1 != "/dev/null" ]; then cat $1 | ./regFixer.pl > $FIX1_FILE fi @@ -56,7 +56,7 @@ cat $2 | ./regFixer.pl > $FIX2_FILE # diff accordingly depending on /dev/null # echo "Diffing..." -if [ $1 != "/dev/null" ]; then +if [ $1 != "/dev/null" ]; then diff $FIX1_FILE $FIX2_FILE > $DIFF_FILE else diff /dev/null $FIX2_FILE > $DIFF_FILE @@ -64,11 +64,11 @@ fi # # Keep only added lines -# +# echo "Grepping keys to add and generating cleaned fixed registry file." cat $DIFF_FILE | grep '^> ' | sed -e 's/^> //' > $FILE_TOADD_CLEAN -# +# # Restore the file format to the regedit export 'like' format # echo "Restoring key's in the regedit export format..." diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 5495813450b..459960679af 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -1,6 +1,6 @@ /* * Uninstaller (rsrc.rc) - * + * * Copyright 2000 Andreas Mohr * * This library is free software; you can redistribute it and/or @@ -77,7 +77,7 @@ UNINSTALLER ICON MOVEABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE { - IDS_APPNAME, "Uninstaller" + IDS_APPNAME, "Uninstaller" } diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 9822b85bba4..737dec45b55 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -59,7 +59,7 @@ END // Accelerator // -VIEW ACCELERATORS +VIEW ACCELERATORS BEGIN "Q", IDM_EXIT, CONTROL END @@ -76,6 +76,3 @@ BEGIN IDS_APPNAME "View" IDS_DESCRIPTION "Regular Metafile Viewer" END - - - diff --git a/programs/wcmd/wcmdrc.rc b/programs/wcmd/wcmdrc.rc index 486ec999681..94a08decdef 100644 --- a/programs/wcmd/wcmdrc.rc +++ b/programs/wcmd/wcmdrc.rc @@ -188,7 +188,7 @@ The verify flag has no function in Wine.\n" WCMD_VOL, "Help about VOL\n" - WCMD_EXIT, + WCMD_EXIT, "EXIT terminates the current command session and returns\ to the operating system or shell from which you invoked wcmd.\n" @@ -222,7 +222,7 @@ Enter HELP for further information on any of the above commands\n" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL -IDI_ICON1 ICON +IDI_ICON1 ICON { '00 00 01 00 01 00 20 20 00 01 00 00 00 00 A8 08' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' @@ -365,5 +365,3 @@ IDI_ICON1 ICON '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 00 00' } - - diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc index ca9fb4c9881..5fe7d698faf 100644 --- a/programs/wineconsole/wineconsole_En.rc +++ b/programs/wineconsole/wineconsole_En.rc @@ -51,7 +51,7 @@ FONT 8, "Helv" AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 159, 23, 40, 10, WS_TABSTOP AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 159, 33, 40, 10, WS_TABSTOP AUTOCHECKBOX "&Quick edit", IDC_OPT_QUICK_EDIT, 119, 44, 40, 10, WS_TABSTOP|BS_MULTILINE|BS_LEFTTEXT - + GROUPBOX "Command history", -1, 10, 57, 190, 35, BS_GROUPBOX LTEXT "&Numbers of recalled commands :", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER @@ -96,4 +96,3 @@ FONT 8, "Helv" EDITTEXT IDC_CNF_WIN_HEIGHT, 78, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 } - diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 605b2049aeb..1f70504994d 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -1,6 +1,6 @@ /* * WineMine (rsrc.rc) - * + * * Copyright 2000 Joshua Thielen * * This library is free software; you can redistribute it and/or @@ -73,7 +73,7 @@ WINEMINE ICON MOVEABLE '00 00 00 00 00 00 00 00 00 00 00 00 00 00' } -FACES BITMAP MOVEABLE +FACES BITMAP MOVEABLE { '42 4D 16 06 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 18 00 00 00 78 00 00 00 01 00 04 00 00 00' @@ -175,7 +175,7 @@ FACES BITMAP MOVEABLE '77 77 77 77 77 77' } -LEDS BITMAP MOVEABLE +LEDS BITMAP MOVEABLE { '42 4D 16 09 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 0D 00 00 00 14 01 00 00 01 00 04 00 00 00' @@ -325,7 +325,7 @@ LEDS BITMAP MOVEABLE '00 00 00 00 00 00' } -MINES BITMAP MOVEABLE +MINES BITMAP MOVEABLE { '42 4D 76 08 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 10 00 00 00 00 01 00 00 01 00 04 00 00 00' @@ -469,7 +469,7 @@ MINES BITMAP MOVEABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE { - IDS_APPNAME, "WineMine" + IDS_APPNAME, "WineMine" } @@ -496,9 +496,9 @@ MENU_WINEMINE MENU DISCARDABLE DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Fastest Times" +CAPTION "Fastest Times" { - GROUPBOX "Fastest Times", IDIGNORE, 10, 10, 140, 45 + GROUPBOX "Fastest Times", IDIGNORE, 10, 10, 140, 45 LTEXT "Beginner", IDIGNORE, 20, 20, 40, 8 LTEXT "Advanced", IDIGNORE, 20, 30, 40, 8 LTEXT "Expert", IDIGNORE, 20, 40, 40, 8 @@ -511,12 +511,12 @@ CAPTION "Fastest Times" DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Congratulations!" +CAPTION "Congratulations!" { - LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 + LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } @@ -524,7 +524,7 @@ CAPTION "Congratulations!" DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Custom Game" +CAPTION "Custom Game" { LTEXT "Rows", IDIGNORE, 5, 5, 30, 10 LTEXT "Cols", IDIGNORE, 5, 35, 30, 10 @@ -536,10 +536,10 @@ CAPTION "Custom Game" PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "About" +CAPTION "About" { LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 @@ -549,4 +549,3 @@ CAPTION "About" } /* End of English-US Resources */ - diff --git a/programs/winetest/make_cygwin_makefiles b/programs/winetest/make_cygwin_makefiles index 101ddc168a9..2b2d5ed61ab 100755 --- a/programs/winetest/make_cygwin_makefiles +++ b/programs/winetest/make_cygwin_makefiles @@ -209,7 +209,7 @@ foreach $dir (@gooddirs) { # define how to make to .ok files foreach $file (@ok_list) { my($dir,$test) = ($file =~ /^(.*[\\\/]+tests)[\\\/]+(.*)\.ok$/); - + print MAKE_FH "$file: \$(TEST_EXE_". fix_dir($file) . ")\n"; print MAKE_FH " \$< $test && \$(TOUCH) \$@\n"; } diff --git a/programs/winhelp/Da.rc b/programs/winhelp/Da.rc index fc36fd23945..dd26ff830c5 100644 --- a/programs/winhelp/Da.rc +++ b/programs/winhelp/Da.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL { POPUP "&Filer" { MENUITEM "ﾅ&bn...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Udskriv emne", 0x104 MENUITEM "&Indstil printer", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Afslut", 0x108 } POPUP "&Rediger" { MENUITEM "K&opier...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Anm誡k...", 0x10C } POPUP "Bog&m誡ke" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL POPUP "&Hj詬p" { MENUITEM "&Brug af Hj詬p", 0x110 MENUITEM "Altid &verst", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "Om &WINE", 0x114 diff --git a/programs/winhelp/De.rc b/programs/winhelp/De.rc index 7f77a6a0d21..8859d3dc413 100644 --- a/programs/winhelp/De.rc +++ b/programs/winhelp/De.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { POPUP "&Datei" { MENUITEM "ﾖ&ffnen...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Thema &drucken", 0x104 MENUITEM "Drucker&einrichtung...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Beenden", 0x108 } POPUP "&Bearbeiten" { MENUITEM "&Kopieren...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Anmerken...", 0x10C } POPUP "&Lesezeichen" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL POPUP "&Hilfe" { MENUITEM "&Hilfe benutzen", 0x110 MENUITEM "Immer im &Vordergrund", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "&ﾜber WINE", 0x114 diff --git a/programs/winhelp/En.rc b/programs/winhelp/En.rc index b95dc900625..129518e3c39 100644 --- a/programs/winhelp/En.rc +++ b/programs/winhelp/En.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL { POPUP "&File" { MENUITEM "&Open", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Print", 0x104 MENUITEM "Printer &setup...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Exit", 0x108 } POPUP "&Edit" { MENUITEM "&Copy...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Annotate...", 0x10C } POPUP "&Bookmark" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL POPUP "&Help" { MENUITEM "Help &on help", 0x110 MENUITEM "Always on &top", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "&About WINE", 0x114 diff --git a/programs/winhelp/Es.rc b/programs/winhelp/Es.rc index fce35d75b5e..0ab7bdd59e1 100644 --- a/programs/winhelp/Es.rc +++ b/programs/winhelp/Es.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { POPUP "&Archivo" { MENUITEM "A&brir...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Imprimir", 0x104 MENUITEM "&Configuracin Impresora...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Salir", 0x108 } POPUP "&Editar" { MENUITEM "&Copiar...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Anotar...", 0x10C } POPUP "&Marcador" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL POPUP "&Ayuda" { MENUITEM "&Ayuda sobre la ayuda", 0x110 MENUITEM "&Toujours visible", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "&Acerca de WINE", 0x114 diff --git a/programs/winhelp/Fi.rc b/programs/winhelp/Fi.rc index 4bba1dd40b4..9301acfbcfb 100644 --- a/programs/winhelp/Fi.rc +++ b/programs/winhelp/Fi.rc @@ -26,15 +26,15 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL { POPUP "&Tiedosto" { MENUITEM "&Avaa...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Tulosta", 0x104 MENUITEM "&Kirjoittimen asetukset...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Lopeta", 0x108 } POPUP "&Muokkaa" { MENUITEM "&Kopioi...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Huomautus...", 0x10C } POPUP "&Kirjanmerkki" { @@ -43,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL POPUP "&Ohje" { MENUITEM "&Ohjeen k艙tt", 0x110 MENUITEM "&Aina p蒿llimm臺sen", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "T&ietoja...", 0x113 #ifdef WINELIB MENUITEM "&Tietoja WINEst", 0x114 diff --git a/programs/winhelp/Fr.rc b/programs/winhelp/Fr.rc index 5158d92c89b..a0a2c5ed731 100644 --- a/programs/winhelp/Fr.rc +++ b/programs/winhelp/Fr.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { POPUP "&Fichier" { MENUITEM "&Ouvrir", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Im&primer", 0x104 MENUITEM "&Configuration de l'imprimante...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Quitter", 0x108 } POPUP "&Edition" { MENUITEM "&Copier...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Annotation...", 0x10C } POPUP "&Signet" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL POPUP "&?" { MENUITEM "&Utiliser l'aide", 0x110 MENUITEM "&Toujours visible", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "&A propos de WINE", 0x114 diff --git a/programs/winhelp/Hu.rc b/programs/winhelp/Hu.rc index 597437a24a7..2e82d55235d 100644 --- a/programs/winhelp/Hu.rc +++ b/programs/winhelp/Hu.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL { POPUP "&File" { MENUITEM "&Megnyit疽...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Nyomtat疽", 0x104 MENUITEM "Nyomtat &be疝lt疽...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Kil駱駸", 0x108 } POPUP "&Szerkeszt駸" { MENUITEM "&M疽ol疽...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Annotate...", 0x10C } POPUP "&Knyvjelz" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL POPUP "&Segts馮" { MENUITEM "Segts馮 &a segts馮rl", 0x110 MENUITEM "Mindig &legfell", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Inform當i...", 0x113 #ifdef WINELIB MENUITEM "&&A WINE-rl", 0x114 diff --git a/programs/winhelp/It.rc b/programs/winhelp/It.rc index 9f140246161..bdced53d656 100644 --- a/programs/winhelp/It.rc +++ b/programs/winhelp/It.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { POPUP "&File" { MENUITEM "&Apri...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "s&tampa", 0x104 MENUITEM "&Setup stampante...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Esci", 0x108 } POPUP "&Modifica" { MENUITEM "&Copia...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Annota...", 0x10C } POPUP "&Segnalibro" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL POPUP "&?" { MENUITEM "&Aiuto sulla guida", 0x110 MENUITEM "Sempre in primo &piano", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Informazioni su...", 0x113 #ifdef WINELIB MENUITEM "&Informazion su WINE", 0x114 diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc index a6e72909257..7842ca9d336 100644 --- a/programs/winhelp/Ko.rc +++ b/programs/winhelp/Ko.rc @@ -25,15 +25,15 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL { POPUP "ﾆﾄﾀﾏ(&F)" { MENUITEM "ｿｭｱ(&O)...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "ﾀﾎｼ(&P)", 0x104 MENUITEM "ﾇﾁｸｰﾅﾍ ｼｳﾁ､(&S)...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "ﾁｾｷ(&E)", 0x108 } POPUP "ﾆﾁ(&E)" { MENUITEM "ｺｹｻ(&C)...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "ﾁﾖｼｮ(&A)...", 0x10C } POPUP "ﾃ･ｰ･ﾇﾇ(&B)" { @@ -42,7 +42,7 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL POPUP "ｵｵｿｸｻ(&H)" { MENUITEM "ｵｵｿｸｻ ｻ鄙ｹ(&O)", 0x110 MENUITEM "ﾇﾗｻ ﾀｧ(&T)", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "ﾁ､ｺｸ(&I)...", 0x113 #ifdef WINELIB MENUITEM "ｿﾍﾀﾎｿ｡ ｰﾇﾏｿｩ(&A)", 0x114 diff --git a/programs/winhelp/Pt.rc b/programs/winhelp/Pt.rc index f7cb2532981..d56458c07c8 100644 --- a/programs/winhelp/Pt.rc +++ b/programs/winhelp/Pt.rc @@ -26,15 +26,15 @@ MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { POPUP "&Arquiv" { MENUITEM "A&brir...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Imprimir", 0x104 MENUITEM "&Configurar Impressora...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Sair", 0x108 } POPUP "&Editar" { MENUITEM "&Copiar...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Anotar...", 0x10C } POPUP "&Marcador" { @@ -43,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL POPUP "&Ajuda" { MENUITEM "Ajuda &na ajuda", 0x110 MENUITEM "Sempre &visvel", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Info...", 0x113 #ifdef WINELIB MENUITEM "&Sobre WINE", 0x114 diff --git a/programs/winhelp/Sk.rc b/programs/winhelp/Sk.rc index 117ecd66dee..14f580b6c6b 100644 --- a/programs/winhelp/Sk.rc +++ b/programs/winhelp/Sk.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* This file is not yet complete !! +/* This file is not yet complete !! Must be rewritten for use of NLS */ #define LANGUAGE_ID Sk diff --git a/programs/winhelp/Sw.rc b/programs/winhelp/Sw.rc index d62256094fb..d11ff5d789c 100644 --- a/programs/winhelp/Sw.rc +++ b/programs/winhelp/Sw.rc @@ -26,15 +26,15 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { POPUP "&Arkiv" { MENUITEM "&ﾖppna...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Skriv ut", 0x104 MENUITEM "Skrivar &inst舁lningar...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Avsluta", 0x108 } POPUP "&Redigera" { MENUITEM "&Kopiera...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Markera...", 0x10C } POPUP "&Bokm舐ke" { @@ -43,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL POPUP "&Hj舁p" { MENUITEM "Anv舅dningen &av hj舁p", 0x110 MENUITEM "Alltid &verst", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Information...", 0x113 #ifdef WINELIB MENUITEM "&Om WINE", 0x114 diff --git a/programs/winhelp/Va.rc b/programs/winhelp/Va.rc index 47c50e7169f..c9d6635c658 100644 --- a/programs/winhelp/Va.rc +++ b/programs/winhelp/Va.rc @@ -30,15 +30,15 @@ MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_NEUTRAL { POPUP "&Datoteca" { MENUITEM "&Rivir", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Stampar tema", 0x104 MENUITEM "&Installaziun dal stampader...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Finir", 0x108 } POPUP "&Lavurar" { MENUITEM "Capchar", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Annotaziun...", 0x10C } POPUP "&Marca" { @@ -47,7 +47,7 @@ MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_NEUTRAL POPUP "&Agd" { MENUITEM "&Douvrar l'agd", 0x110 MENUITEM "Adna da&vant", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "I&nfuormaziuns", 0x113 #ifdef WINELIB MENUITEM "Davart &WINE", 0x114 diff --git a/programs/winhelp/Wa.rc b/programs/winhelp/Wa.rc index c3a768d890d..a749a476622 100644 --- a/programs/winhelp/Wa.rc +++ b/programs/winhelp/Wa.rc @@ -26,15 +26,15 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL { POPUP "&Fitch" { MENUITEM "&Drov...", 0x101 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Rexhe", 0x104 MENUITEM "&Apontiaedje del scrirece...", 0x106 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "Mouss &Fo", 0x108 } POPUP "&Candj" { MENUITEM "&Copy...", 0x10A - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Sicrre...", 0x10C } POPUP "&Rim蚌kes" { @@ -43,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL POPUP "&Aide" { MENUITEM "&Aide so l' Aide", 0x110 MENUITEM "Todi &Visibe", 0x111 - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&Inform蘢ion...", 0x113 #ifdef WINELIB MENUITEM "ﾅ &dfait di WINEE", 0x114 diff --git a/tools/Makefile.in b/tools/Makefile.in index 13932ed2245..34dd48f4d37 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINE__ -DNO_LIBWINE -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" +DEFS = -D__WINE__ -DNO_LIBWINE -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ diff --git a/tools/bug_report.pl b/tools/bug_report.pl index 558ccb4342b..c045c8e897d 100755 --- a/tools/bug_report.pl +++ b/tools/bug_report.pl @@ -21,7 +21,7 @@ ## License along with this library; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## -##Changelog: +##Changelog: ##August 29, 1999 - Work around for debugger exit (or lack thereof) ## - Should now put debugging output in correct place ##April 19, 1999 - Much nicer way to select wine's location @@ -47,11 +47,11 @@ sub do_var { $var =~ s/\t//g; return $var; } -open STDERR, ">&SAVEERR"; open STDERR, ">&STDOUT"; +open STDERR, ">&SAVEERR"; open STDERR, ">&STDOUT"; $ENV{'SHELL'}="/bin/bash"; $var0 = qq{ What is your level of WINE expertise? 1-newbie 2-intermediate 3-advanced - + 1 - Makes a debug report as defined in the WINE documentation. Best for new WINE users. If you're not sure what -debugmsg is, then use this mode. @@ -66,7 +66,7 @@ until ($debuglevel >= 1 and $debuglevel <= 3) { print "Enter your level of WINE expertise (1-3): "; $debuglevel=; chomp $debuglevel; -} +} if ($debuglevel < 3) { $var1 = qq{ @@ -220,28 +220,28 @@ print "\nWhat version of windows are you using with wine?\n\n". do { print "Enter the number that corresponds to your windows version: "; - $winver=; - chomp $winver; + $winver=; + chomp $winver; } -until ($winver >= 0 and $winver <= 7); -if ($winver =~ 0) { - $winver="None Installed"; -} elsif ($winver =~ 1) { - $winver="Windows 3.x"; -} elsif ($winver =~ 2) { - $winver="Windows 95"; -} elsif ($winver =~ 3) { - $winver="Windows 98"; -} elsif ($winver =~ 4) { - $winver="Windows NT 3.5x"; -} elsif ($winver =~ 5) { - $winver="Windows NT 4.x"; -} elsif ($winver =~ 6) { - $winver="Windows NT 5.x"; -} elsif ($winver =~ 7) { +until ($winver >= 0 and $winver <= 7); +if ($winver =~ 0) { + $winver="None Installed"; +} elsif ($winver =~ 1) { + $winver="Windows 3.x"; +} elsif ($winver =~ 2) { + $winver="Windows 95"; +} elsif ($winver =~ 3) { + $winver="Windows 98"; +} elsif ($winver =~ 4) { + $winver="Windows NT 3.5x"; +} elsif ($winver =~ 5) { + $winver="Windows NT 4.x"; +} elsif ($winver =~ 6) { + $winver="Windows NT 5.x"; +} elsif ($winver =~ 7) { print "What version of Windows are you using? "; - $winver=; - chomp $winver; + $winver=; + chomp $winver; } if ($debuglevel < 3) { $var7 = qq{ @@ -254,11 +254,11 @@ if ($debuglevel < 3) { } if ($debuglevel =~ 3) { $var8 = qq{ - Enter the full path to the program you want to run (Example: - /dos/windows/sol.exe, NOT sol.exe): + Enter the full path to the program you want to run (Example: + /dos/windows/sol.exe, NOT sol.exe): }; print do_var($var8); -} +} $program=; chomp $program; while ($program =~ /^(\s)*$/) { @@ -284,15 +284,15 @@ chomp $progbits; until ($progbits == 0 or $progbits == 1 or $progbits == 2) { print "You must enter 0, 1 or 2!\n"; $progbits=; - chomp $progbits + chomp $progbits } -if ($progbits =~ 0) { +if ($progbits =~ 0) { $progbits=Win16 -} elsif ($progbits =~ 1) { - $progbits=Win32 -} else { - $progbits = "Unsure" -} +} elsif ($progbits =~ 1) { + $progbits=Win32 +} else { + $progbits = "Unsure" +} if ($debuglevel > 1) { if ($debuglevel =~ 2) { $var11 = qq{ @@ -312,14 +312,14 @@ if ($debuglevel > 1) { $debugopts=; chomp $debugopts; if ($debugopts =~ /-debugmsg /) { - ($crap, $debugopts) = split / /,$debugopts; + ($crap, $debugopts) = split / /,$debugopts; + } + if ($debugopts =~ /^\s*$/) { + $debugopts="+relay"; } - if ($debugopts =~ /^\s*$/) { - $debugopts="+relay"; - } } elsif ($debuglevel =~ 1) { - $debugopts = "+relay"; -} + $debugopts = "+relay"; +} if ($debuglevel > 1) { if ($debuglevel =~ 2) { $var13 = qq{ @@ -338,13 +338,13 @@ if ($debuglevel > 1) { } $lastnlines=; chomp $lastnlines; - if ($lastnlines =~ /^\s*$/) { - $lastnlines=200; - } + if ($lastnlines =~ /^\s*$/) { + $lastnlines=200; + } } elsif ($debuglevel =~ 1) { - $lastnlines=200; + $lastnlines=200; } -if ($debuglevel > 1) { +if ($debuglevel > 1) { $var15 = qq{ Enter any extra options you want to pass to WINE. }; @@ -376,11 +376,11 @@ if ($debuglevel > 1) { } $configopts=; chomp $configopts; - if ($configopts =~ /^\s*$/) { - $configopts="None"; - } + if ($configopts =~ /^\s*$/) { + $configopts="None"; + } } elsif ($debuglevel =~ 1) { - $configopts="None"; + $configopts="None"; } if ($debuglevel > 1) { if ($debuglevel =~ 2) { @@ -388,7 +388,7 @@ if ($debuglevel > 1) { Is your wine version CVS or from a .tar.gz file? As in... did you download it off a website/ftpsite or did you/have you run cvs on it to update it? For CVS: YYMMDD, where YY is the year (99), MM is the month (01), and DD - is the day (14), that you last updated it (Example: 990114). + is the day (14), that you last updated it (Example: 990114). For tar.gz: Just hit enter and I'll figure out the version for you: }; print do_var($var18); @@ -401,13 +401,13 @@ if ($debuglevel > 1) { } $winever=; chomp $winever; - if ($winever =~ /[0-9]+/) { + if ($winever =~ /[0-9]+/) { $winever .= " CVS"; } else { $winever = `$wineloc -v 2>&1`; chomp $winever; - } + } } elsif ($debuglevel =~ 1) { $winever=`$wineloc -v 2>&1`; chomp $winever; @@ -427,10 +427,10 @@ if ($debuglevel < 3) { OK, now I'm going to run WINE. I will close it for you once the wine debugger comes up. NOTE: You won't see ANY debug messages. Don't worry, they are being output to a file. Since there are so many, it's - not a good idea to have them all output to a terminal (Speed slowdown + not a good idea to have them all output to a terminal (Speed slowdown mainly). WINE will still run much slower than normal, because there will be so - many debug messages being output to file. + many debug messages being output to file. }; print do_var($var20); } elsif ($debuglevel =~ 3) { @@ -544,7 +544,7 @@ Program Type: $progbits Debug Options: -debugmsg $debugopts Other Extra Commands Passed: $extraops Extra ./configure Commands: $configopts -Wine Dependencies: +Wine Dependencies: $wineneeds Last $lastnlines lines of debug output follows: $lastlines @@ -553,7 +553,7 @@ Thank you! EOM } $var22 = qq{ -Great! We're finished making the debug report. Do whatever with it. +Great! We're finished making the debug report. Do whatever with it. }; $var28 = qq{ The filename for the formatted report is: @@ -573,4 +573,3 @@ print do_var($var22); print do_var($var28) if $outfile ne "no file"; print do_var($var29) if $dbgoutfile ne "no file"; print do_var($var30); - diff --git a/tools/c2man.pl b/tools/c2man.pl index 26dd39509a0..9f5315cdb11 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ##################################################################################### -# +# # c2man.pl v0.1 Copyright (C) 2000 Mike McCormack # # Generates Documents from C source code. @@ -35,7 +35,7 @@ # ##################################################################################### # Input from C source file: -# +# # /****************************************************************** # * CopyMetaFile32A (GDI32.23) # * @@ -58,43 +58,43 @@ # ##################################################################################### # Output after processing with nroff -man -# +# # CopyMetaFileA(3w) CopyMetaFileA(3w) -# -# +# +# # NAME # CopyMetaFileA - CopyMetaFile32A (GDI32.23) -# +# # SYNOPSIS # HMETAFILE32 CopyMetaFileA # ( # HMETAFILE32 hSrcMetaFile, # LPCSTR lpFilename # ); -# +# # PARAMETERS # HMETAFILE32 hSrcMetaFile # Handle of metafile to copy. -# +# # LPCSTR lpFilename # Filename if copying to a file. -# +# # DESCRIPTION # Copies the metafile corresponding to hSrcMetaFile to # either a disk file, if a filename is given, or to a new # memory based metafile, if lpFileName is NULL. -# +# # RETURNS # Handle to metafile copy on success, NULL on failure. -# +# # BUGS # Copying to disk returns NULL even if successful. -# +# # SEE ALSO # GetMetaFileA(3w), GetMetaFileW(3w), CopyMetaFileW(3w), # PlayMetaFile(3w), SetMetaFileBitsEx(3w), GetMetaFileBit- # sEx(3w) -# +# ##################################################################################### sub output_manpage @@ -159,7 +159,7 @@ sub output_manpage print MAN ".PP\n"; print MAN "$name_type\n"; print MAN " (\n"; - for($i=0; $i<@params; $i++) { + for($i=0; $i<@params; $i++) { $x = ($i == (@params-1)) ? "" : ","; $c = $params[$i]; $c =~ s/-.*//; @@ -168,7 +168,7 @@ sub output_manpage print MAN " );\n"; print MAN ".SH PARAMETERS\n"; print MAN ".PP\n"; - for($i=0; $i<@params; $i++) { + for($i=0; $i<@params; $i++) { print MAN " $params[$i]\n"; } print MAN ".SH DESCRIPTION\n"; @@ -272,7 +272,7 @@ sub parse_spec s/\(.*\)//; #remove all the args ($ord,$type,$name,$func) = split( /\s+/ ); if(( $type eq "stub" ) || ($type eq "forward")) {next;} - if( $func eq "" ) { next; } + if( $func eq "" ) { next; } @funclist = ( @funclist , $func ); $funcdb{$func."ORD"} = $ord; $funcdb{$func."TYPE"} = $type; @@ -335,4 +335,3 @@ while(@ARGV) { parse_source($ARGV[0]); shift @ARGV; } - diff --git a/tools/examine-relay b/tools/examine-relay index e640abb1d82..1823f8980b9 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -59,7 +59,7 @@ while () { if (!$newlineerror) { print "Err[$tid] string probably cut by newline at line $. .\n"; $newlineerror = 1; - } + } # print "[$_]"; redo; } @@ -110,7 +110,7 @@ while () { if !$addrok; print "Err[$tid]: Return from $func with segreg $segreg, not $topseg.\n" if !$segok; - } + } } } diff --git a/tools/font_convert.sh b/tools/font_convert.sh index 24bd89e5629..af7fe56966e 100755 --- a/tools/font_convert.sh +++ b/tools/font_convert.sh @@ -21,7 +21,7 @@ TMPDIR=/tmp/fconv.$$; TFILE=`tempfile`; -# Where the fnt2bdf utility resides +# Where the fnt2bdf utility resides FC=$HOME""/wine/tools/fnt2bdf; # which OEM_CHARSET to use CHARSET="winsys"; @@ -29,16 +29,16 @@ TARGET=/usr/X11R6/lib/X11/fonts/misc; BDFTOPCF=/usr/X11R6/bin/bdftopcf; PAT="*.fon"; Q=""; -OLDPWD=`pwd`; +OLDPWD=`pwd`; usage () { echo "usage: "`basename $0`" [-q] [-c charset] [-t fontdir] [-b bdftopcf] [-f fnt2bdf]" echo " [-p pattern] windir" - echo + echo echo "this utility scans a directory and its subdirectories for bitmap-fonts" echo "in Windows format, converts them to PCF-fons and installs them. If X" echo "is running, the X fontpath is re-adjusted." - echo + echo echo "options:" echo " -q quit operation." echo " -c charset charset name for OEM_CHARSET fonts, default: $CHARSET" @@ -65,7 +65,7 @@ while [ "$1" ]; do -p ) shift; if [ "$1" ]; then PAT=$1; shift; else usage; fi; ;; -q ) shift; Q=":"; ;; -* ) usage; ;; - * ) if [ "$WIND" ]; then usage; else WIND=$1; shift; fi; ;; + * ) if [ "$WIND" ]; then usage; else WIND=$1; shift; fi; ;; esac; done; @@ -77,7 +77,7 @@ type -p $FC 1>/dev/null || { $Q echo "Can't execute $FC"; exit 1; } $Q echo -n "looking for bitmap fonts... " FONTS=`find "$WIND" -iname $PAT 1>$TFILE 2>/dev/null`; -if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then $Q echo "$PAT is a invalid sarch expression"; exit 1; fi; i=0; @@ -85,15 +85,15 @@ i=0; rm $TFILE; $Q echo "done." -if [ -z "$FONTS" ]; then $Q echo "Can't find any fonts in $WIND"; exit 1; fi; +if [ -z "$FONTS" ]; then $Q echo "Can't find any fonts in $WIND"; exit 1; fi; mkdir "$TMPDIR" cd "$TMPDIR" -for i in "${FONTS[@]}"; do +for i in "${FONTS[@]}"; do FNT=`basename "$i"`; FNT=${FNT%.???}; $Q echo "converting $i"; - if [ "$Q" ]; then + if [ "$Q" ]; then $FC -c $CHARSET -f $FNT "$i" 2>/dev/null; else $FC -c $CHARSET -f $FNT "$i"; @@ -101,17 +101,17 @@ for i in "${FONTS[@]}"; do done; for i in *.bdf; do - if [ "$i" == "*.bdf" ]; then echo "No fonts extracted"; exit 0; fi; + if [ "$i" == "*.bdf" ]; then echo "No fonts extracted"; exit 0; fi; bdftopcf -o "${i%.???}.pcf" "$i"; $Q echo "installing ${i%.???}.pcf"; mv "${i%.???}.pcf" $TARGET 2>/dev/null - if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then $Q echo "Can't install fonts to $TARGET. Are your root?"; cd "$OLDPWD"; rm -rf "$TMPDIR"; exit 1; fi; rm "$i"; done; cd $TARGET; -$Q echo "running mkfontdir"; +$Q echo "running mkfontdir"; if [ "$Q" ]; then mkfontdir 1>/dev/null 2>/dev/null; else @@ -120,4 +120,3 @@ fi; rmdir "$TMPDIR" if [ "$DISPLAY" ]; then $Q echo "adjusting X font database"; xset fp rehash; fi; - diff --git a/tools/genpatch b/tools/genpatch index 2625cd412ad..d3906501f56 100755 --- a/tools/genpatch +++ b/tools/genpatch @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # genpatch - A utility that generates patches for submission to # wine-patches@winehq.com # diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers index 9ab4986b9ad..7937bfa1e11 100755 --- a/tools/make_X11wrappers +++ b/tools/make_X11wrappers @@ -147,7 +147,7 @@ END output_fn("XShmQueryExtension", "Bool", "Display *", "Display *a0", "a0"); output_fn("XShmQueryVersion", "Bool", - "Display *, int *, int *, Bool *", + "Display *, int *, int *, Bool *", "Display *a0, int *a1, int *a2, Bool *a3", "a0, a1, a2, a3"); output_fn("XShmPixmapFormat", "int", "Display *", "Display *a0", "a0"); @@ -162,7 +162,7 @@ END "Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10", "a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10"); output_fn("XShmGetImage", Status, "Display *, Drawable, XImage *, int, int, unsigned long", - "Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5", + "Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5", "a0, a1, a2, a3, a4, a5"); output_fn("XShmCreateImage", "XImage *", "Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int", @@ -331,11 +331,11 @@ output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int", "Display*,int,int,int", "Display*a0,int a1,int a2,int a3", "a0,a1,a2,a3" - ); - + ); + } else { - open(IN, - "echo \"$x11_incl#include \" | " . + open(IN, + "echo \"$x11_incl#include \" | " . "gcc -L$X11_include_dir -DNeedFunctionPrototypes -E - | " . "grep -v '^[ \t]*\$)' |" ) || die "open"; @@ -453,8 +453,8 @@ sub output_fn_short { # output_fn_sort("Bool", "XDGAQueryExtension", "Display *", "int *", "int *"); # my ($result_type, $fn_name, @args) = @_; - - my ($i, $proto, $formals, $actuals) = (0, + + my ($i, $proto, $formals, $actuals) = (0, "$result_type TS$fn_name(", "$result_type TS$fn_name(", ""); diff --git a/tools/testrun b/tools/testrun index 79e34620091..ac256e061a0 100755 --- a/tools/testrun +++ b/tools/testrun @@ -41,7 +41,7 @@ $wineoptions=''; # Path to WINE ChangeLog. Used as timestamp for new releases... # $changelog = '/home/marcus/wine/ChangeLog'; -# +# # How long before automatically killing all subprocesses # 30 is good for automatic testing, 300 or more for interactive testing. # @@ -62,7 +62,7 @@ $<||die "Running this script under UID 0 is a great security risk (and risk for if (! -d "runs") { die "no subdirectory runs/ found in $cwd. Please create one first!\n";} -# look for the exact path to wine executeable in case we need it for a +# look for the exact path to wine executeable in case we need it for a # replacement changelog. if (! ($wine =~ /\//)) { # no path specified. Look it up. @paths = split(/:/,$ENV{'PATH'}); @@ -118,7 +118,7 @@ sub kill_subprocesses { open(PSAUX,"ps aulc|"); # lookup all processes, remember their parents and cmdlines. %parentof=(); - $xline = ; # fmtline + $xline = ; # fmtline @psformat = split(/\s\s*/,$xline); psline: while () { @@ -231,7 +231,7 @@ while ($exe=) { # FIXME: doesn't handle missing libwine.so during compile... (-x $wine) || die "no $wine executable found!\n"; - # Skip all mssetup, acmsetup , installshield whatever exes. + # Skip all mssetup, acmsetup , installshield whatever exes. # they seem to work, mostly and starting them is just annoying. next if ($exe =~ /acmsetup|unwise|testexit|_msset|isun|st4u|st5u|_mstest|_isdel|ms-setup|~ms|unin/io); @@ -243,8 +243,8 @@ while ($exe=) { # # Check if changelog is newer, if not, continue # - if ( -e "runs/${runfile}.out" && - (-M $changelog > -M "runs/${runfile}.out") && + if ( -e "runs/${runfile}.out" && + (-M $changelog > -M "runs/${runfile}.out") && (-M $exe > -M "runs/${runfile}.out") ) { #print "skipping $exe, already done.\n"; diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 9b82814d765..b5d32ce42dd 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -36,7 +36,7 @@ sub file { local $_ = shift; if(defined($_)) { $$file = $_; } - + return $$file; } @@ -47,7 +47,7 @@ sub begin_line { local $_ = shift; if(defined($_)) { $$begin_line = $_; } - + return $$begin_line; } @@ -58,7 +58,7 @@ sub begin_column { local $_ = shift; if(defined($_)) { $$begin_column = $_; } - + return $$begin_column; } @@ -69,7 +69,7 @@ sub end_line { local $_ = shift; if(defined($_)) { $$end_line = $_; } - + return $$end_line; } @@ -80,7 +80,7 @@ sub end_column { local $_ = shift; if(defined($_)) { $$end_column = $_; } - + return $$end_column; } @@ -91,7 +91,7 @@ sub linkage { local $_ = shift; if(defined($_)) { $$linkage = $_; } - + return $$linkage; } @@ -102,7 +102,7 @@ sub return_type { local $_ = shift; if(defined($_)) { $$return_type = $_; } - + return $$return_type; } @@ -113,7 +113,7 @@ sub calling_convention { local $_ = shift; if(defined($_)) { $$calling_convention = $_; } - + return $$calling_convention; } @@ -124,7 +124,7 @@ sub name { local $_ = shift; if(defined($_)) { $$name = $_; } - + return $$name; } @@ -135,7 +135,7 @@ sub argument_types { local $_ = shift; if(defined($_)) { $$argument_types = $_; } - + return $$argument_types; } @@ -146,7 +146,7 @@ sub argument_names { local $_ = shift; if(defined($_)) { $$argument_names = $_; } - + return $$argument_names; } @@ -157,7 +157,7 @@ sub statements_line { local $_ = shift; if(defined($_)) { $$statements_line = $_; } - + return $$statements_line; } @@ -168,7 +168,7 @@ sub statements_column { local $_ = shift; if(defined($_)) { $$statements_column = $_; } - + return $$statements_column; } @@ -179,7 +179,7 @@ sub statements { local $_ = shift; if(defined($_)) { $$statements = $_; } - + return $$statements; } diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 451dcdf148c..7165f90ad82 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -221,7 +221,7 @@ sub _parse_c_error { $output->write("\n"); $output->prefix(""); } - + if($current) { $output->write("$$file:$line." . ($column + 1) . ": $context: $message: \\\n$current"); } else { @@ -493,7 +493,7 @@ sub parse_c_declaration { if(!&$$found_declaration($begin_line, $begin_column, $end_line, $end_column, $_)) { return 1; } - + # Function my $function = shift; @@ -543,7 +543,7 @@ sub parse_c_declaration { } else { $self->_parse_c_error($_, $line, $column, "declaration"); } - + $$refcurrent = $_; $$refline = $line; $$refcolumn = $column; @@ -588,7 +588,7 @@ sub parse_c_expression { my $begin_line = $line; my $begin_column = $column + 1; - + my $name; my @arguments; my @argument_lines; @@ -596,7 +596,7 @@ sub parse_c_expression { if(!$self->parse_c_function_call(\$_, \$line, \$column, \$name, \@arguments, \@argument_lines, \@argument_columns)) { return 0; } - + if(&$$found_function_call($begin_line, $begin_column, $line, $column, $name, \@arguments)) { while(defined(my $argument = shift @arguments) && @@ -632,7 +632,7 @@ sub parse_c_file { my $refcurrent = shift; my $refline = shift; my $refcolumn = shift; - + local $_ = $$refcurrent; my $line = $$refline; my $column = $$refcolumn; @@ -652,7 +652,7 @@ sub parse_c_file { while($plevel > 0 || $blevel > 0) { my $match; $self->_parse_c_until_one_of("#/\\(\\)\\[\\]\\{\\};", \$_, \$line, \$column, \$match); - + if($line != $previous_line) { &$$found_line($line); } elsif($column == $previous_column) { @@ -737,7 +737,7 @@ sub parse_c_file { &$$found_comment($line, $column + 1, $&); local $_ = $&; while(s/^.*?\n//) { - $blank_lines++; + $blank_lines++; } if($_) { $column += length($_); @@ -815,11 +815,11 @@ sub parse_c_file { } } elsif(s/^;//) { $declaration .= $&; - if($blevel == 1 && - $declaration !~ /^typedef/ && + if($blevel == 1 && + $declaration !~ /^typedef/ && $declaration !~ /^(?:const\s+|extern\s+|static\s+)(?:struct|union)(?:\s+\w+)?\s*\{/s && - $declaration =~ /^(?:\w+\s*)*(?:(?:\*\s*)+|\s+)(\w+)\s*\(\s*(?:(?:\w+\s*,\s*)*\w+\s*)?\)(.*?);/s && - $1 ne "ICOM_VTABLE" && $2) # K&R + $declaration =~ /^(?:\w+\s*)*(?:(?:\*\s*)+|\s+)(\w+)\s*\(\s*(?:(?:\w+\s*,\s*)*\w+\s*)?\)(.*?);/s && + $1 ne "ICOM_VTABLE" && $2) # K&R { $self->_parse_c_warning($line, $column, "function $1: warning: function has K&R format"); } elsif($plevel == 1 && $blevel == 1) { @@ -861,7 +861,7 @@ sub parse_c_function { my $refcolumn = shift; my $reffunction = shift; - + local $_ = $$refcurrent; my $line = $$refline; my $column = $$refcolumn; @@ -883,10 +883,10 @@ sub parse_c_function { my $begin_column = $column + 1; my $match; - while($self->_parse_c('const|inline|extern|static|volatile|' . + while($self->_parse_c('const|inline|extern|static|volatile|' . 'signed(?=\\s+char|s+int|\s+long(?:\s+long)?|\s+short)|' . 'unsigned(?=\s+char|\s+int|\s+long(?:\s+long)?|\s+short)', - \$_, \$line, \$column, \$match)) + \$_, \$line, \$column, \$match)) { if($match =~ /^extern|static$/) { if(!$linkage) { @@ -907,15 +907,15 @@ sub parse_c_function { return 0; } - $self->_parse_c("__cdecl|__stdcall|inline|CDECL|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK|WINE_UNUSED|PASCAL", + $self->_parse_c("__cdecl|__stdcall|inline|CDECL|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK|WINE_UNUSED|PASCAL", \$_, \$line, \$column, \$calling_convention); - - if(!$self->_parse_c('\w+', \$_, \$line, \$column, \$name)) { - return 0; + + if(!$self->_parse_c('\w+', \$_, \$line, \$column, \$name)) { + return 0; } if(!$self->parse_c_tuple(\$_, \$line, \$column, \@arguments, \@argument_lines, \@argument_columns)) { - return 0; + return 0; } } @@ -933,7 +933,7 @@ sub parse_c_function { my $end_line = $line; my $end_column = $column; - + $$refcurrent = $_; $$refline = $line; $$refcolumn = $column; @@ -946,7 +946,7 @@ sub parse_c_function { $function->end_line($end_line); $function->end_column($end_column); $function->linkage($linkage); - $function->return_type($return_type); + $function->return_type($return_type); $function->calling_convention($calling_convention); $function->name($name); # if(defined($argument_types)) { @@ -1036,7 +1036,7 @@ sub parse_c_preprocessor { if(!&$$found_preprocessor($begin_line, $begin_column, "$_")) { return 1; } - + if(0) { # Nothing } elsif(/^\#\s*define\s*(.*?)$/s) { @@ -1424,10 +1424,10 @@ sub parse_c_variable { my $name = ""; my $match; - while($self->_parse_c('const|inline|extern|static|volatile|' . + while($self->_parse_c('const|inline|extern|static|volatile|' . 'signed(?=\\s+char|s+int|\s+long(?:\s+long)?|\s+short)|' . 'unsigned(?=\s+char|\s+int|\s+long(?:\s+long)?|\s+short)', - \$_, \$line, \$column, \$match)) + \$_, \$line, \$column, \$match)) { if($match =~ /^extern|static$/) { if(!$linkage) { @@ -1448,7 +1448,7 @@ sub parse_c_variable { $finished = 1; } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific \$_, \$line, \$column, \$match)) - { + { $type = $match; $finished = 1; } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*\(\w+\)', \$_, \$line, \$column, \$match)) { @@ -1509,7 +1509,7 @@ sub parse_c_variable { } else { return 0; } - + # $output->write("$type: $name: '$_'\n"); if(1) { diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index 24c3ed44c12..bda39c7644b 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -159,7 +159,7 @@ sub _get_files { my @entries= readdir(DIR); closedir(DIR); foreach (@entries) { - $_ = "$dir/$_"; + $_ = "$dir/$_"; if(/\.\.?$/) { # Nothing } elsif(-d $_) { @@ -174,8 +174,8 @@ sub _get_files { return @files; } -sub get_api_files { - my $name = shift; +sub get_api_files { + my $name = shift; return _get_files("api", undef, "$winapi_check_dir/$name"); } sub get_c_files { return _get_files("c", @_); } diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm index 92dfab74da1..fbc3475f626 100644 --- a/tools/winapi/function.pm +++ b/tools/winapi/function.pm @@ -36,7 +36,7 @@ sub file { local $_ = shift; if(defined($_)) { $$file = $_; } - + return $$file; } @@ -47,7 +47,7 @@ sub debug_channels { local $_ = shift; if(defined($_)) { $$debug_channels = $_; } - + return $$debug_channels; } @@ -58,7 +58,7 @@ sub documentation_line { local $_ = shift; if(defined($_)) { $$documentation_line = $_; } - + return $$documentation_line; } @@ -69,7 +69,7 @@ sub documentation { local $_ = shift; if(defined($_)) { $$documentation = $_; } - + return $$documentation; } @@ -80,7 +80,7 @@ sub function_line { local $_ = shift; if(defined($_)) { $$function_line = $_; } - + return $$function_line; } @@ -91,7 +91,7 @@ sub linkage { local $_ = shift; if(defined($_)) { $$linkage = $_; } - + return $$linkage; } @@ -102,7 +102,7 @@ sub return_type { local $_ = shift; if(defined($_)) { $$return_type = $_; } - + return $$return_type; } @@ -113,7 +113,7 @@ sub calling_convention { local $_ = shift; if(defined($_)) { $$calling_convention = $_; } - + return $$calling_convention; } @@ -124,7 +124,7 @@ sub internal_name { local $_ = shift; if(defined($_)) { $$internal_name = $_; } - + return $$internal_name; } @@ -135,7 +135,7 @@ sub argument_types { local $_ = shift; if(defined($_)) { $$argument_types = $_; } - + return $$argument_types; } @@ -146,7 +146,7 @@ sub argument_names { local $_ = shift; if(defined($_)) { $$argument_names = $_; } - + return $$argument_names; } @@ -157,7 +157,7 @@ sub argument_documentations { local $_ = shift; if(defined($_)) { $$argument_documentations = $_; } - + return $$argument_documentations; } @@ -168,7 +168,7 @@ sub statements_line { local $_ = shift; if(defined($_)) { $$statements_line = $_; } - + return $$statements_line; } @@ -179,7 +179,7 @@ sub statements { local $_ = shift; if(defined($_)) { $$statements = $_; } - + return $$statements; } diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index 1dfc9afe697..5f7c293b305 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -46,7 +46,7 @@ if($options->progress) { my $command = $options->make . " " . join(" ", $options->arguments); open(IN, "($command) 2>&1 |"); -while() { +while() { chomp; if(!&make_parser::line($_)) { diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 5d35f39f321..527ee66af7d 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -40,7 +40,7 @@ use options qw($options); # global ######################################################################## -my $current; +my $current; my $function; ######################################################################## @@ -98,7 +98,7 @@ sub line { my $progress = ""; if($directory && $directory ne ".") { $progress .= "$directory: "; - } + } if($tool) { $progress .= "$tool: "; } @@ -122,16 +122,16 @@ sub line { if($#$write_files >= 0) { if($#$read_files >= 0) { $progress .= ", "; - } + } $progress .= "write[" . join(" ", @{$write_files}) . "]"; } if($#$remove_files >= 0) { if($#$read_files >= 0 || $#$write_files >= 0) { $progress .= ", "; - } + } $progress .= "remove[" . join(" ", @{$remove_files}) . "]"; } - + $output->progress($progress); } @@ -209,7 +209,7 @@ sub make_output { # Nothing } elsif(/^\*\*\* Error code (\d+)$/) { # Nothing - } elsif(/^\*\*\* Warning:\s+/) { # + } elsif(/^\*\*\* Warning:\s+/) { # if(/^File \`(.+?)\' has modification time in the future \((.+?) > \(.+?\)\)$/) { # Nothing } else { @@ -493,7 +493,7 @@ sub gcc_output { HMENU|HMIDISTRM|HMIDIIN|HMIDIOUT|HMIXER|HMIXEROBJ|HMMIO|HMODULE| HLINE|HPEN|HPHONE|HPHONEAPP| HRASCONN|HRGN|HRSRC|HWAVEIN|HWAVEOUT|HWINSTA|HWND| - SC_HANDLE|WSAEVENT|handle_t|pointer)$/x) + SC_HANDLE|WSAEVENT|handle_t|pointer)$/x) { $supress = 1; } else { diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 5a6ca950a72..277622bc524 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -102,13 +102,13 @@ sub new { } else { $name = $1; } - + if($name =~ /^([^-].*)$/) { $name = $$options_short{$1}; } else { $name =~ s/^-(.*)$/$1/; } - + my $prefix; if(defined($name) && $name =~ /^no-(.*)$/) { $name = $1; @@ -130,7 +130,7 @@ sub new { my $parser = $$option{parser}; my $refvalue = \${$self->{$key}}; my @parents = (); - + if(defined($$option{parent})) { if(ref($$option{parent}) eq "ARRAY") { @parents = @{$$option{parent}}; @@ -139,7 +139,7 @@ sub new { } } - if(defined($parser)) { + if(defined($parser)) { if(!defined($value)) { $value = shift @ARGV; } @@ -161,7 +161,7 @@ sub new { foreach my $parent (@old_parents) { my $parentkey = $$options_long{$parent}{key}; my $refparentvalue = \${$self->{$parentkey}}; - + $$refparentvalue = 1; if(defined($$options_long{$parent}{parent})) { @@ -177,9 +177,9 @@ sub new { next; } } - + if(!$end_of_options && /^-(.*)$/) { - $output->write("unknown option: $_\n"); + $output->write("unknown option: $_\n"); $output->write($$options_usage); exit 1; } else { @@ -335,7 +335,7 @@ sub show_help { my $current = ${$self->{$$option{key}}}; my $value = $current; - + my $command; if(ref($value) ne "HASH") { if($value) { @@ -358,7 +358,7 @@ sub show_help { $output->write("Disable "); } else { $output->write("Enable "); - } + } } else { if($value->{active}) { $output->write("(Disable) "); @@ -370,7 +370,7 @@ sub show_help { $output->write("$description (default)\n"); } else { $output->write("$description\n"); - } + } } } @@ -382,7 +382,7 @@ sub AUTOLOAD { my $refvalue = $self->{$name}; if(!defined($refvalue)) { - die ": options.pm: member $name does not exists\n"; + die ": options.pm: member $name does not exists\n"; } if(ref($$refvalue) ne "HASH") { @@ -392,16 +392,16 @@ sub AUTOLOAD { } } -sub arguments { +sub arguments { my $self = shift; my $arguments = \@{$self->{_ARGUMENTS}}; - return @$arguments; + return @$arguments; } sub c_files { - my $self = shift; + my $self = shift; my $c_files = \@{$self->{_C_FILES}}; @@ -412,8 +412,8 @@ sub c_files { return @$c_files; } -sub h_files { - my $self = shift; +sub h_files { + my $self = shift; my $h_files = \@{$self->{_H_FILES}}; @@ -425,7 +425,7 @@ sub h_files { } sub directories { - my $self = shift; + my $self = shift; my $directories = \@{$self->{_DIRECTORIES}}; diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm index f5cf79373fb..259b9efa6e3 100644 --- a/tools/winapi/output.pm +++ b/tools/winapi/output.pm @@ -126,7 +126,7 @@ sub update_progress { my $progress_enabled = \${$self->{PROGRESS_ENABLED}}; my $progress = \${$self->{PROGRESS}}; my $last_progress = \${$self->{LAST_PROGRESS}}; - + if($$progress_enabled) { my $prefix = ""; my $suffix = ""; @@ -134,7 +134,7 @@ sub update_progress { for (1..length($$last_progress)) { $prefix .= ""; } - + my $diff = length($$last_progress)-length($$progress); if($diff > 0) { for (1..$diff) { diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index 6ec13a512cf..16c9ade0eaf 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -30,7 +30,7 @@ BEGIN { use vars qw($current_dir $wine_dir $winapi_dir $winapi_check_dir); - my $tool = $0; + my $tool = $0; $tool =~ s%^(?:.*?/)?([^/]+)$%$1%; if(defined($current_dir) && defined($wine_dir) && @@ -45,8 +45,8 @@ BEGIN { $wine_dir = $1; } else { $wine_dir = "."; - - } + + } require Cwd; my $cwd = Cwd::cwd(); diff --git a/tools/winapi/trampoline b/tools/winapi/trampoline index cd048650079..7bdf13f3858 100755 --- a/tools/winapi/trampoline +++ b/tools/winapi/trampoline @@ -21,7 +21,7 @@ use strict; require Cwd; -my $tool = $0; +my $tool = $0; $tool =~ s%^(?:.*?/)?([^/]+)$%$1%; $_ = Cwd::cwd(); diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm index 2d3c86f8004..dfbf834fd09 100644 --- a/tools/winapi/util.pm +++ b/tools/winapi/util.pm @@ -105,7 +105,7 @@ sub replace_file { } return $result; -} +} ######################################################################## # normalize_set @@ -116,7 +116,7 @@ sub normalize_set { if(!defined($_)) { return undef; } - + my %hash = (); foreach my $key (split(/\s*&\s*/)) { $hash{$key}++; diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index 389f41d4389..03c060e01b2 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -50,7 +50,7 @@ my %options_long = ( "spec-mismatch" => { default => 0, description => "spec file mismatch checking" }, "local" => { default => 1, description => "local checking" }, - "module" => { + "module" => { default => { active => 1, filter => 0, hash => {} }, parent => "local", parser => \&parser_comma_list, @@ -77,11 +77,11 @@ my %options_long = ( "misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" }, "statements" => { default => 0, parent => "local", description => "check for statements inconsistances" }, "cross-call" => { default => 0, parent => "statements", description => "check for cross calling functions" }, - "cross-call-win32-win16" => { + "cross-call-win32-win16" => { default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16" }, - "cross-call-unicode-ascii" => { - default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII" + "cross-call-unicode-ascii" => { + default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII" }, "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" }, @@ -98,12 +98,12 @@ my %options_long = ( "documentation" => { default => 1, - parent => "local", + parent => "local", description => "check for documentation inconsistances" }, - "documentation-pedantic" => { - default => 0, - parent => "documentation", + "documentation-pedantic" => { + default => 0, + parent => "documentation", description => "be pendantic when checking for documentation inconsistances" }, @@ -113,11 +113,11 @@ my %options_long = ( description => "check for arguments documentation inconsistances\n" }, "documentation-comment-indent" => { - default => 0, + default => 0, parent => "documentation", description => "check for documentation comment indent inconsistances" }, "documentation-comment-width" => { - default => 0, + default => 0, parent => "documentation", description => "check for documentation comment width inconsistances" }, "documentation-name" => { @@ -168,23 +168,23 @@ use strict; sub report_module { my $self = shift; my $refvalue = $self->{MODULE}; - + my $name = shift; if(defined($name)) { - return $$refvalue->{active} && (!$$refvalue->{filter} || $$refvalue->{hash}->{$name}); + return $$refvalue->{active} && (!$$refvalue->{filter} || $$refvalue->{hash}->{$name}); } else { return 0; - } + } } sub report_argument_forbidden { - my $self = shift; + my $self = shift; my $refargument_forbidden = $self->{ARGUMENT_FORBIDDEN}; my $type = shift; - return $$refargument_forbidden->{active} && (!$$refargument_forbidden->{filter} || $$refargument_forbidden->{hash}->{$type}); + return $$refargument_forbidden->{active} && (!$$refargument_forbidden->{filter} || $$refargument_forbidden->{hash}->{$type}); } sub report_argument_kind { @@ -193,7 +193,7 @@ sub report_argument_kind { my $kind = shift; - return $$refargument_kind->{active} && (!$$refargument_kind->{filter} || $$refargument_kind->{hash}->{$kind}); + return $$refargument_kind->{active} && (!$$refargument_kind->{filter} || $$refargument_kind->{hash}->{$kind}); } diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index a480b71bfbb..bb509e918cc 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -79,7 +79,7 @@ if($options->spec_files || $options->winetest) { $module2type{$module} = $type; } elsif(/^\d+|@/) { $header = 0; - $lookahead = 1; + $lookahead = 1; } next; } @@ -152,7 +152,7 @@ sub documentation_specifications { $output->write("$external_name ($module.$ordinal) already exists\n"); } } - + if($options->debug) { $output->write("$external_name ($module.$ordinal)\n"); } @@ -208,7 +208,7 @@ foreach my $file (@c_files) { my $internal_name = $function->internal_name; $functions{$internal_name} = $function; - + $output->progress("$file (file $progress_current of $progress_max): $internal_name"); $output->prefix_callback(sub { return $function->prefix; }); @@ -286,14 +286,14 @@ if($options->spec_files) { foreach my $module (keys(%specifications)) { my $spec_file = $module2spec_file{$module}; my $type = $module2type{$module}; - + if(!defined($spec_file) || !defined($type)) { $output->write("$module: doesn't exist\n"); next; } - + $spec_file .= "2"; - + $output->progress("$spec_file"); open(OUT, "> $wine_dir/$spec_file"); @@ -304,7 +304,7 @@ if($options->spec_files) { print OUT "init " . $function->internal_name . "\n"; } print OUT "\n"; - + my %debug_channels; if(exists($specifications{$module}{init})) { my $function = $specifications{$module}{init}{function}; @@ -319,7 +319,7 @@ if($options->spec_files) { } } foreach my $name (sort(keys(%{$specifications{$module}{unfixed}}))) { - my $function = $specifications{$module}{unfixed}{$name}{function}; + my $function = $specifications{$module}{unfixed}{$name}{function}; foreach my $debug_channel (@{$function->debug_channels}) { $debug_channels{$debug_channel}++; } @@ -332,11 +332,11 @@ if($options->spec_files) { } my @debug_channels = sort(keys(%debug_channels)); - if($#debug_channels >= 0) { + if($#debug_channels >= 0) { print OUT "debug_channels (" . join(" ", @debug_channels) . ")\n"; print OUT "\n"; } - + my $empty = 1; if(!$empty) { @@ -345,8 +345,8 @@ if($options->spec_files) { } foreach my $external_name (sort(keys(%{$specifications{$module}{unknown}}))) { my $entry = $specifications{$module}{unknown}{$external_name}; - my $ordinal = $entry->{ordinal}; - my $function = $entry->{function}; + my $ordinal = $entry->{ordinal}; + my $function = $entry->{function}; print OUT "# "; output_function(\*OUT, $type, $ordinal, $external_name, $function); $empty = 0; @@ -358,8 +358,8 @@ if($options->spec_files) { } foreach my $ordinal (sort {$a <=> $b} keys(%{$specifications{$module}{fixed}})) { my $entry = $specifications{$module}{fixed}{$ordinal}; - my $external_name = $entry->{external_name}; - my $function = $entry->{function}; + my $external_name = $entry->{external_name}; + my $function = $entry->{function}; output_function(\*OUT, $type, $ordinal, $external_name, $function); $empty = 0; } @@ -387,7 +387,7 @@ if($options->stub_statistics) { my %module_stub_count; my %module_total_count; - + foreach my $internal_name ($winapi->all_internal_functions,$winapi->all_functions_stub) { foreach my $module (split(/ \& /, $winapi->function_internal_module($internal_name))) { if($winapi->is_function_stub_in_module($module, $internal_name)) { @@ -413,11 +413,11 @@ if($options->stub_statistics) { if(!defined($total)) { $total = 0;} my $stubs = $real_stubs + $pseudo_stubs; - + $output->write("*.c: $module: "); $output->write("$stubs of $total functions are stubs ($real_stubs real, $pseudo_stubs pseudo)\n"); } - } + } } if($options->winetest) { @@ -448,9 +448,9 @@ if($options->winetest) { my $n = 0; foreach my $entry (@entries) { - my $external_name = $entry->{external_name}; - my $ordinal = $entry->{ordinal}; - my $function = $entry->{function}; + my $external_name = $entry->{external_name}; + my $ordinal = $entry->{ordinal}; + my $function = $entry->{function}; my $return_kind; my $calling_convention; diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup index 83c96c75da8..05a0bafa78e 100755 --- a/tools/winapi/winapi_fixup +++ b/tools/winapi/winapi_fixup @@ -27,7 +27,7 @@ BEGIN { use config qw( &file_type &files_filter &file_skip &files_skip - &file_normalize + &file_normalize &get_spec_files $current_dir $wine_dir $winapi_dir $winapi_check_dir ); @@ -68,9 +68,9 @@ foreach my $file (@c_files) { $_ = ; close(IN); } - + my $max_line = 0; - { + { local $_ = $_; while(s/^.*?\n//) { $max_line++; } if($_) { $max_line++; } @@ -115,7 +115,7 @@ foreach my $file (@c_files) { return 1; }; - $parser->set_found_preprocessor_callback($found_preprocessor); + $parser->set_found_preprocessor_callback($found_preprocessor); my $found_comment = sub { my $begin_line = shift; @@ -127,7 +127,7 @@ foreach my $file (@c_files) { return 1; }; - $parser->set_found_comment_callback($found_comment); + $parser->set_found_comment_callback($found_comment); my $found_line = sub { $line = shift; @@ -152,7 +152,7 @@ foreach my $file (@c_files) { return 1; }; - $parser->set_found_declaration_callback($found_declaration); + $parser->set_found_declaration_callback($found_declaration); my $found_function = sub { $function = shift; @@ -168,11 +168,11 @@ foreach my $file (@c_files) { if($options->documentation) { # fixup_documentation($function, $editor); } - + if($options->statements) { fixup_statements($function, $editor); } - + my $statements = $function->statements; if(!defined($statements)) { $function = undef; @@ -183,7 +183,7 @@ foreach my $file (@c_files) { return 0; }; - + $parser->set_found_function_callback($found_function); my $found_variable = sub { @@ -194,11 +194,11 @@ foreach my $file (@c_files) { my $name = shift; # $output->write("$begin_line.$begin_column: $linkage $type $name = /* ... */\n"); - + return 1; }; - $parser->set_found_variable_callback($found_variable); + $parser->set_found_variable_callback($found_variable); my $found_function_call = sub { my $begin_line = shift; @@ -227,4 +227,3 @@ foreach my $file (@c_files) { $editor->flush; } - diff --git a/tools/winapi/winapi_fixup_documentation.pm b/tools/winapi/winapi_fixup_documentation.pm index 91d7e73183a..c8ea86c40d4 100644 --- a/tools/winapi/winapi_fixup_documentation.pm +++ b/tools/winapi/winapi_fixup_documentation.pm @@ -48,14 +48,14 @@ sub fixup_documentation { my $calling_convention = $function->calling_convention; my $internal_name = $function->internal_name; my $statements = $function->statements; - + if($linkage eq "static" || ($linkage eq "extern" && !defined($statements)) || ($linkage eq "" && !defined($statements))) { return; } - + my @external_names = $function->external_names; if($#external_names < 0) { return; @@ -65,7 +65,7 @@ sub fixup_documentation { $documentation = undef; } $documentation_line_used{$file}{$documentation_line}++; - + my @module_ordinal_entries = (); foreach my $entry2 ($function->get_all_module_ordinal) { (my $external_name2, my $module2, my $ordinal2) = @$entry2; @@ -74,21 +74,21 @@ sub fixup_documentation { ($win32api->is_module($module2) && !$win32api->is_function_stub_in_module($module2, $external_name2))) && $modules->is_allowed_module_in_file($module2, "$current_dir/$file")) { - push @module_ordinal_entries, $entry2; + push @module_ordinal_entries, $entry2; } } - + my $spec_modified = 0; - + if($options->stub && defined($documentation)) { my $calling_convention16 = $function->calling_convention16; my $calling_convention32 = $function->calling_convention32; - + foreach my $winapi (@winapis) { my @entries = (); my $module = $winapi->function_internal_module($internal_name); my $ordinal = $winapi->function_internal_ordinal($internal_name); - + if($winapi->is_function_stub_in_module($module, $internal_name)) { my $external_name = $internal_name; if($winapi->name eq "win16") { @@ -99,14 +99,14 @@ sub fixup_documentation { } push @entries, [$external_name, $module, $ordinal]; } - + foreach (split(/\n/, $documentation)) { if(/^\s*\*\s*(\S+)\s*[\(\[]\s*(\w+)\s*\.\s*([^\s\)\]]*)\s*[\)\]].*?$/) { my $external_name = $1; my $module = lc($2); my $ordinal = $3; - - if($external_name ne "@" && + + if($external_name ne "@" && $winapi->is_module($module) && $winapi->is_function_stub_in_module($module, $external_name) && $internal_name !~ /^\U$module\E_\Q$external_name\E$/) @@ -115,16 +115,16 @@ sub fixup_documentation { } } } - + foreach my $entry (@entries) { (my $external_name, my $module, my $ordinal) = @$entry; - + my $refargument_types = $function->argument_types; - + if(!defined($refargument_types)) { next; } - + my $abort = 0; my $n; my @argument_kinds = map { @@ -133,7 +133,7 @@ sub fixup_documentation { if($type ne "..." && !defined($kind = $winapi->translate_argument($type))) { $output->write("no translation defined: " . $type . "\n"); } - + # FIXME: Kludge if(defined($kind) && $kind eq "longlong") { $n += 2; @@ -154,7 +154,7 @@ sub fixup_documentation { "undef"; } } @$refargument_types; - + my $search = "^\\s*$ordinal\\s+stub\\s+$external_name\\s*(?:#.*?)?\$"; my $replace; if($winapi->name eq "win16") { @@ -167,28 +167,28 @@ sub fixup_documentation { $spec_modified = 1; $editor->replace_spec_file($module, $search, $replace); } - } + } } } - + my %found_external_names; foreach my $external_name (@external_names) { $found_external_names{$external_name} = {}; } - + my $documentation_modified = 0; - + if(!$spec_modified && (defined($documentation) && !$documentation_modified) && - ($options->documentation_name || $options->documentation_ordinal || + ($options->documentation_name || $options->documentation_ordinal || $options->documentation_missing)) { local $_; - + my $line3; my $search; my $replace; - + my $count = 0; my $line2 = $documentation_line - 1; foreach (split(/\n/, $documentation)) { @@ -198,14 +198,14 @@ sub fixup_documentation { my $external_name = $2; my $part3 = $3; my $part4 = $4; - + $part4 =~ s/\s*$//; - + my @entries = (); while($part3 =~ s/^\s*([\(\[]\s*(\w+)(?:\s*\.\s*([^\s\)\]]*)\s*)?[\)\]])//) { push @entries, [$1, $2, $3]; } - + my $found = 0; foreach my $external_name2 (@external_names) { if($external_name eq $external_name2) { @@ -217,28 +217,28 @@ sub fixup_documentation { last; } } - + my $replaced = 0; my $replace2 = ""; foreach my $entry (@entries) { my $part12 = $part1; (my $part32, my $module, my $ordinal) = @$entry; - + foreach my $entry2 (@module_ordinal_entries) { (my $external_name2, my $module2, my $ordinal2) = @$entry2; - - if($options->documentation_name && lc($module) eq $module2 && - $external_name ne $external_name2) + + if($options->documentation_name && lc($module) eq $module2 && + $external_name ne $external_name2) { if(!$found && $part12 =~ s/\b\Q$external_name\E\b/$external_name2/) { $external_name = $external_name2; $replaced++; } } - + if($options->documentation_ordinal && $external_name eq $external_name2 && - lc($module) eq $module2 && + lc($module) eq $module2 && ($#entries > 0 || !defined($ordinal) || ($ordinal ne $ordinal2))) { if(defined($ordinal)) { @@ -255,7 +255,7 @@ sub fixup_documentation { if($replace2) { $replace2 .= "\n"; } $replace2 .= "$part12$part32$part4"; } - + if($replaced > 0) { $line3 = $line2; $search = "^\Q$_\E\$"; @@ -299,7 +299,7 @@ sub fixup_documentation { my $part3; my $part4; my $line3 = 0; - + my $line2 = $documentation_line - 1; foreach (split(/\n/, $documentation)) { $line2++; @@ -310,14 +310,14 @@ sub fixup_documentation { $part4 = $4; $part2 =~ s/\S/ /g; - + $line3 = $line2 + 1; } } foreach my $entry2 (@module_ordinal_entries) { (my $external_name2, my $module2, my $ordinal2) = @$entry2; - + my $found = 0; foreach my $external_name (keys(%found_external_names)) { foreach my $module3 (keys(%{$found_external_names{$external_name}})) { @@ -327,9 +327,9 @@ sub fixup_documentation { } } # FIXME: Not 100% correct - if(!$found && - !$win16api->is_function_stub_in_module($module2, $internal_name) && - !$win32api->is_function_stub_in_module($module2, $internal_name)) + if(!$found && + !$win16api->is_function_stub_in_module($module2, $internal_name) && + !$win32api->is_function_stub_in_module($module2, $internal_name)) { if($line3 > 0) { $documentation_modified = 1; @@ -342,7 +342,7 @@ sub fixup_documentation { } } - if(!$documentation_modified && + if(!$documentation_modified && defined($documentation) && $options->documentation_wrong) { @@ -353,14 +353,14 @@ sub fixup_documentation { my $external_name = $1; my $module = $2; my $ordinal = $3; - + my $found = 0; foreach my $entry2 (@module_ordinal_entries) { (my $external_name2, my $module2, my $ordinal2) = @$entry2; - + if($external_name eq $external_name2 && lc($module) eq $module2 && - $ordinal eq $ordinal2) + $ordinal eq $ordinal2) { $found = 1; } diff --git a/tools/winapi/winapi_fixup_editor.pm b/tools/winapi/winapi_fixup_editor.pm index 6a09d903a39..3700f7dc60e 100644 --- a/tools/winapi/winapi_fixup_editor.pm +++ b/tools/winapi/winapi_fixup_editor.pm @@ -64,7 +64,7 @@ sub replace { my $replace = shift; my $file = \${$self->{FILE}}; - + my $line = $begin_line; my $action = {}; @@ -225,7 +225,7 @@ sub flush_old { my $search = $substitute_line{$.}{search}; my $replace = $substitute_line{$.}{replace}; - + if(defined($search) && defined($replace)) { my $modified2 = 0; if(s/$search/$replace/) { @@ -239,14 +239,14 @@ sub flush_old { my $search2; my $replace2; if(!$modified2) { - $search2 = "unmatched search"; - $replace2 = "unmatched replace"; + $search2 = "unmatched search"; + $replace2 = "unmatched replace"; } else { - $search2 = "search"; + $search2 = "search"; $replace2 = "replace"; } $output->write("$file: $.: $search2 : '$search'\n"); - + my @replace2 = split(/\n/, $replace); if($#replace2 > 0) { $output->write("$file: $.: $replace2: \\\n"); @@ -288,7 +288,7 @@ sub flush_old { } foreach my $module (sort(keys(%spec_file))) { - my $file; + my $file; foreach my $winapi (@winapis) { $file = ($winapi->module_file($module) || $file); } @@ -302,7 +302,7 @@ sub flush_old { my $editor = sub { local *IN = shift; local *OUT = shift; - + my $modified = 0; while() { chomp; @@ -328,7 +328,7 @@ sub flush_old { print OUT "$_\n"; } - + return $modified; }; @@ -362,7 +362,7 @@ sub delete_line { my $line = shift; my $pattern = shift; - + $delete_line{$line} = $pattern; } @@ -371,7 +371,7 @@ sub insert_line { my $line = shift; my $insert = shift; - + $insert_line{$line} = $insert; } @@ -381,7 +381,7 @@ sub substitute_line { my $line = shift; my $search = shift; my $replace = shift; - + $substitute_line{$line}{search} = $search; $substitute_line{$line}{replace} = $replace; } @@ -392,15 +392,15 @@ sub replace_spec_file { my $module = shift; my $search = shift; my $replace = shift; - + my $substitute = {}; $substitute->{search} = $search; $substitute->{replace} = $replace; - + if(!defined($spec_file{$module})) { $spec_file{$module} = []; } - + push @{$spec_file{$module}}, $substitute; } diff --git a/tools/winapi/winapi_fixup_options.pm b/tools/winapi/winapi_fixup_options.pm index 94be80c29bd..fe496b42702 100644 --- a/tools/winapi/winapi_fixup_options.pm +++ b/tools/winapi/winapi_fixup_options.pm @@ -52,7 +52,7 @@ my %options_long = ( "global" => { default => 1, description => "global fixup" }, - "modify" => { default => 0, description => "actually perform the fixups" }, + "modify" => { default => 0, description => "actually perform the fixups" }, ); my %options_short = ( diff --git a/tools/winapi/winapi_fixup_statements.pm b/tools/winapi/winapi_fixup_statements.pm index fb7c3ecea27..80185dc8f00 100644 --- a/tools/winapi/winapi_fixup_statements.pm +++ b/tools/winapi/winapi_fixup_statements.pm @@ -67,7 +67,7 @@ sub _parse_makelong { my $line = 1; my $column = 0; if($parser->parse_c_function_call(\$_, \$line, \$column, \$name, \@arguments, \@argument_lines, \@argument_columns) && - $name =~ /^MAKE(?:LONG|LPARAM|LRESULT|WPARAM)$/) + $name =~ /^MAKE(?:LONG|LPARAM|LRESULT|WPARAM)$/) { $low = $arguments[0]; $high = $arguments[1]; @@ -95,7 +95,7 @@ sub fixup_user_message_2_windowsx { if($msg !~ /^WM_/) { return undef; } elsif($msg =~ /^(?:WM_BEGINDRAG|WM_ENTERMENULOOP|WM_EXITMENULOOP|WM_HELP| - WM_ISACTIVEICON|WM_LBTRACKPOINT|WM_NEXTMENU)$/x) + WM_ISACTIVEICON|WM_LBTRACKPOINT|WM_NEXTMENU)$/x) { return undef; } elsif($msg =~ /^WM_(?:GET|SET)TEXT$/) { @@ -284,13 +284,13 @@ sub fixup_statements { my $statements_line = $function->statements_line; my $statements_column = $function->statements_column; my $statements = $function->statements; - + if(!defined($statements)) { return; } my $parser = new c_parser($file); - + my $found_function_call = sub { my $begin_line = shift; my $begin_column = shift; @@ -298,7 +298,7 @@ sub fixup_statements { my $end_column = shift; my $name = shift; my $arguments = shift; - + foreach my $argument (@$arguments) { $argument =~ s/^\s*(.*?)\s*$/$1/; } @@ -311,7 +311,7 @@ sub fixup_statements { } else { $fixup_function_call = \&_fixup_user_message; } - } + } if(defined($fixup_function_call)) { my $replace = &$fixup_function_call($name, $arguments); @@ -326,11 +326,11 @@ sub fixup_statements { return 0; }; - + $parser->set_found_function_call_callback($found_function_call); - + my $line = $statements_line; - my $column = 0; + my $column = 0; if(!$parser->parse_c_statements(\$statements, \$line, \$column)) { $output->write("error: can't parse statements\n"); } diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index e2df1fa616b..7c54bf7c2be 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -110,9 +110,9 @@ $message = { id => 0x0301, result => "void", wparam => "void", lparam => "void" }, WM_COPYDATA => { id => 0x004a, result => "", wparam => "", lparam => "" }, - WM_COMPACTING => { + WM_COMPACTING => { id => 0x0041, result => "void", wparam => "UINT", lparam => "void" }, - WM_COMPAREITEM => { + WM_COMPAREITEM => { id => 0x0039, result => "int", wparam => "UINT", lparam => "const COMPAREITEMSTRUCT *" }, WM_CREATE => { id => 0x0001, result => "BOOL", wparam => "void", lparam => "LPCREATESTRUCT" }, @@ -143,7 +143,7 @@ $message = { id => 0x0103, result => "void", wparam => "TCHAR", lparam => ["", ""] }, WM_DEVICECHANGE => { id => 0x0219, result => "BOOL", wparam => "UINT", lparam => "DWORD" }, - WM_DELETEITEM => { + WM_DELETEITEM => { id => 0x002d, result => "void", wparam => "UINT", lparam => "const DELETEITEMSTRUCT *" }, WM_DEVMODECHANGE => { id => 0x001b, result => "void", wparam => "void", lparam => "LPCTSTR" }, @@ -551,7 +551,7 @@ $message = { id => 0x0046, result => "BOOL", wparam => "void", lparam => "LPWINDOWPOS" }, WM_WINDOWPOSCHANGED => { id => 0x0047, result => "void", wparam => "void", lparam => "const LPWINDOWPOS" }, - WM_WININICHANGE => { + WM_WININICHANGE => { id => 0x001a, result => "void", wparam => "void", lparam => "LPCTSTR" } }; @@ -699,7 +699,7 @@ sub _parse_windowsx_h { if(!s/^\#\s*define\s*// || !/^FORWARD_WM_/) { return 1; } - + my $name; if(s/^FORWARD_(\w+)\([^\)]*\)\s*(.*?)\s*$/$2/s) { $name = $1; @@ -749,7 +749,7 @@ sub _parse_windowsx_h { die "$name: '$_'"; } } - # $output->write("$1: $_\n"); + # $output->write("$1: $_\n"); } else { die "$name: '$_'"; } @@ -763,7 +763,7 @@ sub _parse_windowsx_h { return ""; } } - + }; my @entries = ( @@ -813,7 +813,7 @@ sub _parse_windowsx_h { } else { die "$name: '$_'"; } - } + } # $output->write("$result: '@names', '$wparam', '$lparam'\n"); @@ -878,7 +878,7 @@ sub _parse_winuser_h { if(/^\#\s*define\s+(WM_\w+)\s+(0x[0-9a-fA-F]+)\s*$/) { my $name = $1; my $id = lc($2); - + if(exists($$message{$name})) { my $id2 = sprintf("0x%04x", $$message{$name}{id}); if($id ne $id2) { diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm index 9a2790eb989..42c02cf4f26 100644 --- a/tools/winapi_check/modules.pm +++ b/tools/winapi_check/modules.pm @@ -32,7 +32,7 @@ use vars qw($modules); use config qw( &file_type &files_skip &file_directory - &get_c_files &get_spec_files + &get_c_files &get_spec_files $current_dir $wine_dir $winapi_check_dir ); @@ -106,7 +106,7 @@ sub new { if(!-f "$wine_dir/$spec_file") { $output->write("modules.dat: $spec_file: file ($spec_file) doesn't exist or is no file\n"); - } + } $spec_file_found{$spec_file}++; $$spec_file2dir{$spec_file} = {}; @@ -119,7 +119,7 @@ sub new { if(!-d "$wine_dir/$allowed_dir") { $output->write("modules.dat: $spec_file: directory ($allowed_dir) doesn't exist or is no directory\n"); - } + } } close(IN); @@ -202,7 +202,7 @@ sub complete_modules { my $index = -1; my @dirs = $self->allowed_dirs_for_module($module); foreach my $dir (@dirs) { - if(exists($dirs{$dir}) && $dirs{$dir} == 0) { + if(exists($dirs{$dir}) && $dirs{$dir} == 0) { $index++; } } @@ -277,7 +277,7 @@ sub allowed_dirs_for_module { my $self = shift; my $module2spec_file = \%{$self->{MODULE2SPEC_FILE}}; - my $spec_file2dir = \%{$self->{SPEC_FILE2DIR}}; + my $spec_file2dir = \%{$self->{SPEC_FILE2DIR}}; my $module = shift; diff --git a/tools/winapi_check/nativeapi.pm b/tools/winapi_check/nativeapi.pm index 482f0fc8870..621604dc86f 100644 --- a/tools/winapi_check/nativeapi.pm +++ b/tools/winapi_check/nativeapi.pm @@ -61,7 +61,7 @@ sub new { while() { s/^\s*(.*?)\s*$/$1/; # remove whitespace at begin and end of line s/^(.*?)\s*#.*$/$1/; # remove comments - /^$/ && next; # skip empty lines + /^$/ && next; # skip empty lines $$functions{$_}++; } @@ -70,7 +70,7 @@ sub new { $output->progress("$configure_ac_file"); my $again = 0; - open(IN, "< $configure_ac_file"); + open(IN, "< $configure_ac_file"); local $/ = "\n"; while($again || (defined($_ = ))) { $again = 0; diff --git a/tools/winapi_check/preprocessor.pm b/tools/winapi_check/preprocessor.pm index a3086a95d35..6689214d521 100644 --- a/tools/winapi_check/preprocessor.pm +++ b/tools/winapi_check/preprocessor.pm @@ -30,7 +30,7 @@ sub new { my $stack = \@{$self->{STACK}}; my $include_found = \${$self->{INCLUDE_FOUND}}; my $conditional_found = \${$self->{CONDITIONAL_FOUND}}; - + $$include_found = shift; $$conditional_found = shift; @@ -162,7 +162,7 @@ sub is_def { my $state = \%{$self->{STATE}}; my $name = shift; - + my $status = $$state{$name}; return defined($status) && $status eq "def"; @@ -173,7 +173,7 @@ sub is_undef { my $state = \%{$self->{STATE}}; my $name = shift; - + my $status = $$state{$name}; return defined($status) && $status eq "undef"; @@ -184,7 +184,7 @@ sub is_unknown { my $state = \%{$self->{STATE}}; my $name = shift; - + my $status = $$state{$name}; return !defined($status); diff --git a/tools/winapi_check/winapi.pm b/tools/winapi_check/winapi.pm index 207b5b7c2d4..32093443ff1 100644 --- a/tools/winapi_check/winapi.pm +++ b/tools/winapi_check/winapi.pm @@ -83,8 +83,8 @@ sub new { if($modules->is_allowed_module($module)) { $self->parse_api_file($file,$module); } - } - + } + foreach my $forward_name (sort(keys(%$function_forward))) { $$function_forward{$forward_name} =~ /^(\S*):(\S*)\.(\S*)$/; (my $from_module, my $to_module, my $external_name) = ($1, $2, $3); @@ -197,7 +197,7 @@ sub parse_api_file { } else { $$translate_argument{$type} = $kind; } - + $$type_format{$module}{$type} = $format; } else { $output->write("$file: file must begin with % statement\n"); @@ -251,7 +251,7 @@ sub parse_spec_file { if(/^type\s*(\w+)/) { $type = $1; } if(/^\d+|@/) { $header = 0; $lookahead = 1; } next; - } + } my $ordinal; if(/^(\d+|@)\s+ @@ -405,7 +405,7 @@ sub parse_spec_file { $lookahead = 1; } } - + if(defined($ordinal)) { if($ordinal ne "@" && $ordinals{$ordinal}) { $output->write("$file: ordinal redefined: $_\n"); @@ -580,11 +580,11 @@ sub is_allowed_type_format { if(defined($module) && defined($type)) { local $_; foreach (split(/ & /, $module)) { - if(defined($formats)) { - $formats .= "|"; + if(defined($formats)) { + $formats .= "|"; } else { $formats = ""; - } + } if(defined($$type_format{$_}{$type})) { $formats .= $$type_format{$_}{$type}; } @@ -885,7 +885,7 @@ sub _get_all_module_internal_ordinal { my $ordinal; while(defined($name = shift @name) && defined($module = shift @module) && - defined($ordinal = shift @ordinal)) + defined($ordinal = shift @ordinal)) { push @entries, [$name, $module, $ordinal]; } @@ -936,17 +936,17 @@ sub _get_all_module_external_ordinal { @ordinal = split(/ & /, $ordinal); } } - + my $name; my $module; my $ordinal; while(defined($name = shift @name) && defined($module = shift @module) && - defined($ordinal = shift @ordinal)) + defined($ordinal = shift @ordinal)) { push @entries, [$name, $module, $ordinal]; } - + return @entries; } diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check index 154e2d4b872..3ec273dd530 100755 --- a/tools/winapi_check/winapi_check +++ b/tools/winapi_check/winapi_check @@ -20,7 +20,7 @@ # Note that winapi_check are using heuristics quite heavily. # So always remember that: # -# "Heuristics are bug ridden by definition. +# "Heuristics are bug ridden by definition. # If they didn't have bugs, then they'd be algorithms." # # In other words, reported bugs are only potential bugs not @@ -64,11 +64,11 @@ use winapi_parser; my %declared_functions; my %include2info; -{ +{ my @files = get_h_files("winelib"); my $progress_current = 0; - my $progress_max = scalar(@files); + my $progress_max = scalar(@files); foreach my $file (@files) { $progress_current++; @@ -107,7 +107,7 @@ my %include2info; "storage.h", "ver.h"); foreach my $file2 (@files2) { $include2info{"include/$file2"}{used}++; - } + } } my @c_files = $options->c_files; @@ -122,7 +122,7 @@ my $all_modules = 0; my %complete_module; if($options->global) { my @complete_modules = $modules->complete_modules(\@c_files); - + foreach my $module (@complete_modules) { $complete_module{$module}++; } @@ -146,7 +146,7 @@ if($options->headers) { foreach my $file (@h_files) { my %functions; - + $progress_current++; $output->progress("$file: file $progress_current of $progress_max"); @@ -163,11 +163,11 @@ if($options->headers) { } } }; - + my $found_cplusplus_comment = sub { my $line = shift; my $comment = shift; - + if($options->comments_cplusplus) { $output->write("$file:$line: C++ comments not allowed: $comment\n"); } @@ -199,7 +199,7 @@ if($options->headers) { } if(defined($external_name) && !defined($statements) && - ($linkage eq "" || $linkage eq "extern")) + ($linkage eq "" || $linkage eq "extern")) { my $previous_function = $declared_functions{$internal_name}; if(!defined($previous_function)) { @@ -231,10 +231,10 @@ if($options->headers) { &winapi_parser::parse_c_file($file, { c_comment_found => $found_c_comment, cplusplus_comment_found => $found_cplusplus_comment, - function_create => $create_function, - function_found => $found_function, - type_create => $create_type, - type_found => $found_type, + function_create => $create_function, + function_found => $found_function, + type_create => $create_type, + type_found => $found_type, preprocessor_found => $found_preprocessor }); } @@ -273,12 +273,12 @@ foreach my $file (@c_files) { } } }; - + my $found_cplusplus_comment = sub { my $line = shift; my $comment = shift; - if($options->comments_cplusplus) { + if($options->comments_cplusplus) { $output->write("$file:$line: C++ comments not allowed: $comment\n"); } }; @@ -286,7 +286,7 @@ foreach my $file (@c_files) { my $create_function = sub { return 'winapi_function'->new; }; - + my $found_function = sub { my $function = shift; @@ -312,8 +312,8 @@ foreach my $file (@c_files) { my $external_name16 = $function->external_name16; my $external_name32 = $function->external_name32; - if(defined($external_name) && !defined($statements) && - ($linkage eq "" || $linkage eq "extern")) + if(defined($external_name) && !defined($statements) && + ($linkage eq "" || $linkage eq "extern")) { my $previous_function = $declared_functions{$internal_name}; if(!defined($previous_function)) { @@ -350,15 +350,15 @@ foreach my $file (@c_files) { } if($options->shared) { - if($win16api->is_shared_internal_function($internal_name) || - $win32api->is_shared_internal_function($internal_name)) + if($win16api->is_shared_internal_function($internal_name) || + $win32api->is_shared_internal_function($internal_name)) { $output->write("is shared between Win16 and Win32\n"); } } - if($options->headers && $options->headers_needed && - defined($declared_function) && defined($external_name) && + if($options->headers && $options->headers_needed && + defined($declared_function) && defined($external_name) && defined($statements)) { my $needed_include = $declared_function->file; @@ -375,11 +375,11 @@ foreach my $file (@c_files) { if($options->local && $options->argument && defined($statements)) { &winapi_local::check_function($function); } - + if($options->local && $options->statements && defined($statements)) { &winapi_local::check_statements(\%functions, $function); } - + if($options->local && $options->documentation && (defined($module16) || defined($module32)) && $linkage eq "" && defined($statements)) @@ -392,14 +392,14 @@ foreach my $file (@c_files) { if(defined($external_name16)) { $external_name16 = (split(/\s*&\s*/, $external_name16))[0]; } - + # FIXME: Not correct if(defined($external_name32)) { $external_name32 = (split(/\s*&\s*/, $external_name32))[0]; } if($options->local && $options->misplaced && - $linkage ne "extern" && defined($statements)) + $linkage ne "extern" && defined($statements)) { if($options->win16 && $options->report_module($module16)) { @@ -432,7 +432,7 @@ foreach my $file (@c_files) { if($options->local && $options->headers && $options->prototype) { if($options->win16 && $options->report_module($module16)) { - if(!$nativeapi->is_function($internal_name) && + if(!$nativeapi->is_function($internal_name) && !defined($declared_functions{$internal_name})) { $output->write("no prototype\n"); @@ -444,7 +444,7 @@ foreach my $file (@c_files) { { if(!defined($external_name32) || ($external_name32 !~ /^Dll(?: Install|CanUnloadNow|GetClassObject|GetVersion| - RegisterServer|RegisterServerEx|UnregisterServer)|DriverProc$/x && + RegisterServer|RegisterServerEx|UnregisterServer)|DriverProc$/x && $internal_name !~ /^COMCTL32_Str/ && $internal_name !~ /^(?:\Q$module32\E|wine)_(?:\Q$external_name32\E|\d+)$/)) { @@ -489,7 +489,7 @@ foreach my $file (@c_files) { my $create_type = sub { return 'type'->new; }; - + my $found_type = sub { my $type = shift; }; @@ -558,17 +558,17 @@ foreach my $file (@c_files) { my $macro = uc($header); $macro =~ y/\.\//__/; $macro = "HAVE_" . $macro; - - if($nativeapi->is_conditional_header($header)) { + + if($nativeapi->is_conditional_header($header)) { if(!$preprocessor->is_def($macro)) { if($macro =~ /^HAVE_X11/) { # Do nothing X Windows is handled differently } elsif($macro =~ /^HAVE_(.*?)_H$/) { my $name = $1; - if($header !~ /^alloca\.h|sys\/time\.h|unistd\.h$/ && - !$preprocessor->is_def("STATFS_DEFINED_BY_$name")) + if($header !~ /^alloca\.h|sys\/time\.h|unistd\.h$/ && + !$preprocessor->is_def("STATFS_DEFINED_BY_$name")) { - $output->write("$file: #$directive $argument: is a conditional include, " . + $output->write("$file: #$directive $argument: is a conditional include, " . "but is not protected\n"); } } @@ -625,10 +625,10 @@ foreach my $file (@c_files) { &winapi_parser::parse_c_file($file, { c_comment_found => $found_c_comment, cplusplus_comment_found => $found_cplusplus_comment, - function_create => $create_function, - function_found => $found_function, - type_create => $create_type, - type_found => $found_type, + function_create => $create_function, + function_found => $found_function, + type_create => $create_type, + type_found => $found_type, preprocessor_found => $found_preprocessor }); @@ -678,7 +678,7 @@ if($options->global) { if($all_modules) { &winapi_documentation::report_documentation; - + if($options->headers_unused) { foreach my $name (sort(keys(%include2info))) { if(!$include2info{$name}{used}) { @@ -688,11 +688,10 @@ if($options->global) { } } } - + &winapi_global::check(\%type_found); $modules->global_report; $nativeapi->global_report; } } - diff --git a/tools/winapi_check/winapi_documentation.pm b/tools/winapi_check/winapi_documentation.pm index 13b94b2d1a1..837ff9fd08b 100644 --- a/tools/winapi_check/winapi_documentation.pm +++ b/tools/winapi_check/winapi_documentation.pm @@ -49,9 +49,9 @@ sub check_documentation { my $documentation_error = 0; my $documentation_warning = 0; - if($options->documentation_name || + if($options->documentation_name || $options->documentation_ordinal || - $options->documentation_pedantic) + $options->documentation_pedantic) { my @winapis = ($win16api, $win32api); my @modules = ($module16, $module32); @@ -70,9 +70,9 @@ sub check_documentation { my @ordinals = split(/\s*\&\s*/, $ordinal); my $pedantic_failed = 0; - while(defined(my $external_name = shift @external_name) && - defined(my $module = shift @modules) && - defined(my $ordinal = shift @ordinals)) + while(defined(my $external_name = shift @external_name) && + defined(my $module = shift @modules) && + defined(my $ordinal = shift @ordinals)) { my $found_name = 0; my $found_ordinal = 0; @@ -82,7 +82,7 @@ sub check_documentation { my $module2 = $6; my $ordinal2 = $7; - if(length($1) != 1 || length($2) < 1 || + if(length($1) != 1 || length($2) < 1 || length($4) < 1 || $5 ne "(" || $8 ne ")") { $pedantic_failed = 1; @@ -98,13 +98,13 @@ sub check_documentation { } } } - if(($options->documentation_name && !$found_name) || + if(($options->documentation_name && !$found_name) || ($options->documentation_ordinal && !$found_ordinal)) { $documentation_error = 1; $output->write("documentation: expected $external_name (\U$module\E.$ordinal): \\\n$documentation\n"); } - + } if($options->documentation_pedantic && $pedantic_failed) { $documentation_warning = 1; @@ -147,13 +147,13 @@ sub check_documentation { if(/^\s*\*(\s*)\S+(\s*)[\(\[]\s*\w+\s*\.\s*[^\s\)\]]*\s*[\)\]].*?$/) { my $indent = $1; my $spacing = $2; - + $indent =~ s/\t/ /g; $indent = length($indent); - + $spacing =~ s/\t/ /g; $spacing = length($spacing); - + $comment_indent{$indent}++; if($indent >= 20) { $output->write("documentation: comment indent is $indent\n"); diff --git a/tools/winapi_check/winapi_function.pm b/tools/winapi_check/winapi_function.pm index f0208064f5b..96da183e3ce 100644 --- a/tools/winapi_check/winapi_function.pm +++ b/tools/winapi_check/winapi_function.pm @@ -66,7 +66,7 @@ sub _external_name { my @external_names = split(/\s*&\s*/, $external_name); my @modules = split(/\s*&\s*/, $module); - + my @external_names2; while(defined(my $external_name = shift @external_names) && defined(my $module = shift @modules)) @@ -84,7 +84,7 @@ sub _external_names { my $winapi = shift; my $external_name = $self->_external_name($winapi); - + if(defined($external_name)) { return split(/\s*&\s*/, $external_name); } else { @@ -92,7 +92,7 @@ sub _external_names { } } -sub external_name { +sub external_name { my $self = shift; foreach my $winapi (@winapis) { @@ -145,7 +145,7 @@ sub _modules { my $winapi = shift; my $module = $self->_module($winapi); - + if(defined($module)) { return split(/\s*&\s*/, $module); } else { @@ -183,7 +183,7 @@ sub _ordinal { my @ordinals = split(/\s*&\s*/, $ordinal); my @modules = split(/\s*&\s*/, $module); - + my @ordinals2; while(defined(my $ordinal = shift @ordinals) && defined(my $module = shift @modules)) @@ -201,7 +201,7 @@ sub _ordinals { my $winapi = shift; my $ordinal = $self->_ordinal($winapi); - + if(defined($ordinal)) { return split(/\s*&\s*/, $ordinal); } else { @@ -359,7 +359,7 @@ sub return_kind32 { my $self = shift; return $self->_return_kind($win32api, @_); } -sub _argument_kinds { +sub _argument_kinds { my $self = shift; my $winapi = shift; my $refargument_types = $self->argument_types; @@ -394,7 +394,7 @@ sub argument_kinds32 { # Accounting # -sub function_called { +sub function_called { my $self = shift; my $called_function_names = \%{$self->{CALLED_FUNCTION_NAMES}}; @@ -403,7 +403,7 @@ sub function_called { $$called_function_names{$name}++; } -sub function_called_by { +sub function_called_by { my $self = shift; my $called_by_function_names = \%{$self->{CALLED_BY_FUNCTION_NAMES}}; @@ -412,14 +412,14 @@ sub function_called_by { $$called_by_function_names{$name}++; } -sub called_function_names { +sub called_function_names { my $self = shift; my $called_function_names = \%{$self->{CALLED_FUNCTION_NAMES}}; return sort(keys(%$called_function_names)); } -sub called_by_function_names { +sub called_by_function_names { my $self = shift; my $called_by_function_names = \%{$self->{CALLED_BY_FUNCTION_NAMES}}; diff --git a/tools/winapi_check/winapi_local.pm b/tools/winapi_check/winapi_local.pm index 3429fc8e5ac..b5cd44c665b 100644 --- a/tools/winapi_check/winapi_local.pm +++ b/tools/winapi_check/winapi_local.pm @@ -44,15 +44,15 @@ sub check_function { } if($options->win16 && $options->report_module($module16)) { - _check_function($return_type, - $calling_convention, $external_name16, + _check_function($return_type, + $calling_convention, $external_name16, $internal_name, $refargument_types, $win16api); } if($options->win32 && $options->report_module($module32)) { - _check_function($return_type, - $calling_convention, $external_name32, + _check_function($return_type, + $calling_convention, $external_name32, $internal_name, $refargument_types, $win32api); } @@ -68,7 +68,7 @@ sub _check_function { my $winapi = shift; my $module = $winapi->function_internal_module($internal_name); - + if($winapi->name eq "win16") { if($winapi->is_function_stub_in_module($module, $internal_name)) { if($options->implemented) { @@ -97,7 +97,7 @@ sub _check_function { $output->write("no translation defined: " . $return_type . "\n"); } } elsif(!$winapi->is_allowed_kind($implemented_return_kind) || - !$winapi->is_allowed_type_in_module($return_type, $module)) + !$winapi->is_allowed_type_in_module($return_type, $module)) { $forbidden_return_type = 1; $winapi->allow_kind($implemented_return_kind); @@ -106,7 +106,7 @@ sub _check_function { $output->write("return type is forbidden: $return_type ($implemented_return_kind)\n"); } } - + my $segmented = 0; if(defined($implemented_return_kind) && $implemented_return_kind =~ /^segptr|segstr$/) { $segmented = 1; @@ -183,7 +183,7 @@ sub _check_function { { $#argument_types--; } - + if($internal_name =~ /^NTDLL__ftol|NTDLL__CIpow$/) { # FIXME: Kludge # ignore } else { @@ -198,7 +198,7 @@ sub _check_function { $winapi->declare_argument($type, "unknown"); $output->write("no translation defined: " . $type . "\n"); } elsif(!$winapi->is_allowed_kind($kind) || - !$winapi->is_allowed_type_in_module($type, $module)) + !$winapi->is_allowed_type_in_module($type, $module)) { $winapi->allow_kind($kind); $winapi->allow_type_in_module($type, $module); @@ -234,7 +234,7 @@ sub _check_function { if($argument_kinds[$n] eq "context86") { # Nothing } elsif(!$winapi->is_allowed_kind($argument_kinds[$n]) || - !$winapi->is_allowed_type_in_module($argument_types[$n], $module)) + !$winapi->is_allowed_type_in_module($argument_types[$n], $module)) { $winapi->allow_kind($argument_kinds[$n]); $winapi->allow_type_in_module($argument_types[$n],, $module); @@ -247,7 +247,7 @@ sub _check_function { $options->report_argument_kind($declared_argument_kinds[$n])) { $output->write("argument " . ($n + 1) . " type mismatch: " . - $argument_types[$n] . " ($argument_kinds[$n]) != " . + $argument_types[$n] . " ($argument_kinds[$n]) != " . $declared_argument_kinds[$n] . "\n"); } } @@ -257,8 +257,8 @@ sub _check_function { $implemented_calling_convention ne "asm") { if($options->argument_count) { - $output->write("argument count differs: " . - ($#argument_types + 1) . " != " . + $output->write("argument count differs: " . + ($#argument_types + 1) . " != " . ($#declared_argument_kinds + 1) . "\n"); } } @@ -310,7 +310,7 @@ sub _check_statements { my $formating = $1; my $extra = $2; my $arguments = $3; - + my $format; my $argument; my $n = 0; @@ -323,7 +323,7 @@ sub _check_statements { $n++; if(!defined($type)) { last; } - + $format =~ s/^\w+\s*[:=]?\s*//; $format =~ s/\s*\{[^\{\}]*\}$//; $format =~ s/\s*\[[^\[\]]*\]$//; @@ -340,7 +340,7 @@ sub _check_statements { } if($options->debug_messages) { - my $count = $#{$function->argument_types} + 1; + my $count = $#{$function->argument_types} + 1; if($n != $count) { $output->write("$called_name: argument count mismatch ($n != $count)\n"); } @@ -375,13 +375,13 @@ sub check_file { my $module16 = $$functions{$name}->module16; my $module32 = $$functions{$name}->module32; - if($#called_names >= 0 && (defined($module16) || defined($module32)) ) { + if($#called_names >= 0 && (defined($module16) || defined($module32)) ) { for my $called_name (@called_names) { my $called_module16 = $$functions{$called_name}->module16; my $called_module32 = $$functions{$called_name}->module32; if(defined($module32) && defined($called_module16) && !defined($called_module32) && - $name ne $called_name) + $name ne $called_name) { $output->write("$file: $module: $name: illegal call to $called_name (Win32 -> Win16)\n"); } @@ -403,4 +403,3 @@ sub check_file { } 1; - diff --git a/tools/winapi_check/winapi_parser.pm b/tools/winapi_check/winapi_parser.pm index 617e3a8adf7..ec746604b30 100644 --- a/tools/winapi_check/winapi_parser.pm +++ b/tools/winapi_check/winapi_parser.pm @@ -56,7 +56,7 @@ sub parse_c_file { my $argument_documentations; my $statements_line; my $statements; - + $function_begin = sub { $documentation_line = shift; $documentation = shift; @@ -68,7 +68,7 @@ sub parse_c_file { $argument_types = shift; $argument_names = shift; $argument_documentations = shift; - + if(defined($argument_names) && defined($argument_types) && $#$argument_names == -1) { @@ -76,7 +76,7 @@ sub parse_c_file { push @$argument_names, ""; } } - + if(defined($argument_documentations) && $#$argument_documentations == -1) { @@ -84,7 +84,7 @@ sub parse_c_file { push @$argument_documentations, ""; } } - + $in_function = 1; }; @@ -93,18 +93,18 @@ sub parse_c_file { $statements = shift; my $function = &$function_create_callback(); - + if(!defined($documentation_line)) { $documentation_line = 0; } - + $function->file($file); $function->debug_channels([@$debug_channels]); $function->documentation_line($documentation_line); $function->documentation($documentation); $function->function_line($function_line); $function->linkage($linkage); - $function->return_type($return_type); + $function->return_type($return_type); $function->calling_convention($calling_convention); $function->internal_name($internal_name); if(defined($argument_types)) { @@ -118,7 +118,7 @@ sub parse_c_file { } $function->statements_line($statements_line); $function->statements($statements); - + &$function_found_callback($function); $in_function = 0; @@ -189,13 +189,13 @@ sub parse_c_file { $output->write("$file: merge conflicts in file\n"); last; } - + # remove C comments if(s/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)(?=\/\*)//s) { my $prefix = $1; if(s/^(\/\*.*?\*\/)//s) { my @lines = split(/\n/, $1); - push @comment_lines, $.; + push @comment_lines, $.; push @comments, $1; &$c_comment_found_callback($. - $#lines, $., $1); if($#lines <= 0) { @@ -203,7 +203,7 @@ sub parse_c_file { } else { $_ = $prefix . ("\n" x $#lines) . $_; } - $again = 1; + $again = 1; } else { $_ = "$prefix$_"; $lookahead = 1; @@ -214,7 +214,7 @@ sub parse_c_file { # remove C++ comments while(s/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)(\/\/.*?)$/$1/s) { &$cplusplus_comment_found_callback($., $2); - $again = 1; + $again = 1; } if($again) { next; } @@ -239,10 +239,10 @@ sub parse_c_file { } # Remove extern "C" - if(s/^\s*extern\s+"C"\s+\{//m) { + if(s/^\s*extern\s+"C"\s+\{//m) { $extern_c = 1; $again = 1; - next; + next; } my $documentation_line; @@ -251,7 +251,7 @@ sub parse_c_file { { my $n = $#comments; while($n >= 0 && ($comments[$n] !~ /^\/\*\*/ || - $comments[$n] =~ /^\/\*\*+\/$/)) + $comments[$n] =~ /^\/\*\*+\/$/)) { $n--; } @@ -328,7 +328,7 @@ sub parse_c_file { } elsif(s/^\}//) { $_ = $'; $again = 1; $line .= "}" if $level > 1; - print "-1: \}$_\n" if $options->debug >= 2; + print "-1: \}$_\n" if $options->debug >= 2; $level--; if($level == -1 && $extern_c) { $extern_c = 0; @@ -390,7 +390,7 @@ sub parse_c_file { if($regs_entrypoints{$name}) { $name = $regs_entrypoints{$name}; - } + } $arguments =~ y/\t\n/ /; $arguments =~ s/^\s*(.*?)\s*$/$1/; @@ -435,7 +435,7 @@ sub parse_c_file { } if($#argument_types == 0 && $argument_types[0] =~ /^void$/i) { $#argument_types = -1; - $#argument_names = -1; + $#argument_names = -1; } if($options->debug) { @@ -484,7 +484,7 @@ sub parse_c_file { $function_line, "", "UINT16", "WINAPI", "waveOut" . $1 . "16", \@arguments16); &$function_end($., ""); &$function_begin($documentation_line, $documentation, - $function_line, "", "UINT", "WINAPI", "waveOut" . $1, \@arguments32); + $function_line, "", "UINT", "WINAPI", "waveOut" . $1, \@arguments32); &$function_end($., ""); } elsif(/WAVEOUT_SHORTCUT_(1|2)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*\)/s) { my @lines = split(/\n/, $&); @@ -507,7 +507,7 @@ sub parse_c_file { &$function_begin($documentation_line, $documentation, $function_line, "", "UINT16", "WINAPI", "waveOut". $2 . "16", \@arguments16); &$function_end($., ""); - &$function_begin($documentation_line, $documentation, + &$function_begin($documentation_line, $documentation, $function_line, "", "UINT", "WINAPI", "waveOut" . $2, \@arguments32); &$function_end($., ""); } @@ -534,7 +534,7 @@ sub parse_c_file { (?:\s+const)? ((?:\s*\*+\s*|\s+)\w+\s*(?:\[[^\]]*\])? (?:\s*,\s*(?:\s*\*+\s*|\s+)\w+\s*(?:\[[^\]]*\])?)*) - \s*;/sx) + \s*;/sx) { $_ = $'; $again = 1; @@ -561,9 +561,9 @@ sub parse_c_file { (\w+(?:\s*\*+\s*)?)\s+ (?:(\w+)\s*)? \((?:(\w+)\s+)?\s*\*\s*(\w+)\s*\)\s* - (?:\(([^\)]*)\)|\[([^\]]*)\])\s*;/sx) + (?:\(([^\)]*)\)|\[([^\]]*)\])\s*;/sx) { - $_ = $'; $again = 1; + $_ = $'; $again = 1; my $type; if(defined($2) || defined($3)) { my $cc = $2 || $3; diff --git a/tools/winecheck b/tools/winecheck index a669fe1e38a..ab32c338de8 100755 --- a/tools/winecheck +++ b/tools/winecheck @@ -105,7 +105,7 @@ sub Do_Check { my ($text) = @_; my $test_no; my $indent_str = ""; - + $count_tests++; $test_no = sprintf("%03d", $count_tests); for (my $i = 0; $i < $indent; $i++) @@ -225,7 +225,7 @@ sub Check_BaseFiles { $advice = "Make sure the \"wine\" command is in your PATH (echo \$PATH; export PATH=xxx)"; } Do_PrintResult($level, $reason, $advice); - + # check for config mess $level = $is_ok; my @output = (); @@ -305,7 +305,7 @@ sub Do_Config_Drive { $indent++; my $serious = ($drive =~ /^C$/i) || ($type =~ /^cdrom$/i); - + ##### check Path ##### Do_Check("Path option"); $level = $is_ok; diff --git a/tools/wineconf b/tools/wineconf index 6c211c15116..b9310f57885 100755 --- a/tools/wineconf +++ b/tools/wineconf @@ -104,7 +104,7 @@ sub ReadFSTAB { ($device eq '/dev/cdrom' && $type eq 'auto') ) { push(@::CdromDrives, [$device, $mntpoint, 'win95']); } - elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom') + elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom') && $type eq 'supermount') { push(@::CdromDrives, [ '/dev/cdrom', $mntpoint, 'win95']); } @@ -131,7 +131,7 @@ sub ReadFSTAB { print "\n"; &RegisterDrive($MagicDrive, $FatDrive); if(!&IsMounted($FatDrive->[0])) { - warn "WARNING: DOS Drive $MagicDrive (" . $FatDrive->[0] . + warn "WARNING: DOS Drive $MagicDrive (" . $FatDrive->[0] . ") is not mounted\n"; } $MagicDrive++; @@ -190,7 +190,7 @@ sub FindWindowsDir { chomp $winini; } my ($winini_cnt) = $#wininis+1; - if ($::opt_debug) { + if ($::opt_debug) { print STDERR "DEBUG: Num wininis found: $winini_cnt\n";} if ($winini_cnt > 1) { warn "$winini_cnt win.ini files found:\n"; @@ -227,11 +227,11 @@ sub IsMounted { my($Device) = @_; if (-d "/proc") { if (-e "/proc/mounts") { - open(MOUNTS, "/proc/mounts") || + open(MOUNTS, "/proc/mounts") || (warn "Cannot open /proc/mounts, although it exists\n" && return -1); while() { - if (/^$Device/) { + if (/^$Device/) { return 1; # Tested 1.4 } } @@ -255,11 +255,11 @@ sub ReadAutoexecBat { my($DriveC) = $::DOS2MntPoint{"C"}; $DriveC =~ s%/$%%; my($path); - if ($::opt_debug) { + if ($::opt_debug) { print STDERR "DEBUG: Looking for $DriveC/autoexec.bat\n"; } if (-e "$DriveC/autoexec.bat") { # Tested 1.4 - open(AUTOEXEC, "$DriveC/autoexec.bat") || + open(AUTOEXEC, "$DriveC/autoexec.bat") || die "Cannot read autoexec.bat\n"; while() { s/\015//; @@ -282,7 +282,7 @@ sub ReadAutoexecBat { $varvalue =~ s/\%$matchname\%/$::DOSenv{$subname}/; } else { - warn "DOS environment variable $subname not\n"; + warn "DOS environment variable $subname not\n"; warn "defined in autoexec.bat. (Reading config.sys\n"; warn "is not implemented.) Using null value\n"; $varvalue =~ s/%$matchname%//; @@ -335,11 +335,11 @@ sub ReadAutoexecBat { warn "path from that\n"; my $shellcmd = 'find ' . &ToUnix($::windir) . " -iregex '" . '.*\.\(exe\|bat\|com\|dll\)' . "' -print"; - if ($::opt_debug) { + if ($::opt_debug) { print STDERR "DEBUG: autoexec.bat search command:\n $shellcmd\n"; } push(@::DOScommand, `$shellcmd`); - if ($::opt_debug && $::opt_debug =~ /autoexec/i) { + if ($::opt_debug && $::opt_debug =~ /autoexec/i) { print STDERR "DEBUG: autoexec.bat search results:\n\@DOS::command\n"; } foreach my $command (@::DOScommand) { @@ -347,8 +347,8 @@ sub ReadAutoexecBat { $::DOSexecdir{&ToDos($command)}++; } print "\"path\" = " . - &marshall (join(";", - grep(s%\\$%%, + &marshall (join(";", + grep(s%\\$%%, sort {$::DOSexecdir{$b} <=> $::DOSexecdir{$a}} (keys %::DOSexecdir)))) . "\n"; } diff --git a/tools/wineconf.tcl b/tools/wineconf.tcl index b5c80e88972..f2d44fefb07 100755 --- a/tools/wineconf.tcl +++ b/tools/wineconf.tcl @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # the next line restarts using wish \ -exec wish $0 ${1+"$@"} +exec wish $0 ${1+"$@"} proc load_libs {} { global TKW set libLIST [glob $TKW/wineconf.libs/*.tcl] diff --git a/tools/winedump/function_grep.pl b/tools/winedump/function_grep.pl index 74cdecc8e9c..81f3bd8af29 100755 --- a/tools/winedump/function_grep.pl +++ b/tools/winedump/function_grep.pl @@ -59,7 +59,7 @@ foreach my $file (@files) { } # remove C comments - if(s/^(.*?)(\/\*.*?\*\/)(.*)$/$1 $3/s) { + if(s/^(.*?)(\/\*.*?\*\/)(.*)$/$1 $3/s) { $again = 1; next; } elsif(/^(.*?)\/\*/s) { @@ -85,10 +85,10 @@ foreach my $file (@files) { } # Remove extern "C" - if(s/^\s*extern\s+"C"\s+\{//m) { + if(s/^\s*extern\s+"C"\s+\{//m) { $extern_c = 1; $again = 1; - next; + next; } if($level > 0) @@ -176,7 +176,7 @@ foreach my $file (@files) { my $calling_convention = $7; my $name = $8; my $arguments = $10; - + if(!defined($linkage)) { $linkage = ""; } @@ -281,5 +281,5 @@ foreach my $file (@files) { $lookahead = 1; } } - close(IN); + close(IN); } diff --git a/tools/wineinstall b/tools/wineinstall index 59ed09f68af..bddae1a539d 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -72,16 +72,16 @@ # prevent the user from running wineinstall as root # add script commands so we su root for 'make install' and other commands # that require root access -# add text to tell the user we need to run stuff as root so they don't +# add text to tell the user we need to run stuff as root so they don't # think we are trying to pull something funny # Apr 14 2002 - Dustin Navea -# Fix sed command when finding real-windows registry so it actually +# Fix sed command when finding real-windows registry so it actually # accesses a file (~/.wine/config) instead of null ($CONF?!) # Added search for clean-install (not upgrade) Win2k registry # (next day, after some sleep) -# Fix sed string when finding real-windows registry to actually find +# Fix sed string when finding real-windows registry to actually find # windows partition name in [Drive C] section -# it should now almost always find the windows partition and real-windows +# it should now almost always find the windows partition and real-windows # registry (if not, let me know) #--- defaults (change these if you are a packager) @@ -524,7 +524,7 @@ then { fi } elif [ "$DOWINE" = 'auto' ] -then +then DOWINE=no fi @@ -576,13 +576,13 @@ then { } done echo "Configuring Wine for a no-windows install in $CROOT..." - + create_windows_directories configure_wine_applications } fi - # create $LCONF using the default config file $WINEINI + # create $LCONF using the default config file $WINEINI if [ "$DOLOCALCONF" = 'yes' ] && [ "$CONVCONF" = 'no' ] then { sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"${CROOT}\"|" $WINEINI > $TMPCONF @@ -615,7 +615,7 @@ then fi else DOREG=no -fi +fi #install the global config file $GCONF if [ "$DOGLOBALCONF" = 'yes' ] @@ -639,7 +639,7 @@ then { elif [ -f "$CROOT/windows/system32/config/system" ] then DOREG=no elif [ -f "$CROOT/WINNT/system32/config/system" ] - then DOREG=no + then DOREG=no else DOREG=yes fi if [ "$DOREG" = 'yes' ] diff --git a/tools/winelauncher.in b/tools/winelauncher.in index 8c1d9eb248d..a4ce82d54d5 100755 --- a/tools/winelauncher.in +++ b/tools/winelauncher.in @@ -4,7 +4,7 @@ # This shell script attempts to intelligently manage the process # of launching a program with Wine. It adds some level of # visual feedback to an end user. -# +# # Usage: # winelauncher [options] " [program arguments]" # @@ -45,7 +45,7 @@ WINEDLLPATH=@dlldir@ COLOR=' -xrm *.Command.background:darkgrey -xrm *.Command.foreground:black -xrm *.Text.background:black --xrm *.Text.foreground:green +-xrm *.Text.foreground:green -xrm *.Form.background:grey -xrm *.Form.foreground:green -xrm *.foreground:green @@ -163,13 +163,13 @@ info_flag=~/.wine/.no_prelaunch_window_flag debug_flag=~/.wine/.no_debug_window_flag debug_options="-debugmsg warn+all" -if [ -f $info_flag ] ; then +if [ -f $info_flag ] ; then use_info_message=0 else use_info_message=1 fi -if [ -f $debug_flag ] ; then +if [ -f $debug_flag ] ; then use_debug_message=0 else use_debug_message=1 @@ -226,7 +226,7 @@ if [ $no_args -eq 1 ] ; then If you would like to see the command line arguments for Wine, select the second option, below. - " + " welcome_rc=$? if [ $welcome_rc -eq 0 ] ; then exit @@ -283,7 +283,7 @@ while [ $conf -eq 0 ] ; do If this is the case, select the 'Configure Wine' option, below, to create a configuration file. - " + " init_rc=$? if [ $init_rc -eq 0 ] ; then exit @@ -321,7 +321,7 @@ if [ $use_info_message -ne 0 ] ; then that Wine is attempting to launch your application. Since Wine is still very much in a development stage, many - applications will fail silently. This dialog box is your indication + applications will fail silently. This dialog box is your indication that we're *trying* to run your application. This dialog box will automatically disappear after 30 seconds, @@ -439,7 +439,7 @@ else Wine has exited with a failure status of $wine_return. Wine is still development software, so there can be many -explanations for this problem. +explanations for this problem. You can choose to run Wine again with a higher level of debug messages (the debug option, below). @@ -503,7 +503,7 @@ You may view this file by selecting View Log, below." # Process a view instruction #------------------------------------------------------------------------------ if [ $debug_return -eq 1 ] ; then - $XMESSAGE -title "View Wine Log" -file "$log_name" -buttons " Okay ":0,"Delete $log_name":1 + $XMESSAGE -title "View Wine Log" -file "$log_name" -buttons " Okay ":0,"Delete $log_name":1 if [ $? -eq 1 ] ; then echo "Deleting $log_name" rm -f "$log_name" @@ -537,7 +537,7 @@ You may view this file by selecting View Log, below." echo "Rerunning $0 $debug_options $@" exec $0 $debug_options "$@" fi - done + done fi diff --git a/tools/winemaker b/tools/winemaker index ed01e1ec439..c96bd9fd58d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -89,16 +89,16 @@ my $opt_no_source_fix; # Options for the 'Source' method ## -# Specifies that we have only one target so that all sources relate -# to this target. By default this variable is left undefined which -# means winemaker should try to find out by itself what the targets -# are. If not undefined then this contains the name of the default +# Specifies that we have only one target so that all sources relate +# to this target. By default this variable is left undefined which +# means winemaker should try to find out by itself what the targets +# are. If not undefined then this contains the name of the default # target (without the extension). my $opt_single_target; ## -# If '$opt_single_target' has been specified then this is the type of -# that target. Otherwise it specifies whether the default target type +# If '$opt_single_target' has been specified then this is the type of +# that target. Otherwise it specifies whether the default target type # is guiexe or cuiexe. my $opt_target_type; @@ -107,14 +107,14 @@ my $opt_target_type; my $opt_flags; ## -# If true then winemaker should ask questions to the user as it goes +# If true then winemaker should ask questions to the user as it goes # along. my $opt_is_interactive; my $opt_ask_project_options; my $opt_ask_target_options; ## -# If false then winemaker should not generate any file, i.e. +# If false then winemaker should not generate any file, i.e. # no makefiles, but also no .spec files, no configure.in, etc. my $opt_no_generated_files; @@ -135,7 +135,7 @@ my $opt_no_banner; # ##### -# The description of a target is stored in an array. The constants +# The description of a target is stored in an array. The constants # below identify what is stored at each index of the array. ## @@ -153,12 +153,12 @@ my $T_TYPE=1; my $T_INIT=2; ## -# This is a bitfield containing flags refining the way the target +# This is a bitfield containing flags refining the way the target # should be handled. See the TF_xxx constants below my $T_FLAGS=3; ## -# This is a reference to an array containing the list of the +# This is a reference to an array containing the list of the # resp. C, C++, RC, other (.h, .hxx, etc.) source files. my $T_SOURCES_C=4; my $T_SOURCES_CXX=5; @@ -166,12 +166,12 @@ my $T_SOURCES_RC=6; my $T_SOURCES_MISC=7; ## -# This is a reference to an array containing the list of macro +# This is a reference to an array containing the list of macro # definitions my $T_DEFINES=8; ## -# This is a reference to an array containing the list of directory +# This is a reference to an array containing the list of directory # names that constitute the include path my $T_INCLUDE_PATH=9; @@ -199,9 +199,9 @@ my $T_DEPENDS=14; # The following constants define the recognized types of target ## -# This is not a real target. This type of target is used to collect +# This is not a real target. This type of target is used to collect # the sources that don't seem to belong to any other target. Thus no -# real target is generated for them, we just put the sources of the +# real target is generated for them, we just put the sources of the # fake target in the global source list. my $TT_SETTINGS=0; @@ -234,8 +234,8 @@ my $TF_MFC=4; ## # Initialize a target: -# - set the target type to TT_SETTINGS, i.e. no real target will -# be generated. +# - set the target type to TT_SETTINGS, i.e. no real target will +# be generated. sub target_init { my $target=$_[0]; @@ -276,25 +276,25 @@ sub get_default_init # ##### -# First we have the notion of project. A project is described by an -# array (since we don't have structs in perl). The constants below +# First we have the notion of project. A project is described by an +# array (since we don't have structs in perl). The constants below # identify what is stored at each index of the array. ## -# This is the path in which this project is located. In other +# This is the path in which this project is located. In other # words, this is the path to the Makefile. my $P_PATH=0; ## -# This index contains a reference to an array containing the project-wide -# settings. The structure of that arrray is actually identical to that of +# This index contains a reference to an array containing the project-wide +# settings. The structure of that arrray is actually identical to that of # a regular target since it can also contain extra sources. my $P_SETTINGS=1; ## -# This index contains a reference to an array of targets for this -# project. Each target describes how an executable or library is to -# be built. For each target this description takes the same form as +# This index contains a reference to an array of targets for this +# project. Each target describes how an executable or library is to +# be built. For each target this description takes the same form as # that of the project: an array. So this entry is an array of arrays. my $P_TARGETS=2; @@ -329,26 +329,26 @@ my %warnings; my %templates; ## -# Contains the list of all projects. This list tells us what are -# the subprojects of the main Makefile and where we have to generate +# Contains the list of all projects. This list tells us what are +# the subprojects of the main Makefile and where we have to generate # Makefiles. my @projects=(); ## -# This is the main project, i.e. the one in the "." directory. -# It may well be empty in which case the main Makefile will only +# This is the main project, i.e. the one in the "." directory. +# It may well be empty in which case the main Makefile will only # call out subprojects. my @main_project; ## # Contains the defaults for the include path, etc. -# We store the defaults as if this were a target except that we only +# We store the defaults as if this were a target except that we only # exploit the defines, include path, library path, library list and misc # sources fields. my @global_settings; ## -# If one of the projects requires the MFc then we set this global variable +# If one of the projects requires the MFc then we set this global variable # to true so that configure asks the user to provide a path tothe MFC my $needs_mfc=0; @@ -361,7 +361,7 @@ my $needs_mfc=0; ##### ## -# Cleans up a name to make it an acceptable Makefile +# Cleans up a name to make it an acceptable Makefile # variable name. sub canonize { @@ -373,7 +373,7 @@ sub canonize ## # Returns true is the specified pathname is absolute. -# Note: pathnames that start with a variable '$' or +# Note: pathnames that start with a variable '$' or # '~' are considered absolute. sub is_absolute { @@ -457,7 +457,7 @@ sub source_set_options ## # Scans the specified directory to: -# - see if we should create a Makefile in this directory. We normally do +# - see if we should create a Makefile in this directory. We normally do # so if we find a project file and sources # - get a list of targets for this directory # - get the list of source files @@ -465,13 +465,13 @@ sub source_scan_directory { # a reference to the parent's project my $parent_project=$_[0]; - # the full relative path to the current directory, including a + # the full relative path to the current directory, including a # trailing '/', or an empty string if this is the top level directory my $path=$_[1]; # the name of this directory, including a trailing '/', or an empty # string if this is the top level directory my $dirname=$_[2]; - # if set then no targets will be looked for and the sources will all + # if set then no targets will be looked for and the sources will all # end up in the parent_project's 'misc' bucket my $no_target=$_[3]; @@ -486,15 +486,15 @@ sub source_scan_directory my @sources_misc=(); # true if this directory contains a Windows project my $has_win_project=0; - # If we don't find any executable/library then we might make up targets - # from the list of .dsp/.mak files we find since they usually have the + # If we don't find any executable/library then we might make up targets + # from the list of .dsp/.mak files we find since they usually have the # same name as their target. my @dsp_files=(); my @mak_files=(); if (defined $opt_single_target or $dirname eq "") { - # Either there is a single target and thus a single project, - # or we are in the top level directory for which a project + # Either there is a single target and thus a single project, + # or we are in the top level directory for which a project # already exists $project=$parent_project; } else { @@ -513,7 +513,7 @@ sub source_scan_directory my $fullentry="$path$dentry"; if (-d "$fullentry") { if ($dentry =~ /^(Release|Debug)/i) { - # These directories are often used to store the object files and the + # These directories are often used to store the object files and the # resulting executable/library. They should not contain anything else. my @candidates=grep /\.(exe|dll)$/i, @{get_directory_contents("$fullentry")}; foreach $candidate (@candidates) { @@ -528,8 +528,8 @@ sub source_scan_directory push @{@$project_settings[$T_INCLUDE_PATH]},"-I$dentry"; source_scan_directory($project,"$fullentry/","$dentry/",1); } else { - # Recursively scan this directory. Any source file that cannot be - # attributed to a project in one of the subdirectories will be + # Recursively scan this directory. Any source file that cannot be + # attributed to a project in one of the subdirectories will be # attributed to this project. source_scan_directory($project,"$fullentry/","$dentry/",$no_target); } @@ -567,7 +567,7 @@ sub source_scan_directory } closedir(DIRECTORY); - # If we have a single target then all we have to do is assign + # If we have a single target then all we have to do is assign # all the sources to it and we're done # FIXME: does this play well with the --interactive mode? if ($opt_single_target) { @@ -608,7 +608,7 @@ sub source_scan_directory my $target_count; if (($has_win_project != 0) or ($dirname eq "")) { - # Deal with cases where we could not find any executable/library, and + # Deal with cases where we could not find any executable/library, and # thus have no target, although we did find some sort of windows project. $target_count=keys %targets; if ($target_count == 0) { @@ -635,7 +635,7 @@ sub source_scan_directory $name=(split /\//, cwd)[-1]; } else { $name=$dirname; - # Remove the trailing '/'. Also eliminate whatever is after the last + # Remove the trailing '/'. Also eliminate whatever is after the last # '.' as it is likely to be meaningless (.orig, .new, ...) $name =~ s+(/|\.[^.]*)$++; if ($name eq "src") { @@ -691,7 +691,7 @@ sub source_scan_directory } } - # If we have no project at this level, then transfer all + # If we have no project at this level, then transfer all # the sources to the parent project $target_count=keys %targets; if ($target_count == 0) { @@ -706,7 +706,7 @@ sub source_scan_directory return; } - # Otherwise add this project to the project list, except for + # Otherwise add this project to the project list, except for # the main project which is already in the list. if ($dirname ne "") { push @projects,$project; @@ -748,7 +748,7 @@ sub source_scan_directory # - Create the targets # - Check if we have both libraries and programs - # - Match each target with source files (sort in reverse + # - Match each target with source files (sort in reverse # alphabetical order to get the longest matches first) my @local_dlls=(); my @local_depends=(); @@ -773,8 +773,8 @@ sub source_scan_directory $basename=$target_name; push @exe_list,$target; } - # This is the default link list of Visual Studio, except odbccp32 - # which we don't have in Wine. Also I add ntdll which seems + # This is the default link list of Visual Studio, except odbccp32 + # which we don't have in Wine. Also I add ntdll which seems # necessary for Winelib. my @std_dlls=qw(advapi32.dll comdlg32.dll gdi32.dll kernel32.dll ntdll.dll odbc32.dll ole32.dll oleaut32.dll shell32.dll user32.dll winspool.drv); @$target[$T_DLLS]=\@std_dlls; @@ -815,7 +815,7 @@ sub source_scan_directory @$project_settings[$T_FLAGS]|=$TF_MFC; push @{@$target[$T_DLL_PATH]},"\$(MFC_LIBRARY_PATH)"; push @{@$target[$T_DLLS]},"mfc.dll"; - # FIXME: Link with the MFC in the Unix sense, until we + # FIXME: Link with the MFC in the Unix sense, until we # start exporting the functions properly. push @{@$target[$T_LIBRARY_PATH]},"\$(MFC_LIBRARY_PATH)"; push @{@$target[$T_LIBRARIES]},"mfc"; @@ -877,7 +877,7 @@ sub source_scan_directory if (@$project_settings[$T_FLAGS] & $TF_MFC) { push @{@$project_settings[$T_INCLUDE_PATH]},"\$(MFC_INCLUDE_PATH)"; } - # The sources that did not match, if any, go to the extra + # The sources that did not match, if any, go to the extra # source list of the project settings foreach $source (@sources_c) { if ($source ne "") { @@ -904,14 +904,14 @@ sub source_scan_directory } @$project_settings[$T_SOURCES_MISC]=[sort @{@$project_settings[$T_SOURCES_MISC]}]; - # Finally if we are building both libraries and programs in - # this directory, then the programs should be linked with all + # Finally if we are building both libraries and programs in + # this directory, then the programs should be linked with all # the libraries if (@local_dlls > 0 and @exe_list > 0) { foreach $target (@exe_list) { push @{@$target[$T_DLL_PATH]},"-L."; push @{@$target[$T_DLLS]},map { "$_.dll" } @local_dlls; - # Also link in the Unix sense since none of the functions + # Also link in the Unix sense since none of the functions # will be exported. push @{@$target[$T_LIBRARY_PATH]},"-L."; push @{@$target[$T_LIBRARIES]},@local_dlls; @@ -960,7 +960,7 @@ sub source_scan #sub analyze_vc_dsp #{ -# +# #} @@ -1031,7 +1031,7 @@ sub fix_file_and_directory_names my $new_name=$dentry; $new_name =~ s/[ \$]/_/g; - # Only all lowercase extensions are supported (because of the + # Only all lowercase extensions are supported (because of the # transformations ':.c=.o') . if (-f "$dirname/$new_name") { if ($new_name =~ /\.C$/) { @@ -1053,7 +1053,7 @@ sub fix_file_and_directory_names } # Adjust the case to the user's preferences - if (($opt_lower == $OPT_LOWER_ALL and $dentry =~ /[A-Z]/) or + if (($opt_lower == $OPT_LOWER_ALL and $dentry =~ /[A-Z]/) or ($opt_lower == $OPT_LOWER_UPPERCASE and $dentry !~ /[a-z]/) ) { $new_name=lc $new_name; @@ -1087,14 +1087,14 @@ sub fix_file_and_directory_names ##### ## -# This maps a directory name to a reference to an array listing +# This maps a directory name to a reference to an array listing # its contents (files and directories) my %directories; ## # Retrieves the contents of the specified directory. -# We either get it from the directories hashtable which acts as a -# cache, or use opendir, readdir, closedir and store the result +# We either get it from the directories hashtable which acts as a +# cache, or use opendir, readdir, closedir and store the result # in the hashtable. sub get_directory_contents { @@ -1113,7 +1113,7 @@ sub get_directory_contents #print "->@$directory\n"; return $directory; } - + # Read this directory if (opendir(DIRECTORY, "$dirname")) { my @files=readdir DIRECTORY; @@ -1131,8 +1131,8 @@ sub get_directory_contents } ## -# Try to find a file for the specified filename. The attempt is -# case-insensitive which is why it's not trivial. If a match is +# Try to find a file for the specified filename. The attempt is +# case-insensitive which is why it's not trivial. If a match is # found then we return the pathname with the correct case. sub search_from { @@ -1159,7 +1159,7 @@ sub search_from $dirname=dirname($dirname) . "/"; $real_path.="../"; } else { - # The file/directory may have been renamed before. Also try to + # The file/directory may have been renamed before. Also try to # match the renamed file. my $renamed=$component; $renamed =~ s/[ \$]/_/g; @@ -1192,7 +1192,7 @@ sub search_from } ## -# Performs a case-insensitive search for the specified file in the +# Performs a case-insensitive search for the specified file in the # include path. # $line is the line number that should be referenced when an error occurs # $filename is the file we are looking for @@ -1220,7 +1220,7 @@ sub get_real_include_name # - split the filename we look for into its components # - then for each directory in the include path # - trace the directory components starting from that directory - # - if we fail to find a match at any point then continue with + # - if we fail to find a match at any point then continue with # the next directory in the include path # - otherwise, rejoice, our quest is over. my @file_components=split /[\/\\]+/, $filename; @@ -1288,13 +1288,13 @@ sub print_pack } ## -# 'Parses' a source file and fixes constructs that would not work with -# Winelib. The parsing is rather simple and not all non-portable features -# are corrected. The most important feature that is corrected is the case -# and path separator of '#include' directives. This requires that each -# source file be associated to a project & target so that the proper +# 'Parses' a source file and fixes constructs that would not work with +# Winelib. The parsing is rather simple and not all non-portable features +# are corrected. The most important feature that is corrected is the case +# and path separator of '#include' directives. This requires that each +# source file be associated to a project & target so that the proper # include path is used. -# Also note that the include path is relative to the directory in which the +# Also note that the include path is relative to the directory in which the # compiler is run, i.e. that of the project, not to that of the file. sub fix_file { @@ -1314,7 +1314,7 @@ sub fix_file } print " $filename\n"; - #FIXME:assuming that because there is a .bak file, this is what we want is + #FIXME:assuming that because there is a .bak file, this is what we want is #probably flawed. Or is it??? if (! -e "$filename.bak") { if (!copy("$filename","$filename.bak")) { @@ -1351,9 +1351,9 @@ sub fix_file $_ .= "\n"; } if ($is_rc and !$is_mfc and /^(\s*)(\#\s*include\s*)\"afxres\.h\"/) { - # VC6 automatically includes 'afxres.h', an MFC specific header, in - # the RC files it generates (even in non-MFC projects). So we replace - # it with 'winres.h' its very close standard cousin so that non MFC + # VC6 automatically includes 'afxres.h', an MFC specific header, in + # the RC files it generates (even in non-MFC projects). So we replace + # it with 'winres.h' its very close standard cousin so that non MFC # projects can compile in Wine without the MFC sources. my $warning="mfc:afxres.h"; if (!defined $warnings{$warning}) { @@ -1375,8 +1375,8 @@ sub fix_file } elsif (s/^(\s*)(\#\s*pragma\s+pack\s*\(\s*)//) { # Pragma pack handling # - # pack_stack is an array of references describing the stack of - # pack directives currently in effect. Each directive if described + # pack_stack is an array of references describing the stack of + # pack directives currently in effect. Each directive if described # by a reference to an array containing: # - "push" for pack(push,...) directives, "" otherwise # - the directive's identifier at index 1 @@ -1483,7 +1483,7 @@ sub fix_file } elsif (/^(push\s*,\s*(\w+)\s*(,\s*(\d+)\s*)?\))/) { # pragma pack(push,label[,n]) # Pushes a new label on the stack. It is possible to push the same - # label multiple times. If 'n' is omitted then the alignment is + # label multiple times. If 'n' is omitted then the alignment is # unchanged. Otherwise it becomes 'n'. print FILEO "$pack_indent/* winemaker: $pack_header$1 */\n"; my $size; @@ -1560,7 +1560,7 @@ sub fix_file } ## -# Analyzes each source file in turn to find and correct issues +# Analyzes each source file in turn to find and correct issues # that would cause it not to compile. sub fix_source { @@ -1657,7 +1657,7 @@ sub generate_spec_file } } - # Don't forget to export the 'Main' function for wrapped executables, + # Don't forget to export the 'Main' function for wrapped executables, # except for MFC ones! if (@$target[$T_FLAGS] == $TF_WRAP) { if (@$target[$T_TYPE] == $TT_GUIEXE) { @@ -1705,7 +1705,7 @@ sub generate_wrapper_file } ## -# A convenience function to generate all the lists (defines, +# A convenience function to generate all the lists (defines, # C sources, C++ source, etc.) in the Makefile sub generate_list { @@ -1778,9 +1778,9 @@ sub generate_project_files generate_list("VPATH",1,[ "\@srcdir\@" ]); print FILEO "\n"; if (@$project[$P_PATH] eq "") { - # This is the main project. It is also responsible for recursively + # This is the main project. It is also responsible for recursively # calling the other projects - generate_list("SUBDIRS",1,\@projects,sub + generate_list("SUBDIRS",1,\@projects,sub { if ($_[0] != \@main_project) { my $subdir=@{$_[0]}[$P_PATH]; @@ -1921,7 +1921,7 @@ sub generate_project_files print FILEO "\n"; print FILEO "install::\n"; if (@$project[$P_PATH] eq "") { - # This is the main project. It is also responsible for recursively + # This is the main project. It is also responsible for recursively # calling the other projects print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n"; } @@ -1932,7 +1932,7 @@ sub generate_project_files print FILEO "\n"; print FILEO "uninstall::\n"; if (@$project[$P_PATH] eq "") { - # This is the main project. It is also responsible for recursively + # This is the main project. It is also responsible for recursively # calling the other projects print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n"; } @@ -2082,7 +2082,7 @@ sub generate_global_files } ## -# +# sub generate_read_templates { my $file; @@ -2104,7 +2104,7 @@ sub generate_read_templates } ## -# This is where we finally generate files. In fact this method does not +# This is where we finally generate files. In fact this method does not # do anything itself but calls the methods that do the actual work. sub generate { @@ -2534,7 +2534,7 @@ AC_SUBST($1) ]) dnl AC_PATH_HEADER(variable,header,action-if-not-found,default-locations) -dnl Note that the above may set variable to an empty value if the header is +dnl Note that the above may set variable to an empty value if the header is dnl already in the include path AC_DEFUN(AC_PATH_HEADER,[ AC_MSG_CHECKING([for $2 header]) @@ -3012,7 +3012,7 @@ prog_manext = 1 conf_manext = 5 OBJS = $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) \ - $(SPEC_SRCS:.spec=.spec.o) + $(SPEC_SRCS:.spec=.spec.o) CLEAN_FILES = *.spec.c y.tab.c y.tab.h lex.yy.c \ core *.orig *.rej \ \\\#*\\\# *~ *% .\\\#* @@ -3097,26 +3097,26 @@ dummy: #define APP_TYPE ##WINEMAKER_APP_TYPE## /** - * This is the application library's base name, i.e. 'hello' if the + * This is the application library's base name, i.e. 'hello' if the * library is called 'libhello.so'. */ static char* appName = ##WINEMAKER_APP_NAME##; /** - * This is the name of the application's Windows module. If left NULL + * This is the name of the application's Windows module. If left NULL * then appName is used. */ static char* appModule = NULL; /** - * This is the application's entry point. This is usually "WinMain" for a + * This is the application's entry point. This is usually "WinMain" for a * GUIEXE and 'main' for a CUIEXE application. */ static char* appInit = ##WINEMAKER_APP_INIT##; /** - * This is either non-NULL for MFC-based applications and is the name of the - * MFC's module. This is the module in which we will take the 'WinMain' + * This is either non-NULL for MFC-based applications and is the name of the + * MFC's module. This is the module in which we will take the 'WinMain' * function. */ static char* mfcModule = ##WINEMAKER_APP_MFC##; @@ -3149,8 +3149,8 @@ int WINAPI Main(int argc, char** argv, char** envp) /* Load the application's library */ libName=(char*)malloc(strlen(appName)+5+3+1); - /* FIXME: we should get the wrapper's path and use that as the base for - * the library + /* FIXME: we should get the wrapper's path and use that as the base for + * the library */ sprintf(libName,"./lib%s.so",appName); appLibrary=dlopen(libName,RTLD_NOW); @@ -3185,7 +3185,7 @@ int WINAPI Main(int argc, char** argv, char** envp) free(msg); return 1; } - /* MFC is a special case: the WinMain is in the MFC library, + /* MFC is a special case: the WinMain is in the MFC library, * instead of the application's library. */ hMain=hMFC; diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index d4c268010d4..8722118b867 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -675,4 +675,3 @@ static cp_xlat_t *find_cpxlat(int lan) t.lan = lan; return (cp_xlat_t *)bsearch(&t, cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); } - diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index c0d5c5dbfb4..d2544022f53 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -24,7 +24,7 @@ * preprocessor in here anymore. * 02-Jan-2000 BS - Removed the preprocessor code * 23-Dec-1999 BS - Removed the copyright for Martin von Loewis. - * There is really nothing left of his code in + * There is really nothing left of his code in * this parser. * 20-Jun-1998 BS - Changed the filename conversion. Filenames are * case-sensitive inder *nix, but not under dos. diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index f271ab30287..4ad3bd71663 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -37,11 +37,11 @@ * except for the # command (line numbers). * * 06-Nov-1999 JS - see CHANGES - * + * * 29-Dec-1998 AdH - Grammar and function extensions. - * grammar: TOOLBAR resources, Named ICONs in + * grammar: TOOLBAR resources, Named ICONs in * DIALOGS - * functions: semantic actions for the grammar + * functions: semantic actions for the grammar * changes, resource files can now be anywhere * on the include path instead of just in the * current directory @@ -158,7 +158,7 @@ /* #define YYEMPTY -2 */ /* #define YYLEX yylex() */ -#else +#else /* No yacc we know yet */ # if !defined(YYEMPTY) || !defined(YYLEX) # error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX. @@ -349,7 +349,7 @@ static int rsrcid_to_token(int lookahead); %type toolbar %type toolbar_items %type dlginit -%type optional_style_pair +%type optional_style_pair %type any_num %type