?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Bump version.
[LameXP.git] / etc / Patches / deprecated / WavPack-4.75.0-UTF8+FlushProgress.diff
blobcdbdacc8aade4bf00b3401c48fc4e8787a946981
1 .gitignore | 6 ++
2 cli/utils.c | 21 +++--
3 cli/win32_unicode_support.c | 197 ++++++++++++++++++++++++++++++++++++++++++++
4 cli/win32_unicode_support.h | 49 +++++++++++
5 cli/wvunpack.c | 71 +++++++++++++---
6 src/open_utils.c | 5 +-
7 6 files changed, 331 insertions(+), 18 deletions(-)
8
9 diff --git a/.gitignore b/.gitignore
10 index eb3a2f7..b09320e 100644
11 --- a/.gitignore
12 +++ b/.gitignore
13 @@ -1 +1,7 @@
14 /_old_
15 +/src/Release
16 +/Backup1
17 +/Release
18 +/*.sdf
19 +/wavpackexe/Release
20 +/wvunpackexe/Release
21 diff --git a/cli/utils.c b/cli/utils.c
22 index 8ead3df..9925a8c 100644
23 --- a/cli/utils.c
24 +++ b/cli/utils.c
25 @@ -30,6 +30,7 @@
26
27 #include "wavpack.h"
28 #include "utils.h"
29 +#include "win32_unicode_support.h"
30
31 #ifdef WIN32
32 #define fileno _fileno
33 @@ -81,7 +82,7 @@ int copy_timestamp(const char *src_filename, const char *dst_filename)
34 if (strcmp(src_filename, "-") == 0 || strcmp(dst_filename, "-") == 0)
35 return TRUE;
36
37 - if (stat(src_filename, &fileinfo))
38 + if (stat_utf8(src_filename, &fileinfo))
39 return FALSE; /* stat failed */
40
41 times[0].tv_sec = fileinfo.st_atime;
42 @@ -186,7 +187,7 @@ char *filespec_path (char *filespec)
43 globs.gl_pathc > 0)
44 {
45 /* test if the file is a directory */
46 - if (stat(globs.gl_pathv[0], &fstats) == 0 && (fstats.st_mode & S_IFDIR)) {
47 + if (stat_utf8(globs.gl_pathv[0], &fstats) == 0 && (fstats.st_mode & S_IFDIR)) {
48 filespec[0] = '\0';
49 strcat (filespec, globs.gl_pathv[0]);
50 globfree(&globs);
51 @@ -368,6 +369,7 @@ char yna (void)
52 fprintf (stderr, "%c", 7);
53 }
54
55 + fflush(stderr);
56 waiting_input = 0;
57
58 return choice;
59 @@ -446,6 +448,7 @@ void error_line (char *error, ...)
60 vsprintf (error_msg + 1, error, argptr);
61 va_end (argptr);
62 fputs (error_msg, stderr);
63 + fflush(stderr);
64 finish_line ();
65
66 if (debug_logging_mode) {
67 @@ -454,7 +457,7 @@ void error_line (char *error, ...)
68
69 if (get_app_path (file_path)) {
70 strcat (file_path, "\\WavPack\\wavpack.log");
71 - error_log = fopen (file_path, "a+");
72 + error_log = fopen_utf8 (file_path, "a+");
73
74 if (!error_log) {
75 get_app_path (file_path);
76 @@ -462,13 +465,13 @@ void error_line (char *error, ...)
77
78 if (CreateDirectory (file_path, NULL)) {
79 strcat (file_path, "\\wavpack.log");
80 - error_log = fopen (file_path, "a+");
81 + error_log = fopen_utf8 (file_path, "a+");
82 }
83 }
84 }
85
86 if (!error_log)
87 - error_log = fopen ("c:\\wavpack.log", "a+");
88 + error_log = fopen_utf8 ("c:\\wavpack.log", "a+");
89
90 if (error_log) {
91 fputs (error_msg + 1, error_log);
92 @@ -490,6 +493,7 @@ void error_line (char *error, ...)
93 vsprintf (error_msg + 1, error, argptr);
94 va_end (argptr);
95 fputs (error_msg, stderr);
96 + fflush(stderr);
97 finish_line ();
98 }
99
100 @@ -508,10 +512,11 @@ void debug_line (char *error, ...)
101 vsprintf (error_msg + 1, error, argptr);
102 va_end (argptr);
103 fputs (error_msg, stderr);
104 + fflush(stderr);
105 finish_line ();
106
107 if (debug_logging_mode) {
108 - FILE *error_log = fopen ("c:\\wavpack.log", "a+");
109 + FILE *error_log = fopen_utf8 ("c:\\wavpack.log", "a+");
110
111 if (error_log) {
112 fputs (error_msg + 1, error_log);
113 @@ -589,6 +594,8 @@ void finish_line (void)
114 }
115 else
116 fputc ('\n', stderr);
117 +
118 + fflush(stderr);
119 }
120 #else
121 //////////////////////////////////////////////////////////////////////////////
122 @@ -599,6 +606,7 @@ void finish_line (void)
123 void finish_line (void)
124 {
125 fprintf (stderr, " \n");
126 + fflush(stderr);
127 }
128
129 //////////////////////////////////////////////////////////////////////////////
130 @@ -778,6 +786,7 @@ void DoSetConsoleTitle (char *text)
131 void DoSetConsoleTitle (char *text)
132 {
133 fprintf (stderr, "\033]0;%s\007", text);
134 + fflush(stderr);
135 }
136
137 #endif
138 diff --git a/cli/win32_unicode_support.c b/cli/win32_unicode_support.c
139 new file mode 100644
140 index 0000000..513cebc
141 --- /dev/null
142 +++ b/cli/win32_unicode_support.c
143 @@ -0,0 +1,197 @@
144 +/* Copyright (c) 2004-2012 LoRd_MuldeR <mulder2@gmx.de>
145 + File: unicode_support.c
146 +
147 + This file was originally part of a patch included with LameXP,
148 + released under the same license as the original audio tools.
149 +
150 + Redistribution and use in source and binary forms, with or without
151 + modification, are permitted provided that the following conditions
152 + are met:
153 +
154 + - Redistributions of source code must retain the above copyright
155 + notice, this list of conditions and the following disclaimer.
156 +
157 + - Redistributions in binary form must reproduce the above copyright
158 + notice, this list of conditions and the following disclaimer in the
159 + documentation and/or other materials provided with the distribution.
160 +
161 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
162 + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
163 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
164 + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
165 + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
166 + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
167 + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
168 + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
169 + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
170 + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
171 + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
172 +*/
173 +#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
174 +
175 +#include "win32_unicode_support.h"
176 +
177 +#include <windows.h>
178 +#include <io.h>
179 +
180 +static UINT g_old_output_cp = ((UINT)-1);
181 +
182 +char *utf16_to_utf8(const wchar_t *input)
183 +{
184 + char *Buffer;
185 + int BuffSize = 0, Result = 0;
186 +
187 + BuffSize = WideCharToMultiByte(CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL);
188 + Buffer = (char*) malloc(sizeof(char) * BuffSize);
189 + if(Buffer)
190 + {
191 + Result = WideCharToMultiByte(CP_UTF8, 0, input, -1, Buffer, BuffSize, NULL, NULL);
192 + }
193 +
194 + return ((Result > 0) && (Result <= BuffSize)) ? Buffer : NULL;
195 +}
196 +
197 +char *utf16_to_ansi(const wchar_t *input)
198 +{
199 + char *Buffer;
200 + int BuffSize = 0, Result = 0;
201 +
202 + BuffSize = WideCharToMultiByte(CP_ACP, 0, input, -1, NULL, 0, NULL, NULL);
203 + Buffer = (char*) malloc(sizeof(char) * BuffSize);
204 + if(Buffer)
205 + {
206 + Result = WideCharToMultiByte(CP_ACP, 0, input, -1, Buffer, BuffSize, NULL, NULL);
207 + }
208 +
209 + return ((Result > 0) && (Result <= BuffSize)) ? Buffer : NULL;
210 +}
211 +
212 +wchar_t *utf8_to_utf16(const char *input)
213 +{
214 + wchar_t *Buffer;
215 + int BuffSize = 0, Result = 0;
216 +
217 + BuffSize = MultiByteToWideChar(CP_UTF8, 0, input, -1, NULL, 0);
218 + Buffer = (wchar_t*) malloc(sizeof(wchar_t) * BuffSize);
219 + if(Buffer)
220 + {
221 + Result = MultiByteToWideChar(CP_UTF8, 0, input, -1, Buffer, BuffSize);
222 + }
223 +
224 + return ((Result > 0) && (Result <= BuffSize)) ? Buffer : NULL;
225 +}
226 +
227 +void init_commandline_arguments_utf8(int *argc, char ***argv)
228 +{
229 + int i, nArgs;
230 + LPWSTR *szArglist;
231 +
232 + szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
233 +
234 + if(NULL == szArglist)
235 + {
236 + fprintf(stderr, "\nFATAL: CommandLineToArgvW failed\n\n");
237 + exit(-1);
238 + }
239 +
240 + *argv = (char**) malloc(sizeof(char*) * nArgs);
241 + *argc = nArgs;
242 +
243 + if(NULL == *argv)
244 + {
245 + fprintf(stderr, "\nFATAL: Malloc failed\n\n");
246 + exit(-1);
247 + }
248 +
249 + for(i = 0; i < nArgs; i++)
250 + {
251 + (*argv)[i] = utf16_to_utf8(szArglist[i]);
252 + if(NULL == (*argv)[i])
253 + {
254 + fprintf(stderr, "\nFATAL: utf16_to_utf8 failed\n\n");
255 + exit(-1);
256 + }
257 + }
258 +
259 + LocalFree(szArglist);
260 +}
261 +
262 +void free_commandline_arguments_utf8(int *argc, char ***argv)
263 +{
264 + int i = 0;
265 +
266 + if(*argv != NULL)
267 + {
268 + for(i = 0; i < *argc; i++)
269 + {
270 + if((*argv)[i] != NULL)
271 + {
272 + free((*argv)[i]);
273 + (*argv)[i] = NULL;
274 + }
275 + }
276 + free(*argv);
277 + *argv = NULL;
278 + }
279 +}
280 +
281 +FILE *fopen_utf8(const char *filename_utf8, const char *mode_utf8)
282 +{
283 + FILE *ret = NULL;
284 + wchar_t *filename_utf16 = utf8_to_utf16(filename_utf8);
285 + wchar_t *mode_utf16 = utf8_to_utf16(mode_utf8);
286 +
287 + if(filename_utf16 && mode_utf16)
288 + {
289 + ret = _wfopen(filename_utf16, mode_utf16);
290 + }
291 +
292 + if(filename_utf16) free(filename_utf16);
293 + if(mode_utf16) free(mode_utf16);
294 +
295 + return ret;
296 +}
297 +
298 +int stat_utf8(const char *path_utf8, struct _stat *buf)
299 +{
300 + int ret = -1;
301 +
302 + wchar_t *path_utf16 = utf8_to_utf16(path_utf8);
303 + if(path_utf16)
304 + {
305 + ret = _wstat(path_utf16, buf);
306 + free(path_utf16);
307 + }
308 +
309 + return ret;
310 +}
311 +
312 +int unlink_utf8(const char *path_utf8)
313 +{
314 + int ret = -1;
315 +
316 + wchar_t *path_utf16 = utf8_to_utf16(path_utf8);
317 + if(path_utf16)
318 + {
319 + ret = _wunlink(path_utf16);
320 + free(path_utf16);
321 + }
322 +
323 + return ret;
324 +}
325 +
326 +void init_console_utf8(void)
327 +{
328 + g_old_output_cp = GetConsoleOutputCP();
329 + SetConsoleOutputCP(CP_UTF8);
330 +}
331 +
332 +void uninit_console_utf8(void)
333 +{
334 + if(g_old_output_cp != ((UINT)-1))
335 + {
336 + SetConsoleOutputCP(g_old_output_cp);
337 + }
338 +}
339 +
340 +#endif
341 diff --git a/cli/win32_unicode_support.h b/cli/win32_unicode_support.h
342 new file mode 100644
343 index 0000000..40c2e33
344 --- /dev/null
345 +++ b/cli/win32_unicode_support.h
346 @@ -0,0 +1,49 @@
347 +/* Copyright (c) 2004-2012 LoRd_MuldeR <mulder2@gmx.de>
348 + File: unicode_support.h
349 +
350 + This file was originally part of a patch included with LameXP,
351 + released under the same license as the original audio tools.
352 +
353 + Redistribution and use in source and binary forms, with or without
354 + modification, are permitted provided that the following conditions
355 + are met:
356 +
357 + - Redistributions of source code must retain the above copyright
358 + notice, this list of conditions and the following disclaimer.
359 +
360 + - Redistributions in binary form must reproduce the above copyright
361 + notice, this list of conditions and the following disclaimer in the
362 + documentation and/or other materials provided with the distribution.
363 +
364 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
365 + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
366 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
367 + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
368 + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
369 + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
370 + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
371 + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
372 + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
373 + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
374 + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
375 +*/
376 +#ifndef UNICODE_SUPPORT_H_INCLUDED
377 +#define UNICODE_SUPPORT_H_INCLUDED
378 +
379 +#include <stdio.h>
380 +#include <sys/stat.h>
381 +
382 +#define WIN_UNICODE 1
383 +
384 +char *utf16_to_utf8(const wchar_t *input);
385 +char *utf16_to_ansi(const wchar_t *input);
386 +wchar_t *utf8_to_utf16(const char *input);
387 +void init_commandline_arguments_utf8(int *argc, char ***argv);
388 +void free_commandline_arguments_utf8(int *argc, char ***argv);
389 +FILE *fopen_utf8(const char *filename_utf8, const char *mode_utf8);
390 +int stat_utf8(const char *path_utf8, struct _stat *buf);
391 +int unlink_utf8(const char *path_utf8);
392 +void init_console_utf8(void);
393 +void uninit_console_utf8(void);
394 +
395 +#endif
396 diff --git a/cli/wvunpack.c b/cli/wvunpack.c
397 index e12b5c3..255a6a5 100644
398 --- a/cli/wvunpack.c
399 +++ b/cli/wvunpack.c
400 @@ -46,6 +46,7 @@
401 #include "wavpack.h"
402 #include "utils.h"
403 #include "md5.h"
404 +#include "win32_unicode_support.h"
405
406 #ifdef WIN32
407 #define strdup(x) _strdup(x)
408 @@ -159,7 +160,7 @@ static void display_progress (double file_progress);
409 // The "main" function for the command-line WavPack decompressor. //
410 //////////////////////////////////////////////////////////////////////////////
411
412 -int main (argc, argv) int argc; char **argv;
413 +static int wvunpack_main (argc, argv) int argc; char **argv;
414 {
415 #ifdef __EMX__ /* OS/2 */
416 _wildcard (&argc, &argv);
417 @@ -196,7 +197,7 @@ int main (argc, argv) int argc; char **argv;
418 #endif
419
420 #if defined (WIN32)
421 - set_console_title = 1; // on Windows, we default to messing with the console title
422 + set_console_title = 0; // on Windows, we default to messing with the console title
423 #endif // on Linux, this is considered uncool to do by default
424
425 // loop through command-line arguments
426 @@ -450,9 +451,15 @@ int main (argc, argv) int argc; char **argv;
427 }
428
429 if (strcmp (WavpackGetLibraryVersionString (), PACKAGE_VERSION))
430 + {
431 fprintf (stderr, version_warning, WavpackGetLibraryVersionString (), PACKAGE_VERSION);
432 + fflush(stderr);
433 + }
434 else if (!quiet_mode && !error_count)
435 + {
436 fprintf (stderr, sign_on, VERSION_OS, WavpackGetLibraryVersionString ());
437 + fflush(stderr);
438 + }
439
440 if (!num_files) {
441 printf ("%s", usage);
442 @@ -473,7 +480,7 @@ int main (argc, argv) int argc; char **argv;
443 // frontends, but could be used for other purposes.
444
445 if (*infilename == '@') {
446 - FILE *list = fopen (infilename+1, "rt");
447 + FILE *list = fopen_utf8 (infilename+1, "rt");
448 int di, c;
449
450 for (di = file_index; di < num_files - 1; di++)
451 @@ -517,7 +524,7 @@ int main (argc, argv) int argc; char **argv;
452 }
453 #if defined (WIN32)
454 else if (filespec_wild (infilename)) {
455 - FILE *list = fopen (infilename+1, "rt");
456 + FILE *list = fopen_utf8 (infilename+1, "rt");
457 intptr_t file;
458 int di;
459
460 @@ -556,7 +563,7 @@ int main (argc, argv) int argc; char **argv;
461 // be passed on the command-line, but could be used for other purposes.
462
463 if (outfilename && outfilename [0] == '@') {
464 - FILE *list = fopen (outfilename+1, "rt");
465 + FILE *list = fopen_utf8 (outfilename+1, "rt");
466 int c;
467
468 if (list == NULL) {
469 @@ -629,7 +636,10 @@ int main (argc, argv) int argc; char **argv;
470 strcat (outfilename, raw_decode ? ".raw" : ".wav");
471
472 if (num_files > 1 && !quiet_mode)
473 + {
474 fprintf (stderr, "\n%s:\n", matches [file_index]);
475 + fflush(stderr);
476 + }
477
478 result = unpack_file (matches [file_index], verify_only ? NULL : outfilename);
479
480 @@ -653,9 +663,15 @@ int main (argc, argv) int argc; char **argv;
481
482 if (num_files > 1) {
483 if (error_count)
484 + {
485 fprintf (stderr, "\n **** warning: errors occurred in %d of %d files! ****\n", error_count, num_files);
486 + fflush(stderr);
487 + }
488 else if (!quiet_mode)
489 + {
490 fprintf (stderr, "\n **** %d files successfully processed ****\n", num_files);
491 + fflush(stderr);
492 + }
493 }
494
495 free (matches);
496 @@ -742,7 +758,7 @@ static FILE *open_output_file (char *filename, char **tempfilename)
497 return stdout;
498 }
499
500 - testfile = fopen (filename, "rb");
501 + testfile = fopen_utf8 (filename, "rb");
502
503 if (testfile) {
504 size_t res = fread (&dummy, 1, 1, testfile);
505 @@ -754,6 +770,7 @@ static FILE *open_output_file (char *filename, char **tempfilename)
506
507 if (!overwrite_all) {
508 fprintf (stderr, "overwrite %s (yes/no/all)? ", FN_FIT (filename));
509 + fflush(stderr);
510
511 if (set_console_title)
512 DoSetConsoleTitle ("overwrite?");
513 @@ -787,7 +804,7 @@ static FILE *open_output_file (char *filename, char **tempfilename)
514 strcat (*tempfilename, ".tmp");
515 }
516
517 - testfile = fopen (*tempfilename, "rb");
518 + testfile = fopen_utf8 (*tempfilename, "rb");
519
520 if (!testfile)
521 break;
522 @@ -801,7 +818,7 @@ static FILE *open_output_file (char *filename, char **tempfilename)
523 }
524 }
525
526 - retval = fopen (*tempfilename ? *tempfilename : filename, "w+b");
527 + retval = fopen_utf8 (*tempfilename ? *tempfilename : filename, "w+b");
528
529 if (retval == NULL)
530 error_line ("can't create file %s!", *tempfilename ? *tempfilename : filename);
531 @@ -960,11 +977,17 @@ static int unpack_file (char *infilename, char *outfilename)
532 }
533 else if (*outfilename == '-') {
534 if (!quiet_mode)
535 + {
536 fprintf (stderr, "unpacking %s%s to stdout,", *infilename == '-' ?
537 "stdin" : FN_FIT (infilename), wvc_mode ? " (+.wvc)" : "");
538 + fflush(stderr);
539 + }
540 }
541 else if (!quiet_mode)
542 + {
543 fprintf (stderr, "restoring %s,", FN_FIT (outfilename));
544 + fflush(stderr);
545 + }
546
547 if (outbuf_k)
548 output_buffer_size = outbuf_k * 1024;
549 @@ -983,8 +1006,11 @@ static int unpack_file (char *infilename, char *outfilename)
550 outfile = NULL;
551
552 if (!quiet_mode)
553 + {
554 fprintf (stderr, "verifying %s%s,", *infilename == '-' ? "stdin" :
555 FN_FIT (infilename), wvc_mode ? " (+.wvc)" : "");
556 + fflush(stderr);
557 + }
558 }
559
560 #if defined(WIN32)
561 @@ -1071,6 +1097,7 @@ static int unpack_file (char *infilename, char *outfilename)
562 #else
563 fprintf (stderr, "\n");
564 #endif
565 + fflush(stderr);
566 DoTruncateFile (outfile);
567 result = SOFT_ERROR;
568 break;
569 @@ -1085,8 +1112,11 @@ static int unpack_file (char *infilename, char *outfilename)
570 progress = floor (progress * 100.0 + 0.5);
571
572 if (!quiet_mode)
573 + {
574 fprintf (stderr, "%s%3d%% done...",
575 nobs ? " " : "\b\b\b\b\b\b\b\b\b\b\b\b", (int) progress);
576 + fflush(stderr);
577 + }
578 }
579 }
580
581 @@ -1364,9 +1394,10 @@ static int do_tag_extractions (WavpackContext *wpc, char *outfilename)
582 else
583 strcpy (filespec_name (full_filename), tag_filename);
584
585 - if (!overwrite_all && (outfile = fopen (full_filename, "r")) != NULL) {
586 + if (!overwrite_all && (outfile = fopen_utf8 (full_filename, "r")) != NULL) {
587 DoCloseHandle (outfile);
588 fprintf (stderr, "overwrite %s (yes/no/all)? ", FN_FIT (full_filename));
589 + fflush(stderr);
590
591 if (set_console_title)
592 DoSetConsoleTitle ("overwrite?");
593 @@ -1385,7 +1416,7 @@ static int do_tag_extractions (WavpackContext *wpc, char *outfilename)
594 // open output file for writing
595
596 if (*full_filename) {
597 - if ((outfile = fopen (full_filename, "w")) == NULL) {
598 + if ((outfile = fopen_utf8 (full_filename, "w")) == NULL) {
599 error_line ("can't create file %s!", FN_FIT (full_filename));
600 result = SOFT_ERROR;
601 }
602 @@ -2074,3 +2105,23 @@ void display_progress (double file_progress)
603 DoSetConsoleTitle (title);
604 }
605 }
606 +
607 +//////////////////////////////////////////////////////////////////////////////
608 +// MAIN
609 +//////////////////////////////////////////////////////////////////////////////
610 +
611 +int main(int argc, char **argv)
612 +{
613 + int ret = -1, argc_utf8 = -1;
614 + char **argv_utf8 = NULL;
615 +
616 + init_console_utf8();
617 + init_commandline_arguments_utf8(&argc_utf8, &argv_utf8);
618 +
619 + ret = wvunpack_main(argc_utf8, argv_utf8);
620 +
621 + free_commandline_arguments_utf8(&argc_utf8, &argv_utf8);
622 + uninit_console_utf8();
623 +
624 + return ret;
625 +}
626 diff --git a/src/open_utils.c b/src/open_utils.c
627 index a8c7baa..a77f90f 100644
628 --- a/src/open_utils.c
629 +++ b/src/open_utils.c
630 @@ -20,6 +20,7 @@
631 #include <string.h>
632
633 #include "wavpack_local.h"
634 +#include "../cli/win32_unicode_support.h"
635
636 // This code provides an interface between the reader callback mechanism that
637 // WavPack uses internally and the standard fstream C library. This allows an
638 @@ -137,7 +138,7 @@ WavpackContext *WavpackOpenFileInput (const char *infilename, char *error, int f
639 setmode (fileno (stdin), O_BINARY);
640 #endif
641 }
642 - else if ((wv_id = fopen (infilename, file_mode)) == NULL) {
643 + else if ((wv_id = fopen_utf8 (infilename, file_mode)) == NULL) {
644 if (error) strcpy (error, (flags & OPEN_EDIT_TAGS) ? "can't open file for editing" : "can't open file");
645 return NULL;
646 }
647 @@ -147,7 +148,7 @@ WavpackContext *WavpackOpenFileInput (const char *infilename, char *error, int f
648
649 strcpy (in2filename, infilename);
650 strcat (in2filename, "c");
651 - wvc_id = fopen (in2filename, "rb");
652 + wvc_id = fopen_utf8 (in2filename, "rb");
653 free (in2filename);
654 }
655 else
Audio Encoder Front-End (Qt)