April 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Added fscanf_s(_l) implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: b38fcabfa08cb91314bc8953362e73916dd04709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38fcabfa08cb91314bc89533… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:51:41 2010 +0200 msvcrt: Added fscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 11 +++-------- dlls/msvcrt/scanf.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 84e9ff1..5cc1b8b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -433,7 +433,7 @@ @ stub _freea_s @ stub _freefls @ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l -@ stub _fscanf_s_l +@ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l @ stub _fseek_nolock @ stub _fseeki64 @ stub _fseeki64_nolock @@ -1273,7 +1273,7 @@ @ stub freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf -@ stub fscanf_s +@ varargs fscanf_s(ptr str) msvcrt.fscanf_s @ cdecl fseek(ptr long long) msvcrt.fseek @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a847cfe..f630e1a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -425,7 +425,7 @@ @ stub _freea_s @ stub _freefls @ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l -@ stub _fscanf_s_l +@ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l @ stub _fseek_nolock @ stub _fseeki64 @ stub _fseeki64_nolock @@ -1257,7 +1257,7 @@ @ stub freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf -@ stub fscanf_s +@ varargs fscanf_s(ptr str) msvcrt.fscanf_s @ cdecl fseek(ptr long long) msvcrt.fseek @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d3ad273..0fb6be3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -395,7 +395,8 @@ # stub _freea # stub _freea_s # stub _fscanf_l -# stub _fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l +@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l # stub _fseeki64 @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat(long ptr) MSVCRT__fstat @@ -1203,7 +1204,7 @@ # stub freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp @ varargs fscanf(ptr str) MSVCRT_fscanf -# stub fscanf_s +@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @@ -1282,12 +1283,6 @@ @ cdecl puts(str) MSVCRT_puts @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) _fputwchar -# stub _free_dbg -# stub _freea -# stub _freea_s -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -# stub _fscanf_s_l -# stub _fseeki64 @ cdecl qsort(ptr long long ptr) ntdll.qsort # stub qsort_s @ cdecl raise(long) MSVCRT_raise diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index d0557d0..e1f917b 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -65,6 +65,9 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +#define SECURE 1 +#include "scanf.h" + /* vfwscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE @@ -124,6 +127,35 @@ int CDECL MSVCRT__fscanf_l(MSVCRT_FILE *file, const char *format, } /********************************************************************* + * fscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fscanf_s(MSVCRT_FILE *file, const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vfscanf_s_l(file, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _fscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__fscanf_s_l(MSVCRT_FILE *file, const char *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfscanf_s_l(file, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * scanf (MSVCRT.@) */ int CDECL MSVCRT_scanf(const char *format, ...)

1 0

Piotr Caban : msvcrt: Added _scanf_s(_l) implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 2c07fad607b0d41db22bbbedf672b1023d744d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c07fad607b0d41db22bbbedf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:51:57 2010 +0200 msvcrt: Added _scanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5cc1b8b..47b7076 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -852,7 +852,7 @@ @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l -@ stub _scanf_s_l +@ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l @ stub _scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -1359,7 +1359,7 @@ @ cdecl rename(str str) msvcrt.rename @ cdecl rewind(ptr) msvcrt.rewind @ varargs scanf(str) msvcrt.scanf -@ stub scanf_s +@ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f630e1a..c53761f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -838,7 +838,7 @@ @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l -@ stub _scanf_s_l +@ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l @ stub _scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -1343,7 +1343,7 @@ @ cdecl rename(str str) msvcrt.rename @ cdecl rewind(ptr) msvcrt.rewind @ varargs scanf(str) msvcrt.scanf -@ stub scanf_s +@ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0fb6be3..f2cd471 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -795,7 +795,7 @@ @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb @ varargs _scanf_l(str ptr) MSVCRT__scanf_l -# stub _scanf_s_l +@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l # stub _scprintf # stub _scprintf_l # stub _scprintf_p_l @@ -1293,7 +1293,7 @@ @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ varargs scanf(str) MSVCRT_scanf -# stub scanf_s +@ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index e1f917b..fb2a6a1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -184,6 +184,34 @@ int CDECL MSVCRT__scanf_l(const char *format, MSVCRT__locale_t locale, ...) } /********************************************************************* + * scanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_scanf_s(const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vfscanf_s_l(MSVCRT_stdin, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _scanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__scanf_s_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfscanf_s_l(MSVCRT_stdin, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * fwscanf (MSVCRT.@) */ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...)

1 0

Piotr Caban : msvcrt: Added _fwscanf_s(_l) implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 3b994417702cdce37387836e097bdcde34c0be02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b994417702cdce37387836e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:52:18 2010 +0200 msvcrt: Added _fwscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 47b7076..756a56a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -459,7 +459,7 @@ @ stub _fwprintf_s_l @ stub _fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l -@ stub _fwscanf_s_l +@ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt @ stub _gcvt_s @ stub _get_amblksiz @@ -1281,7 +1281,7 @@ @ stub fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf -@ stub fwscanf_s +@ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s @ cdecl getc(ptr) msvcrt.getc @ cdecl getchar() msvcrt.getchar @ cdecl getenv(str) msvcrt.getenv diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c53761f..ecdcd6d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -451,7 +451,7 @@ @ stub _fwprintf_s_l @ stub _fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l -@ stub _fwscanf_s_l +@ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt @ stub _gcvt_s @ stub _get_amblksiz @@ -1265,7 +1265,7 @@ @ stub fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf -@ stub fwscanf_s +@ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s @ cdecl getc(ptr) msvcrt.getc @ cdecl getchar() msvcrt.getchar @ cdecl getenv(str) msvcrt.getenv diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f2cd471..d5e10cf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -421,7 +421,7 @@ # stub _fwprintf_p_l # stub _fwprintf_s_l @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -# stub _fwscanf_s_l +@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) # stub _gcvt_s # stub _get_doserrno @@ -1212,7 +1212,7 @@ # stub fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite @ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -# stub fwscanf_s +@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) MSVCRT_getenv diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index fb2a6a1..498651e 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -65,6 +65,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vfscanf_l */ #define SECURE 1 #include "scanf.h" @@ -75,6 +76,10 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vfwscanf_s_l */ +#define SECURE 1 +#include "scanf.h" + /* vsscanf_l */ #undef WIDE_SCANF #undef CONSOLE @@ -241,6 +246,35 @@ int CDECL MSVCRT__fwscanf_l(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, } /********************************************************************* + * fwscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fwscanf_s(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vfwscanf_s_l(file, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _fwscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__fwscanf_s_l(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfwscanf_s_l(file, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * wscanf (MSVCRT.@) */ int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...)

1 0

Piotr Caban : msvcrt: Added _wscanf_s(_l) implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 98e34c7f82b67f775d39a345dce4cde869851e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e34c7f82b67f775d39a345d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:52:33 2010 +0200 msvcrt: Added _wscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 756a56a..a6bb276 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1179,7 +1179,7 @@ @ cdecl _write(long ptr long) msvcrt._write @ cdecl _wrmdir(wstr) msvcrt._wrmdir @ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l -@ stub _wscanf_s_l +@ varargs _wscanf_s_l(wstr ptr) msvcrt._wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv @ stub _wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @@ -1465,4 +1465,4 @@ @ varargs wprintf(wstr) msvcrt.wprintf @ stub wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf -@ stub wscanf_s +@ varargs wscanf_s(wstr) msvcrt.wscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ecdcd6d..311d646 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1163,7 +1163,7 @@ @ cdecl _write(long ptr long) msvcrt._write @ cdecl _wrmdir(wstr) msvcrt._wrmdir @ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l -@ stub _wscanf_s_l +@ varargs _wscanf_s_l(wstr ptr) msvcrt._wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv @ stub _wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @@ -1449,4 +1449,4 @@ @ varargs wprintf(wstr) msvcrt.wprintf @ stub wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf -@ stub wscanf_s +@ varargs wscanf_s(wstr) msvcrt.wscanf_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d5e10cf..a5f47a9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1108,7 +1108,7 @@ @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) @ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -# stub _wscanf_s_l +@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) # stub _wsearchenv_s @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @@ -1405,7 +1405,7 @@ @ varargs wprintf(wstr) MSVCRT_wprintf # stub wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf -# stub wscanf_s +@ varargs wscanf_s(wstr) MSVCRT_wscanf_s # Functions not exported in native dll: @ cdecl _get_invalid_parameter_handler() diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 498651e..a47a3e4 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -304,6 +304,35 @@ int CDECL MSVCRT__wscanf_l(const MSVCRT_wchar_t *format, } /********************************************************************* + * wscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_wscanf_s(const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vfwscanf_s_l(MSVCRT_stdin, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _wscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__wscanf_s_l(const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfwscanf_s_l(MSVCRT_stdin, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * sscanf (MSVCRT.@) */ int CDECL MSVCRT_sscanf(const char *str, const char *format, ...)

1 0

Piotr Caban : msvcrt: Added _wscanf_l implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: ced42a0ed602e68ee3614feef72ef73578105d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced42a0ed602e68ee3614feef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:49:58 2010 +0200 msvcrt: Added _wscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dc4c219..90a374b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1178,7 +1178,7 @@ @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write @ cdecl _wrmdir(wstr) msvcrt._wrmdir -@ stub _wscanf_l +@ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l @ stub _wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv @ stub _wsearchenv_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eae71a3..89d3824 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1162,7 +1162,7 @@ @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write @ cdecl _wrmdir(wstr) msvcrt._wrmdir -@ stub _wscanf_l +@ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l @ stub _wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv @ stub _wsearchenv_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 46c8acb..3332469 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1106,7 +1106,7 @@ @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) -# stub _wscanf_l +@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l # stub _wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) # stub _wsearchenv_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index bcad004..504a92d 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -188,6 +188,20 @@ int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...) return res; } +/********************************************************************* + * _wscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__wscanf_l(const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfwscanf_l(MSVCRT_stdin, format, locale, valist); + __ms_va_end(valist); + return res; +} /********************************************************************* * sscanf (MSVCRT.@)

1 0

Piotr Caban : msvcrt: Added _sscanf_l implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: edfe9bdbaebfa1e6268c0729770f704eb1070a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfe9bdbaebfa1e6268c07297… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:50:20 2010 +0200 msvcrt: Added _sscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 90a374b..b20223a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -921,7 +921,7 @@ @ stub _sprintf_p @ stub _sprintf_p_l @ stub _sprintf_s_l -@ stub _sscanf_l +@ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ stub _sscanf_s_l @ stub _stat32 @ stub _stat32i64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 89d3824..9da64e7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -907,7 +907,7 @@ @ stub _sprintf_p @ stub _sprintf_p_l @ stub _sprintf_s_l -@ stub _sscanf_l +@ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ stub _sscanf_s_l @ stub _stat32 @ stub _stat32i64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3332469..6eb3114 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -856,7 +856,7 @@ # stub _sprintf_l # stub _sprintf_p_l # stub _sprintf_s_l -# stub _sscanf_l +@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l # stub _sscanf_s_l @ cdecl _stat(str ptr) MSVCRT_stat @ cdecl _stat64(str ptr) MSVCRT_stat64 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 504a92d..079f450 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -217,6 +217,20 @@ int CDECL MSVCRT_sscanf(const char *str, const char *format, ...) return res; } +/********************************************************************* + * _sscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__sscanf_l(const char *str, const char *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsscanf_l(str, format, locale, valist); + __ms_va_end(valist); + return res; +} /********************************************************************* * swscanf (MSVCRT.@)

1 0

Piotr Caban : msvcrt: Added _swscanf_l implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 2242f281bababdbf4aa2aaf27608dc1a954cf4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2242f281bababdbf4aa2aaf27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:51:03 2010 +0200 msvcrt: Added _swscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b20223a..08a372d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -975,7 +975,7 @@ @ stub _swprintf_p @ stub _swprintf_p_l @ stub _swprintf_s_l -@ stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ stub _swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9da64e7..355bfe4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -962,7 +962,7 @@ @ stub _swprintf_p @ stub _swprintf_p_l @ stub _swprintf_s_l -@ stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ stub _swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6eb3114..84298e7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -909,7 +909,7 @@ # stub _swprintf_c_l # stub _swprintf_p_l # stub _swprintf_s_l -# stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l # stub _swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 079f450..1f7cfef 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -246,6 +246,20 @@ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format return res; } +/********************************************************************* + * _swscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__swscanf_l(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vswscanf_l(str, format, locale, valist); + __ms_va_end(valist); + return res; +} /********************************************************************* * _cscanf (MSVCRT.@)

1 0

Piotr Caban : msvcrt: Added _cscanf_l implementation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 8a69a936dcfdf496dd9c8819a69d7d2516e0990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a69a936dcfdf496dd9c8819a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:51:15 2010 +0200 msvcrt: Added _cscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 08a372d..84e9ff1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -341,7 +341,7 @@ @ cdecl _create_locale(long str) msvcrt._create_locale @ stub _crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf -@ stub _cscanf_l +@ varargs _cscanf_l(str ptr) msvcrt._cscanf_l @ stub _cscanf_s @ stub _cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 355bfe4..a847cfe 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -333,7 +333,7 @@ @ cdecl _create_locale(long str) msvcrt._create_locale @ stub _crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf -@ stub _cscanf_l +@ varargs _cscanf_l(str ptr) msvcrt._cscanf_l @ stub _cscanf_s @ stub _cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 84298e7..d3ad273 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -314,7 +314,7 @@ # stub _crtBreakAlloc # stub _crtDbgFlag @ varargs _cscanf(str) -# stub _cscanf_l +@ varargs _cscanf_l(str ptr) # stub _cscanf_s # stub _cscanf_s_l @ cdecl _ctime32(ptr) MSVCRT__ctime32 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 1f7cfef..4845019 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -274,3 +274,17 @@ int CDECL _cscanf(const char *format, ...) __ms_va_end(valist); return res; } + +/********************************************************************* + * _cscanf_l (MSVCRT.@) + */ +int CDECL _cscanf_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vcscanf_l(format, locale, valist); + __ms_va_end(valist); + return res; +}

1 0

Piotr Caban : msvcrt: Added support for secure functions to scanf helper functions.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 17f486baa45e8e76005dfeb0fc7e399ce9433b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f486baa45e8e76005dfeb0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 17:55:27 2010 +0200 msvcrt: Added support for secure functions to scanf helper functions. --- dlls/msvcrt/scanf.c | 6 +++ dlls/msvcrt/scanf.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 4845019..d0557d0 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -24,6 +24,7 @@ */ #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -61,30 +62,35 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef WIDE_SCANF #undef CONSOLE #undef STRING +#undef SECURE #include "scanf.h" /* vfwscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #undef STRING +#undef SECURE #include "scanf.h" /* vsscanf_l */ #undef WIDE_SCANF #undef CONSOLE #define STRING 1 +#undef SECURE #include "scanf.h" /* vswscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #define STRING 1 +#undef SECURE #include "scanf.h" /* vcscanf_l */ #undef WIDE_SCANF #define CONSOLE 1 #undef STRING +#undef SECURE #include "scanf.h" diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 086854f..a5202fe 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,7 +48,11 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vcscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vcscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else #ifdef STRING #undef _EOF_ @@ -56,19 +60,35 @@ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #ifdef WIDE_SCANF +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vswscanf_s_l(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vswscanf_l(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else /* WIDE_SCANF */ +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vsscanf_s_l(const char *file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vsscanf_l(const char *file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING */ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, MSVCRT_fgetwc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetwc(nch, file); consumed--; } while(0) +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vfwscanf_s_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vfwscanf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, MSVCRT_fgetc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetc(nch, file); consumed--; } while(0) +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vfscanf_s_l(MSVCRT_FILE* file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vfscanf_l(MSVCRT_FILE* file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ #endif /* WIDE_SCANF */ #endif /* STRING */ #endif /* CONSOLE */ @@ -265,7 +285,7 @@ _FUNCTION_ { if (width>0) width--; } } else { - cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ + cur = 0; /* Fix: .8 -> 0.8 */ } /* handle decimals */ if (width!=0 && nch == *locale->locinfo->lconv->decimal_point) { @@ -339,12 +359,25 @@ _FUNCTION_ { #endif /* WIDE_SCANF */ charstring: { /* read a word into a char */ char *sptr = suppress ? NULL : va_arg(ap, char*); + char *sptr_beg = sptr; +#ifdef SECURE + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); +#else + unsigned size = UINT_MAX; +#endif /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); + if (!suppress) { + *sptr++ = _CHAR2SUPPORTED_(nch); + if(size>1) size--; + else { + *sptr_beg = 0; + return rd; + } + } st++; nch = _GETC_(file); if (width>0) width--; @@ -355,12 +388,25 @@ _FUNCTION_ { break; widecharstring: { /* read a word into a wchar_t* */ MSVCRT_wchar_t *sptr = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); + MSVCRT_wchar_t *sptr_beg = sptr; +#ifdef SECURE + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); +#else + unsigned size = UINT_MAX; +#endif /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); /* read until whitespace */ while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { - if (!suppress) *sptr++ = _WIDE2SUPPORTED_(nch); + if (!suppress) { + *sptr++ = _WIDE2SUPPORTED_(nch); + if(size>1) size--; + else { + *sptr_beg = 0; + return rd; + } + } st++; nch = _GETC_(file); if (width>0) width--; @@ -389,10 +435,23 @@ _FUNCTION_ { #endif /* WIDE_SCANF */ character: { /* read single character into char */ char *str = suppress ? NULL : va_arg(ap, char*); + char *pstr = str; +#ifdef SECURE + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(char); +#else + unsigned size = UINT_MAX; +#endif if (width == -1) width = 1; - while ((width != 0) && (nch != _EOF_)) + while (width && (nch != _EOF_)) { - if (!suppress) *str++ = _CHAR2SUPPORTED_(nch); + if (!suppress) { + *str++ = _CHAR2SUPPORTED_(nch); + if(size) size--; + else { + *pstr = 0; + return rd; + } + } st++; width--; nch = _GETC_(file); @@ -401,10 +460,23 @@ _FUNCTION_ { break; widecharacter: { /* read single character into a wchar_t */ MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); + MSVCRT_wchar_t *pstr = str; +#ifdef SECURE + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(MSVCRT_wchar_t); +#else + unsigned size = UINT_MAX; +#endif if (width == -1) width = 1; - while ((width != 0) && (nch != _EOF_)) + while (width && (nch != _EOF_)) { - if (!suppress) *str++ = _WIDE2SUPPORTED_(nch); + if (!suppress) { + *str++ = _WIDE2SUPPORTED_(nch); + if(size) size--; + else { + *pstr = 0; + return rd; + } + } st++; width--; nch = _GETC_(file); @@ -437,6 +509,11 @@ _FUNCTION_ { RTL_BITMAP bitMask; ULONG *Mask; int invert = 0; /* Set if we are NOT to find the chars */ +#ifdef SECURE + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(_CHAR_); +#else + unsigned size = UINT_MAX; +#endif /* Init our bitmap */ Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); @@ -481,6 +558,11 @@ _FUNCTION_ { st++; nch = _GETC_(file); if (width>0) width--; + if(size>1) size--; + else { + *str = 0; + return rd; + } } /* terminate */ if (!suppress) *sptr = 0;

1 0

Alexandre Julliard : winex11: Don' t set a hint for the small icon if it has the same size as the large one.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 09dc6019b6afb2b1b59c0d7224302942b180eed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dc6019b6afb2b1b59c0d722… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 14:47:57 2010 +0200 winex11: Don't set a hint for the small icon if it has the same size as the large one. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9f274f..831b7c9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -929,7 +929,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, unsigned int size_small; unsigned long *bits_small, *new; - if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small ))) + if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small )) && + (bits_small[0] != bits[0] || bits_small[1] != bits[1])) /* size must be different */ { if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, (size + size_small) * sizeof(unsigned long) ))) @@ -938,8 +939,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, memcpy( bits + size, bits_small, size_small * sizeof(unsigned long) ); size += size_small; } - HeapFree( GetProcessHeap(), 0, bits_small ); } + HeapFree( GetProcessHeap(), 0, bits_small ); DeleteObject( ii.hbmColor ); DeleteObject( ii.hbmMask ); }

1 0