wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Alexandre Julliard : cryptnet/tests: Don't import shlwapi.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 0a28308b9076b7a53c45dd2fb570915d9b5f2a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a28308b9076b7a53c45dd2fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 12:01:43 2010 +0100 cryptnet/tests: Don't import shlwapi. --- dlls/cryptnet/tests/Makefile.in | 2 +- dlls/cryptnet/tests/cryptnet.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index 2cef5b6..7fe1e32 100644 --- a/dlls/cryptnet/tests/Makefile.in +++ b/dlls/cryptnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = cryptnet.dll -IMPORTS = cryptnet crypt32 shlwapi +IMPORTS = cryptnet crypt32 C_SRCS = \ cryptnet.c diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index aab3724..64491e7 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -24,7 +24,6 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> -#include <shlwapi.h> #include "wine/test.h" static const BYTE bigCert[] = { @@ -324,7 +323,6 @@ static void test_retrieveObjectByUrl(void) HCERTSTORE store; CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; FILETIME ft = { 0 }; - DWORD urllen; SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -334,8 +332,7 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - urllen = sizeof(url); - UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY); + snprintf(url, sizeof(url), "file://%s", tmpfile); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0

Eryk Wieliczko : msvcrt: Implement fprintf_s and fwprintf_s.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 91bc6c52017fbdb1ef3746b006678076f320f8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bc6c52017fbdb1ef3746b00… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 24 21:25:49 2010 +0100 msvcrt: Implement fprintf_s and fwprintf_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- include/msvcrt/stdio.h | 2 ++ include/msvcrt/wchar.h | 1 + 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 25467ff..4cd7f3a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1459,7 +1459,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1476,7 +1476,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 742144d..ab74956 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1315,7 +1315,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1332,7 +1332,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3c0279f..e6da0da 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1299,7 +1299,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1316,7 +1316,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 866ea46..69ba4b8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3500,6 +3500,19 @@ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) } /********************************************************************* + * fprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vfprintf_s(file, format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * fwprintf (MSVCRT.@) */ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) @@ -3513,6 +3526,19 @@ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) } /********************************************************************* + * fwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vfwprintf_s(file, format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * printf (MSVCRT.@) */ int CDECL MSVCRT_printf(const char *format, ...) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d528e06..efa380a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1250,7 +1250,7 @@ @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf -# stub fprintf_s +@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s @ cdecl fputc(long ptr) MSVCRT_fputc @ cdecl fputs(str ptr) MSVCRT_fputs @ cdecl fputwc(long ptr) MSVCRT_fputwc @@ -1267,7 +1267,7 @@ @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf -# stub fwprintf_s +@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite @ varargs fwscanf(ptr wstr) MSVCRT_fwscanf @ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 31ba8ca..fa5290f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ char* __cdecl fgets(char*,int,FILE*); FILE* __cdecl fopen(const char*,const char*); errno_t __cdecl fopen_s(FILE**,const char*,const char*); int __cdecl fprintf(FILE*,const char*,...); +int __cdecl fprintf_s(FILE*,const char*,...); int __cdecl fputc(int,FILE*); int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); @@ -200,6 +201,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwprintf(FILE*,const wchar_t*,...); +int __cdecl fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwscanf(FILE*,const wchar_t*,...); int __cdecl fwscanf_s(FILE*,const wchar_t*,...); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index e753e3f..285168a 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -295,6 +295,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwprintf(FILE*,const wchar_t*,...); +int __cdecl fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwscanf(FILE*,const wchar_t*,...); int __cdecl fwscanf_s(FILE*,const wchar_t*,...);

1 0

Eryk Wieliczko : msvcrt: Implement printf_s and wprintf_s.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 133a38fcfbe59524d6be8759a4c3997fbb6efbe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133a38fcfbe59524d6be8759a… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 24 21:12:37 2010 +0100 msvcrt: Implement printf_s and wprintf_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- include/msvcrt/stdio.h | 2 ++ include/msvcrt/wchar.h | 1 + 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2600fc0..25467ff 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1543,7 +1543,7 @@ @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow @ varargs printf(str) msvcrt.printf -@ stub printf_s +@ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @ cdecl putchar(long) msvcrt.putchar @ cdecl puts(str) msvcrt.puts @@ -1665,6 +1665,6 @@ @ stub wmemcpy_s @ stub wmemmove_s @ varargs wprintf(wstr) msvcrt.wprintf -@ stub wprintf_s +@ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf @ varargs wscanf_s(wstr) msvcrt.wscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9823273..742144d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1397,7 +1397,7 @@ @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow @ varargs printf(str) msvcrt.printf -@ stub printf_s +@ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @ cdecl putchar(long) msvcrt.putchar @ cdecl puts(str) msvcrt.puts @@ -1517,6 +1517,6 @@ @ cdecl wctomb(ptr long) msvcrt.wctomb @ stub wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf -@ stub wprintf_s +@ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf @ varargs wscanf_s(wstr) msvcrt.wscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4f68724..3c0279f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1381,7 +1381,7 @@ @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow @ varargs printf(str) msvcrt.printf -@ stub printf_s +@ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @ cdecl putchar(long) msvcrt.putchar @ cdecl puts(str) msvcrt.puts @@ -1501,6 +1501,6 @@ @ cdecl wctomb(ptr long) msvcrt.wctomb @ stub wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf -@ stub wprintf_s +@ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf @ varargs wscanf_s(wstr) msvcrt.wscanf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b8f4338..866ea46 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3526,6 +3526,19 @@ int CDECL MSVCRT_printf(const char *format, ...) } /********************************************************************* + * printf_s (MSVCRT.@) + */ +int CDECL MSVCRT_printf_s(const char *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vprintf_s(format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * ungetc (MSVCRT.@) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) @@ -3575,6 +3588,19 @@ int CDECL MSVCRT_wprintf(const MSVCRT_wchar_t *format, ...) } /********************************************************************* + * wprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_wprintf_s(const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vwprintf_s(format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * _getmaxstdio (MSVCRT.@) */ int CDECL _getmaxstdio(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c861643..d528e06 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1339,7 +1339,7 @@ @ cdecl pow(double double) MSVCRT_pow @ cdecl -arch=x86_64 powf(float float) MSVCRT_powf @ varargs printf(str) MSVCRT_printf -# stub printf_s +@ varargs printf_s(str) MSVCRT_printf_s @ cdecl putc(long ptr) MSVCRT_putc @ cdecl putchar(long) MSVCRT_putchar @ cdecl puts(str) MSVCRT_puts @@ -1470,7 +1470,7 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb # stub wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf -# stub wprintf_s +@ varargs wprintf_s(wstr) MSVCRT_wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf @ varargs wscanf_s(wstr) MSVCRT_wscanf_s diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e8c7671..31ba8ca 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -148,6 +148,7 @@ int __cdecl getchar(void); char* __cdecl gets(char*); void __cdecl perror(const char*); int __cdecl printf(const char*,...); +int __cdecl printf_s(const char*,...); int __cdecl putc(int,FILE*); int __cdecl putchar(int); int __cdecl puts(const char*); @@ -220,6 +221,7 @@ int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); +int __cdecl wprintf_s(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...); #endif /* _WSTDIO_DEFINED */ diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d0a6a37..e753e3f 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -316,6 +316,7 @@ int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); +int __cdecl wprintf_s(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...); #endif /* _WSTDIO_DEFINED */

1 0

Eryk Wieliczko : msvcrt: Implement vprintf_s and vwprintf_s.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 6296d95b9ef6c685b75e5b981d7b0301ef52853a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6296d95b9ef6c685b75e5b981… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 24 21:25:30 2010 +0100 msvcrt: Implement vprintf_s and vwprintf_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- include/msvcrt/stdio.h | 2 ++ include/msvcrt/wchar.h | 1 + 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1c8dc12..2600fc0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1621,12 +1621,12 @@ @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf -@ stub vprintf_s +@ cdecl vprintf_s(str ptr) msvcrt.vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf -@ stub vwprintf_s +@ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s @ stub wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3bee113..9823273 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1475,12 +1475,12 @@ @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf -@ stub vprintf_s +@ cdecl vprintf_s(str ptr) msvcrt.vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf -@ stub vwprintf_s +@ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s @ stub wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 536db47..4f68724 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1459,12 +1459,12 @@ @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf -@ stub vprintf_s +@ cdecl vprintf_s(str ptr) msvcrt.vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf -@ stub vwprintf_s +@ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s @ stub wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0c60bdc..b8f4338 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3463,6 +3463,14 @@ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) } /********************************************************************* + * vprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vprintf_s(const char *format, __ms_va_list valist) +{ + return MSVCRT_vfprintf_s(MSVCRT_stdout,format,valist); +} + +/********************************************************************* * vwprintf (MSVCRT.@) */ int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist) @@ -3471,6 +3479,14 @@ int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist) } /********************************************************************* + * vwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vwprintf_s(const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return MSVCRT_vfwprintf_s(MSVCRT_stdout,format,valist); +} + +/********************************************************************* * fprintf (MSVCRT.@) */ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6d1f10..c861643 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1426,14 +1426,14 @@ @ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf @ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s @ cdecl vprintf(str ptr) MSVCRT_vprintf -# stub vprintf_s +@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s # stub vsnprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -# stub vwprintf_s +@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s # stub wcrtomb # stub wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e27c8ca..e8c7671 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -168,6 +168,7 @@ int __cdecl ungetc(int,FILE*); int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); +int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); @@ -217,6 +218,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); +int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 7c495f0..d0a6a37 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -314,6 +314,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); +int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...);

1 0

Eryk Wieliczko : msvcrt: Implement vfprintf_s and vfwprintf_s.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 8bf437d827b898d8a4723c94d64452e1df03895c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf437d827b898d8a4723c94d… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 24 21:12:35 2010 +0100 msvcrt: Implement vfprintf_s and vfwprintf_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/file.c | 72 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 4 +- include/msvcrt/stdio.h | 2 + include/msvcrt/wchar.h | 1 + 7 files changed, 80 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2382e20..1c8dc12 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1617,9 +1617,9 @@ @ cdecl ungetc(long ptr) msvcrt.ungetc @ cdecl ungetwc(long ptr) msvcrt.ungetwc @ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf -@ stub vfprintf_s +@ cdecl vfprintf_s(ptr str ptr) msvcrt.vfprintf_s @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf -@ stub vfwprintf_s +@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf @ stub vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5e52a28..3bee113 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1471,9 +1471,9 @@ @ cdecl ungetc(long ptr) msvcrt.ungetc @ cdecl ungetwc(long ptr) msvcrt.ungetwc @ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf -@ stub vfprintf_s +@ cdecl vfprintf_s(ptr str ptr) msvcrt.vfprintf_s @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf -@ stub vfwprintf_s +@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf @ stub vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6b2d664..536db47 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1455,9 +1455,9 @@ @ cdecl ungetc(long ptr) msvcrt.ungetc @ cdecl ungetwc(long ptr) msvcrt.ungetwc @ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf -@ stub vfprintf_s +@ cdecl vfprintf_s(ptr str ptr) msvcrt.vfprintf_s @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf -@ stub vfwprintf_s +@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vprintf(str ptr) msvcrt.vprintf @ stub vprintf_s @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 91cd448..0c60bdc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3362,10 +3362,46 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va } /********************************************************************* + * vfprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) +{ + char buf[2048]; + LPWSTR formatW = NULL; + DWORD sz; + pf_output out; + int written, retval; + + if( !MSVCRT_CHECK_PMT( file != NULL ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + out.unicode = FALSE; + out.buf.A = out.grow.A = buf; + out.used = 0; + out.len = sizeof(buf); + + sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); + formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); + + if ((written = pf_vsnprintf( &out, formatW, NULL, TRUE, valist )) >= 0) + { + retval = MSVCRT_fwrite(out.buf.A, sizeof(*out.buf.A), written, file); + } + else retval = -1; + + HeapFree( GetProcessHeap(), 0, formatW ); + + if (out.buf.A != out.grow.A) + MSVCRT_free (out.buf.A); + return retval; +} + +/********************************************************************* * vfwprintf (MSVCRT.@) - * FIXME: - * Is final char included in written (then resize is too big) or not - * (then we must test for equality too)? */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { @@ -3389,6 +3425,36 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms } /********************************************************************* + * vfwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + MSVCRT_wchar_t buf[2048]; + pf_output out; + int written, retval; + + if( !MSVCRT_CHECK_PMT( file != NULL ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + out.unicode = TRUE; + out.buf.W = out.grow.W = buf; + out.used = 0; + out.len = sizeof(buf) / sizeof(buf[0]); + + if ((written = pf_vsnprintf( &out, format, NULL, TRUE, valist )) >= 0) + { + retval = MSVCRT_fwrite(out.buf.W, sizeof(*out.buf.W), written, file); + } + else retval = -1; + if (out.buf.W != out.grow.W) + MSVCRT_free (out.buf.W); + return retval; +} + +/********************************************************************* * vprintf (MSVCRT.@) */ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 11d0a49..b6d1f10 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,9 +1422,9 @@ @ cdecl ungetwc(long ptr) MSVCRT_ungetwc # stub utime @ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf -# stub vfprintf_s +@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s @ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf -# stub vfwprintf_s +@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s @ cdecl vprintf(str ptr) MSVCRT_vprintf # stub vprintf_s # stub vsnprintf diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a190f5d..e27c8ca 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -166,6 +166,7 @@ FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); int __cdecl vfprintf(FILE*,const char*,__ms_va_list); +int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); @@ -212,6 +213,7 @@ int __cdecl swscanf(const wchar_t*,const wchar_t*,...); int __cdecl swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); +int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index c5ab25f..7c495f0 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -310,6 +310,7 @@ int __cdecl swscanf(const wchar_t*,const wchar_t*,...); int __cdecl swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); +int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list);

1 0

Maarten Lankhorst : quartz: Add support for fullscreen mode in video renderer.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: ab2e5c0499afef511f37bf87bcc05d0dec347703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2e5c0499afef511f37bf87b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 25 00:11:53 2010 +0100 quartz: Add support for fullscreen mode in video renderer. --- dlls/quartz/videorenderer.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index d26ecb5..31c9ab5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,6 +82,7 @@ typedef struct VideoRendererImpl BOOL ThreadResult; HWND hWnd; HWND hWndMsgDrain; + HWND hWndOwner; BOOL AutoShow; RECT SourceRect; RECT DestRect; @@ -555,7 +556,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); - pVideoRenderer->hWndMsgDrain = NULL; + pVideoRenderer->hWndMsgDrain = pVideoRenderer->hWndOwner = NULL; pVideoRenderer->WindowStyle = WS_OVERLAPPED; /* construct input pin */ @@ -1890,7 +1891,8 @@ static HRESULT WINAPI Videowindow_put_Owner(IVideoWindow *iface, TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner); - SetParent(This->hWnd, (HWND)Owner); + This->hWndOwner = (HWND)Owner; + SetParent(This->hWnd, This->hWndOwner); if (This->WindowStyle & WS_CHILD) { LONG old = GetWindowLongA(This->hWnd, GWL_STYLE); @@ -1910,7 +1912,7 @@ static HRESULT WINAPI Videowindow_get_Owner(IVideoWindow *iface, TRACE("(%p/%p)->(%p)\n", This, iface, Owner); - *(HWND*)Owner = GetParent(This->hWnd); + *(HWND*)Owner = This->hWndOwner; return S_OK; } @@ -1970,6 +1972,22 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); + if (FullScreenMode) { + ShowWindow(This->hWnd, SW_HIDE); + SetParent(This->hWnd, 0); + SetWindowLongA(This->hWnd, GWL_STYLE, WS_POPUP); + SetWindowPos(This->hWnd,HWND_TOP,0,0,GetSystemMetrics(SM_CXSCREEN),GetSystemMetrics(SM_CYSCREEN),SWP_SHOWWINDOW); + GetWindowRect(This->hWnd, &This->DestRect); + This->WindowPos = This->DestRect; + } else { + ShowWindow(This->hWnd, SW_HIDE); + SetParent(This->hWnd, This->hWndOwner); + SetWindowLongA(This->hWnd, GWL_STYLE, This->WindowStyle); + GetClientRect(This->hWnd, &This->DestRect); + SetWindowPos(This->hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); + This->WindowPos = This->DestRect; + } + return S_OK; }

1 0

Piotr Caban : msvcrt: Fix errors in spec files.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 28d355966d1759bc512acda9e425a7a6a78f5dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d355966d1759bc512acda9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 23:12:58 2010 +0100 msvcrt: Fix errors in spec files. --- dlls/msvcp80/msvcp80.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index d7aa771..585b436 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -801,7 +801,7 @@ @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@I_W@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W0@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@I_WABV?$allocator@_W@1@@Z -@ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z(ptr wstr) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z +@ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z(ptr wstr) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W0@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_WAEBV?$allocator@_W@1@@Z @ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z(ptr wstr) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z @@ -2911,7 +2911,7 @@ @ thiscall -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@@Z(ptr ptr) msvcp90.?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@@Z @ cdecl -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) msvcp90.?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@@Z @ thiscall -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@II@Z(ptr ptr long long) msvcp90.?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@II@Z -@ cdecl -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) msvcp90.?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@II@Z +@ cdecl -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) msvcp90.?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@_K1@Z @ stub -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@I_W@Z @ stub -arch=win64 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W0@Z @ stub -arch=win32 ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@PB_W0@Z @@ -2931,8 +2931,8 @@ @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD0@Z @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z(ptr str) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z @ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(ptr str) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z -@ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z(ptr ptr long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z -@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr ptr long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z +@ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z(ptr str long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z +@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr str long) msvcp90.?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z @ stub -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z @ stub -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z @@ -3079,7 +3079,7 @@ @ stub -arch=win32 ?close@?$messages@_W@std@@QBEXH@Z @ stub -arch=win64 ?close@?$messages@_W@std@@QEBAXH@Z @ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z -@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z @ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z @ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z @ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z @@ -5478,7 +5478,7 @@ @ stub -arch=win32 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEGXZ @ stub -arch=win64 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAAGXZ @ thiscall -arch=win32 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z -@ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z (ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z +@ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z @ thiscall -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e71b31..2382e20 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1274,7 +1274,7 @@ @ stub _vwprintf_p_l @ stub _vwprintf_s_l @ cdecl _waccess(wstr long) msvcrt._waccess -@ cdecl _waccess_s(wstr long) msvcrt.waccess_s +@ cdecl _waccess_s(wstr long) msvcrt._waccess_s @ cdecl _wasctime(ptr) msvcrt._wasctime @ stub _wasctime_s @ stub _wassert

1 0

Michael Stefaniuc : msxml3: Remove dead code: break after return (Smatch).
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 828fff8c8bcd3595f51c1073600a38af9616b486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828fff8c8bcd3595f51c10736… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 24 23:11:44 2010 +0100 msxml3: Remove dead code: break after return (Smatch). --- dlls/msxml3/schema.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index cddbc5c..fa609a9 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -590,7 +590,6 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) { case DT_INVALID: return E_FAIL; - break; case DT_BIN_BASE64: case DT_BIN_HEX: case DT_BOOLEAN: @@ -637,11 +636,9 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) hr = S_OK; } return hr; - break; default: FIXME("need to handle dt:%s\n", dt_to_str(dt)); return S_OK; - break; } }

1 0

Adam Martinson : msxml3: Store the DOMDocument/ XMLSchemaCache object version.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 459c29ba3451b9f0b973cea3235f7d43ee31db44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459c29ba3451b9f0b973cea32… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:53:47 2010 -0600 msxml3: Store the DOMDocument/XMLSchemaCache object version. --- dlls/msxml3/domdoc.c | 36 +++++++++++++++++++++--------- dlls/msxml3/factory.c | 3 +- dlls/msxml3/msxml_private.h | 51 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/schema.c | 38 ++++++++++++++++++++----------- 4 files changed, 100 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=459c29ba3451b9f0b973c…

1 0

Adam Martinson : msxml3/schema: Properly handle schema_cache_add() from a URL.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 10e2d26e3f6a1041c49c98a32e9906cefa63a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e2d26e3f6a1041c49c98a32… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:53:38 2010 -0600 msxml3/schema: Properly handle schema_cache_add() from a URL. --- dlls/msxml3/schema.c | 85 +++++++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index fd56aeb..eb6b6d3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -818,38 +818,6 @@ static BOOL link_datatypes(xmlDocPtr schema) return TRUE; } -static cache_entry* cache_entry_from_url(char const* url, xmlChar const* nsURI) -{ - cache_entry* entry = heap_alloc(sizeof(cache_entry)); - xmlSchemaParserCtxtPtr spctx = xmlSchemaNewParserCtxt(url); - entry->type = SCHEMA_TYPE_XSD; - entry->ref = 0; - if (spctx) - { - if((entry->schema = Schema_parse(spctx))) - { - /* TODO: if the nsURI is different from the default xmlns or targetNamespace, - * do we need to do something special here? */ - xmldoc_init(entry->schema->doc, &CLSID_DOMDocument40); - entry->doc = entry->schema->doc; - xmldoc_add_ref(entry->doc); - } - else - { - heap_free(entry); - entry = NULL; - } - xmlSchemaFreeParserCtxt(spctx); - } - else - { - FIXME("schema for nsURI %s not found\n", wine_dbgstr_a(url)); - heap_free(entry); - entry = NULL; - } - return entry; -} - static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI) { cache_entry* entry = heap_alloc(sizeof(cache_entry)); @@ -914,6 +882,55 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI return entry; } +static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI) +{ + cache_entry* entry; + IXMLDOMDocument3* domdoc = NULL; + xmlDocPtr doc = NULL; + HRESULT hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&domdoc); + VARIANT_BOOL b = VARIANT_FALSE; + SCHEMA_TYPE type = SCHEMA_TYPE_INVALID; + + if (hr != S_OK) + { + FIXME("failed to create domdoc\n"); + return NULL; + } + assert(domdoc != NULL); + assert(V_VT(&url) == VT_BSTR); + + hr = IXMLDOMDocument3_load(domdoc, url, &b); + if (hr != S_OK) + { + ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); + if (b != VARIANT_TRUE) + { + FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url))); + IXMLDOMDocument3_Release(domdoc); + return NULL; + } + } + doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc; + type = schema_type_from_xmlDocPtr(doc); + + switch (type) + { + case SCHEMA_TYPE_XSD: + entry = cache_entry_from_xsd_doc(doc, nsURI); + break; + case SCHEMA_TYPE_XDR: + entry = cache_entry_from_xdr_doc(doc, nsURI); + break; + case SCHEMA_TYPE_INVALID: + entry = NULL; + FIXME("invalid schema\n"); + break; + } + IXMLDOMDocument3_Release(domdoc); + + return entry; +} + static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* iface, REFIID riid, void** ppvObject) { @@ -1056,9 +1073,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri case VT_BSTR: { - xmlChar* url = xmlChar_from_wchar(V_BSTR(&var)); - cache_entry* entry = cache_entry_from_url((char const*)url, name); - heap_free(url); + cache_entry* entry = cache_entry_from_url(var, name); if (entry) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010