ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wrc: Reset the language before processing multiple rc files.

Browse Source
This commit is contained in:
Michael Stefaniuc 2009-07-10 11:48:34 +02:00 committed by Alexandre Julliard
parent 3115f3357f
commit d67a9d92ea
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/wrc/wrc.c
View File

@ -132,6 +132,7 @@ int extensions = 1;
/* /*
* Language setting for resources (-l option) * Language setting for resources (-l option)
*/ */
static language_t *defaultlanguage;
language_t *currentlanguage = NULL; language_t *currentlanguage = NULL;
/* /*
@ -289,6 +290,9 @@ static int load_file( const char *input_name, const char *output_name )
input_name = temp_name; input_name = temp_name;
} }
/* Reset the language */
currentlanguage = dup_language( defaultlanguage );
/* Go from .rc to .res */ /* Go from .rc to .res */
chat("Starting parse\n"); chat("Starting parse\n");
@ -302,6 +306,7 @@ static int load_file( const char *input_name, const char *output_name )
unlink( temp_name ); unlink( temp_name );
temp_name = NULL; temp_name = NULL;
} }
free( currentlanguage );
return ret; return ret;
} }
@ -429,7 +434,7 @@ int main(int argc,char *argv[])
lan = strtol(optarg, NULL, 0); lan = strtol(optarg, NULL, 0);
if (get_language_codepage(PRIMARYLANGID(lan), SUBLANGID(lan)) == -1) if (get_language_codepage(PRIMARYLANGID(lan), SUBLANGID(lan)) == -1)
error("Language %04x is not supported\n", lan); error("Language %04x is not supported\n", lan);
currentlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); defaultlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan));
} }
break; break;
case 'f': case 'f':
@ -492,8 +497,8 @@ int main(int argc,char *argv[])
(debuglevel & DEBUGLEVEL_PPMSG) != 0 ); (debuglevel & DEBUGLEVEL_PPMSG) != 0 );
/* Check if the user set a language, else set default */ /* Check if the user set a language, else set default */
if(!currentlanguage) if(!defaultlanguage)
currentlanguage = new_language(0, 0); defaultlanguage = new_language(0, 0);
atexit(cleanup_files); atexit(cleanup_files);