wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Iván Matellanes : msvcrt: Added _ungetc_nolock implementation.
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: 6f24dd9677563ccb0a0b033c0ba2597951221a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f24dd9677563ccb0a0b033c0… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Nov 4 22:52:03 2014 +0100 msvcrt: Added _ungetc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 22 +++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3f6a920..21d380e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1405,7 +1405,7 @@ @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s -@ stub _ungetc_nolock +@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) @ stub _ungetch_nolock @ stub _ungetwc_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a61f7eb..c33ce06 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1763,7 +1763,7 @@ @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s -@ stub _ungetc_nolock +@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) @ stub _ungetch_nolock @ stub _ungetwc_nolock diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9853ca..49d47e6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1777,7 +1777,7 @@ @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s -@ stub _ungetc_nolock +@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) @ stub _ungetch_nolock @ stub _ungetwc_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 700ce57..b9fa3cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1084,7 +1084,7 @@ @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s -@ stub _ungetc_nolock +@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) @ stub _ungetch_nolock @ stub _ungetwc_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 94ffa30..24302c3 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1060,7 +1060,7 @@ @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s -@ stub _ungetc_nolock +@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) @ stub _ungetch_nolock @ stub _ungetwc_nolock diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4fcd74f..9fc2652 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5002,13 +5002,28 @@ int CDECL MSVCRT_printf_s(const char *format, ...) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { + int ret; + + if(!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EOF; + + MSVCRT__lock_file(file); + ret = MSVCRT__ungetc_nolock(c, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _ungetc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__ungetc_nolock(int c, MSVCRT_FILE * file) +{ if(!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EOF; if (c == MSVCRT_EOF || !(file->_flag&MSVCRT__IOREAD || (file->_flag&MSVCRT__IORW && !(file->_flag&MSVCRT__IOWRT)))) return MSVCRT_EOF; - MSVCRT__lock_file(file); if((!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) @@ -5019,20 +5034,17 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) if(file->_flag & MSVCRT__IOSTRG) { if(*file->_ptr != c) { file->_ptr++; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } }else { *file->_ptr = c; } file->_cnt++; - MSVCRT_clearerr(file); + file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF); file->_flag |= MSVCRT__IOREAD; - MSVCRT__unlock_file(file); return c; } - MSVCRT__unlock_file(file); return MSVCRT_EOF; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d780f1b..e19928b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -919,6 +919,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT__fputc_nolock(int,MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); +int __cdecl MSVCRT__ungetc_nolock(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT__fputwc_nolock(MSVCRT_wint_t,MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index d4839cd..19fda94 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -137,6 +137,7 @@ int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); +int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*);

1 0

Iván Matellanes : msvcrt: Added _fputwc_nolock implementation.
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: b536ff62eff2e2eb214a39974d27fd3a6949fca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b536ff62eff2e2eb214a39974… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Nov 4 22:51:52 2014 +0100 msvcrt: Added _fputwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 20 ++++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9ad987d..3f6a920 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -832,7 +832,7 @@ @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar -@ stub _fputwc_nolock +@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a17d0d0..a61f7eb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1180,7 +1180,7 @@ @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar -@ stub _fputwc_nolock +@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 88753eb..c9853ca 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1178,7 +1178,7 @@ @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar -@ stub _fputwc_nolock +@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ee50c4f..700ce57 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -499,7 +499,7 @@ @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar -@ stub _fputwc_nolock +@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index acce962..94ffa30 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -481,7 +481,7 @@ @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar -@ stub _fputwc_nolock +@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bf00fbc..4fcd74f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3829,11 +3829,24 @@ MSVCRT_size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, MSVCRT_size_t size, M */ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file) { + MSVCRT_wint_t ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fputwc_nolock(wc, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fputwc_nolock (MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT__fputwc_nolock(MSVCRT_wint_t wc, MSVCRT_FILE* file) +{ MSVCRT_wchar_t mwc=wc; ioinfo *fdinfo; MSVCRT_wint_t ret; - MSVCRT__lock_file(file); fdinfo = msvcrt_get_ioinfo(file->_file); if((fdinfo->wxflag&WX_TEXT) && !(fdinfo->exflag&(EF_UTF8|EF_UTF16))) { @@ -3841,17 +3854,16 @@ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file) int char_len; char_len = MSVCRT_wctomb(buf, mwc); - if(char_len!=-1 && MSVCRT_fwrite(buf, char_len, 1, file)==1) + if(char_len!=-1 && MSVCRT__fwrite_nolock(buf, char_len, 1, file)==1) ret = wc; else ret = MSVCRT_WEOF; - }else if(MSVCRT_fwrite(&mwc, sizeof(mwc), 1, file) == 1) { + }else if(MSVCRT__fwrite_nolock(&mwc, sizeof(mwc), 1, file) == 1) { ret = wc; }else { ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 289c5bc..d780f1b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -921,6 +921,7 @@ int __cdecl MSVCRT__fputc_nolock(int,MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); +MSVCRT_wint_t __cdecl MSVCRT__fputwc_nolock(MSVCRT_wint_t,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 71e642a..d4839cd 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -199,6 +199,7 @@ unsigned int __cdecl _set_output_format(void); #define _WSTDIO_DEFINED wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); +wint_t __cdecl _fputwc_nolock(wint_t,FILE*); wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*);

1 0

Iván Matellanes : msvcrt: Added _fputc_nolock implementation.
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: 975a95a25b476f4501ecfa12b1b411e29e3ebaee URL: http://source.winehq.org/git/wine.git/?a=commit;h=975a95a25b476f4501ecfa12b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Nov 4 22:51:43 2014 +0100 msvcrt: Added _fputc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/file.c | 18 ++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 80d5bc9..9ad987d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -830,6 +830,7 @@ @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l +@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 283f5fd..a17d0d0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1178,6 +1178,7 @@ @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l +@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 46a5268..88753eb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1176,6 +1176,7 @@ @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l +@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a48e42b..ee50c4f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -497,6 +497,7 @@ @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l +@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e9abf00..acce962 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -479,6 +479,7 @@ @ stub _fprintf_p @ stub _fprintf_p_l @ stub _fprintf_s_l +@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fefab94..bf00fbc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3980,25 +3980,35 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, */ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fputc_nolock(c, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fputc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fputc_nolock(int c, MSVCRT_FILE* file) +{ int res; - MSVCRT__lock_file(file); if(file->_cnt>0) { *file->_ptr++=c; file->_cnt--; if (c == '\n') { res = msvcrt_flush_buffer(file); - MSVCRT__unlock_file(file); return res ? res : c; } else { - MSVCRT__unlock_file(file); return c & 0xff; } } else { res = MSVCRT__flsbuf(c, file); - MSVCRT__unlock_file(file); return res; } } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 256a90c..289c5bc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -917,6 +917,7 @@ void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); +int __cdecl MSVCRT__fputc_nolock(int,MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 768b3a0..71e642a 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -132,6 +132,7 @@ size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); int __cdecl _fgetc_nolock(FILE*); +int __cdecl _fputc_nolock(int,FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Guillaume Charifi : oleaut32: Implement TLB dependencies lookup in resources.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 9e4590ff671f7357c7574599ca163fed5e180661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4590ff671f7357c7574599c… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sat Nov 1 08:47:44 2014 +0100 oleaut32: Implement TLB dependencies lookup in resources. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib.c | 70 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 728185a..45a56ea 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5594,7 +5594,7 @@ static void test_dep(void) { ok(hr == S_OK, "got: %x\n", hr); hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); - todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); ITypeInfo_Release(ptInfo); if(ptInfoExt) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 00f5043..9d0d5d0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7572,6 +7572,45 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, return E_FAIL; } +struct search_res_tlb_params +{ + const GUID *guid; + ITypeLib *pTLib; +}; + +static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) +{ + struct search_res_tlb_params *params = (LPVOID)lParam; + static const WCHAR formatW[] = {'\\','%','d',0}; + WCHAR szPath[MAX_PATH+1]; + ITypeLib *pTLib = NULL; + HRESULT ret; + DWORD len; + + if (IS_INTRESOURCE(lpszName) == FALSE) + return TRUE; + + if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) + return TRUE; + + if (snprintfW(szPath + len, sizeof(szPath)/sizeof(WCHAR) - len, formatW, LOWORD(lpszName)) < 0) + return TRUE; + + ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); + if (SUCCEEDED(ret)) + { + ITypeLibImpl *impl = impl_from_ITypeLib(pTLib); + if (IsEqualGUID(params->guid, impl->guid)) + { + params->pTLib = pTLib; + return FALSE; /* stop enumeration */ + } + ITypeLib_Release(pTLib); + } + + return TRUE; +} + /* ITypeInfo::GetRefTypeInfo * * If a type description references other type descriptions, it retrieves @@ -7665,20 +7704,33 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_AddRef(pTLib); result = S_OK; } else { + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; + struct search_res_tlb_params params; BSTR libnam; TRACE("typeinfo in imported typelib that isn't already loaded\n"); - result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), - ref_type->pImpTLInfo->wVersionMajor, - ref_type->pImpTLInfo->wVersionMinor, - This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam, TRUE); - if(FAILED(result)) - libnam = SysAllocString(ref_type->pImpTLInfo->name); + /* Search in resource table */ + params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); + params.pTLib = NULL; + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + pTLib = params.pTLib; + result = S_OK; - result = LoadTypeLib(libnam, &pTLib); - SysFreeString(libnam); + if (!pTLib) + { + /* Search on disk */ + result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), + ref_type->pImpTLInfo->wVersionMajor, + ref_type->pImpTLInfo->wVersionMinor, + This->pTypeLib->syskind, + ref_type->pImpTLInfo->lcid, &libnam, TRUE); + if (FAILED(result)) + libnam = SysAllocString(ref_type->pImpTLInfo->name); + + result = LoadTypeLib(libnam, &pTLib); + SysFreeString(libnam); + } if(SUCCEEDED(result)) { ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);

1 0

Nikolay Sivov : dwrite/tests: Some tests for custom font collections.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 1ef30feba8c0e62c9d09b9b1b31c4ac6ec5c1f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef30feba8c0e62c9d09b9b1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:37:57 2014 +0300 dwrite/tests: Some tests for custom font collections. --- dlls/dwrite/tests/font.c | 319 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef30feba8c0e62c9d09b…

1 0

Nikolay Sivov : dwrite: Remove null checks for family and collection pointers, those are always set now.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 9045ab7f33ff6304e348fe43c8df1caae3213ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9045ab7f33ff6304e348fe43c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:37:10 2014 +0300 dwrite: Remove null checks for family and collection pointers, those are always set now. --- dlls/dwrite/font.c | 105 +++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ed0a760..c9edd91 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -127,8 +127,6 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); -static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,DWRITE_FONT_SIMULATIONS,IDWriteFont**); static HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**); static inline struct dwrite_fontface *impl_from_IDWriteFontFace2(IDWriteFontFace2 *iface) @@ -766,7 +764,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->family) IDWriteFontFamily_Release(This->family); + IDWriteFontFamily_Release(This->family); release_font_data(This->data); heap_free(This); } @@ -982,6 +980,28 @@ static const IDWriteFont2Vtbl dwritefontvtbl = { dwritefont2_IsColorFont }; +static HRESULT create_font(struct dwrite_font_data *data, IDWriteFontFamily *family, DWRITE_FONT_SIMULATIONS simulations, + IDWriteFont **font) +{ + struct dwrite_font *This; + *font = NULL; + + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; + This->ref = 1; + This->family = family; + IDWriteFontFamily_AddRef(family); + This->simulations = simulations; + This->data = data; + InterlockedIncrement(&This->data->ref); + + *font = (IDWriteFont*)&This->IDWriteFont2_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily *iface, REFIID riid, void **obj) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); @@ -1017,8 +1037,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { - if (This->collection) - IDWriteFontCollection_Release(This->collection); + IDWriteFontCollection_Release(This->collection); _free_fontfamily_data(This->data); heap_free(This); } @@ -1057,7 +1076,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 if (index >= This->data->font_count) return E_INVALIDARG; - return create_font_from_data(This->data->fonts[index], iface, DWRITE_FONT_SIMULATIONS_NONE, font); + return create_font(This->data->fonts[index], iface, DWRITE_FONT_SIMULATIONS_NONE, font); } static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) @@ -1104,7 +1123,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i This->data->fonts[found]->style == DWRITE_FONT_STYLE_ITALIC) { simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; } - return create_font_from_data(This->data->fonts[found], iface, simulations, font); + return create_font(This->data->fonts[found], iface, simulations, font); } else { *font = NULL; @@ -1132,6 +1151,27 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; +static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) +{ + struct dwrite_fontfamily *This; + + *family = NULL; + + This = heap_alloc(sizeof(struct dwrite_fontfamily)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; + This->ref = 1; + This->collection = collection; + IDWriteFontCollection_AddRef(collection); + This->data = data; + InterlockedIncrement(&This->data->ref); + + *family = &This->IDWriteFontFamily_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection *iface, REFIID riid, void **obj) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); @@ -1192,7 +1232,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * return E_FAIL; } - return create_fontfamily_from_data(This->family_data[index], iface, family); + return create_fontfamily(This->family_data[index], iface, family); } static HRESULT collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -1262,12 +1302,12 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!found_font) return E_INVALIDARG; - hr = create_fontfamily_from_data(found_family, iface, &family); + hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) return hr; simulations = IDWriteFontFace_GetSimulations(face); - hr = create_font_from_data(found_font, family, simulations, font); + hr = create_font(found_font, family, simulations, font); IDWriteFontFamily_Release(family); return hr; } @@ -1680,51 +1720,6 @@ HRESULT get_system_fontcollection(IDWriteFactory *factory, IDWriteFontCollection return hr; } -static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) -{ - struct dwrite_fontfamily *This; - - *family = NULL; - - This = heap_alloc(sizeof(struct dwrite_fontfamily)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; - This->ref = 1; - This->collection = collection; - if (collection) - IDWriteFontCollection_AddRef(collection); - This->data = data; - InterlockedIncrement(&This->data->ref); - - *family = &This->IDWriteFontFamily_iface; - - return S_OK; -} - -static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontFamily *family, DWRITE_FONT_SIMULATIONS simulations, - IDWriteFont **font) -{ - struct dwrite_font *This; - *font = NULL; - - This = heap_alloc(sizeof(struct dwrite_font)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->family = family; - if (family) - IDWriteFontFamily_AddRef(family); - This->simulations = simulations; - This->data = data; - InterlockedIncrement(&This->data->ref); - - *font = (IDWriteFont*)&This->IDWriteFont2_iface; - - return S_OK; -} - static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj) { struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface);

1 0

Nikolay Sivov : dwrite: Map Mac language id to locale name.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 3a2de7aef86f7eac9a38e98b2daf957686085915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2de7aef86f7eac9a38e98b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:36:16 2014 +0300 dwrite: Map Mac language id to locale name. --- dlls/dwrite/opentype.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 278 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 6d48f90..8a14336 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -262,6 +262,250 @@ enum TT_NAME_MAC_ENCODING_ID TT_NAME_MAC_ENCODING_UNINTERPRETED }; +enum TT_NAME_MAC_LANGUAGE_ID +{ + TT_NAME_MAC_LANGID_ENGLISH = 0, + TT_NAME_MAC_LANGID_FRENCH, + TT_NAME_MAC_LANGID_GERMAN, + TT_NAME_MAC_LANGID_ITALIAN, + TT_NAME_MAC_LANGID_DUTCH, + TT_NAME_MAC_LANGID_SWEDISH, + TT_NAME_MAC_LANGID_SPANISH, + TT_NAME_MAC_LANGID_DANISH, + TT_NAME_MAC_LANGID_PORTUGUESE, + TT_NAME_MAC_LANGID_NORWEGIAN, + TT_NAME_MAC_LANGID_HEBREW, + TT_NAME_MAC_LANGID_JAPANESE, + TT_NAME_MAC_LANGID_ARABIC, + TT_NAME_MAC_LANGID_FINNISH, + TT_NAME_MAC_LANGID_GREEK, + TT_NAME_MAC_LANGID_ICELANDIC, + TT_NAME_MAC_LANGID_MALTESE, + TT_NAME_MAC_LANGID_TURKISH, + TT_NAME_MAC_LANGID_CROATIAN, + TT_NAME_MAC_LANGID_TRAD_CHINESE, + TT_NAME_MAC_LANGID_URDU, + TT_NAME_MAC_LANGID_HINDI, + TT_NAME_MAC_LANGID_THAI, + TT_NAME_MAC_LANGID_KOREAN, + TT_NAME_MAC_LANGID_LITHUANIAN, + TT_NAME_MAC_LANGID_POLISH, + TT_NAME_MAC_LANGID_HUNGARIAN, + TT_NAME_MAC_LANGID_ESTONIAN, + TT_NAME_MAC_LANGID_LATVIAN, + TT_NAME_MAC_LANGID_SAMI, + TT_NAME_MAC_LANGID_FAROESE, + TT_NAME_MAC_LANGID_FARSI, + TT_NAME_MAC_LANGID_RUSSIAN, + TT_NAME_MAC_LANGID_SIMPL_CHINESE, + TT_NAME_MAC_LANGID_FLEMISH, + TT_NAME_MAC_LANGID_GAELIC, + TT_NAME_MAC_LANGID_ALBANIAN, + TT_NAME_MAC_LANGID_ROMANIAN, + TT_NAME_MAC_LANGID_CZECH, + TT_NAME_MAC_LANGID_SLOVAK, + TT_NAME_MAC_LANGID_SLOVENIAN, + TT_NAME_MAC_LANGID_YIDDISH, + TT_NAME_MAC_LANGID_SERBIAN, + TT_NAME_MAC_LANGID_MACEDONIAN, + TT_NAME_MAC_LANGID_BULGARIAN, + TT_NAME_MAC_LANGID_UKRAINIAN, + TT_NAME_MAC_LANGID_BYELORUSSIAN, + TT_NAME_MAC_LANGID_UZBEK, + TT_NAME_MAC_LANGID_KAZAKH, + TT_NAME_MAC_LANGID_AZERB_CYR, + TT_NAME_MAC_LANGID_AZERB_ARABIC, + TT_NAME_MAC_LANGID_ARMENIAN, + TT_NAME_MAC_LANGID_GEORGIAN, + TT_NAME_MAC_LANGID_MOLDAVIAN, + TT_NAME_MAC_LANGID_KIRGHIZ, + TT_NAME_MAC_LANGID_TAJIKI, + TT_NAME_MAC_LANGID_TURKMEN, + TT_NAME_MAC_LANGID_MONGOLIAN, + TT_NAME_MAC_LANGID_MONGOLIAN_CYR, + TT_NAME_MAC_LANGID_PASHTO, + TT_NAME_MAC_LANGID_KURDISH, + TT_NAME_MAC_LANGID_KASHMIRI, + TT_NAME_MAC_LANGID_SINDHI, + TT_NAME_MAC_LANGID_TIBETAN, + TT_NAME_MAC_LANGID_NEPALI, + TT_NAME_MAC_LANGID_SANSKRIT, + TT_NAME_MAC_LANGID_MARATHI, + TT_NAME_MAC_LANGID_BENGALI, + TT_NAME_MAC_LANGID_ASSAMESE, + TT_NAME_MAC_LANGID_GUJARATI, + TT_NAME_MAC_LANGID_PUNJABI, + TT_NAME_MAC_LANGID_ORIYA, + TT_NAME_MAC_LANGID_MALAYALAM, + TT_NAME_MAC_LANGID_KANNADA, + TT_NAME_MAC_LANGID_TAMIL, + TT_NAME_MAC_LANGID_TELUGU, + TT_NAME_MAC_LANGID_SINHALESE, + TT_NAME_MAC_LANGID_BURMESE, + TT_NAME_MAC_LANGID_KHMER, + TT_NAME_MAC_LANGID_LAO, + TT_NAME_MAC_LANGID_VIETNAMESE, + TT_NAME_MAC_LANGID_INDONESIAN, + TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_MALAY_ROMAN, + TT_NAME_MAC_LANGID_MALAY_ARABIC, + TT_NAME_MAC_LANGID_AMHARIC, + TT_NAME_MAC_LANGID_TIGRINYA, + TT_NAME_MAC_LANGID_GALLA, + TT_NAME_MAC_LANGID_SOMALI, + TT_NAME_MAC_LANGID_SWAHILI, + TT_NAME_MAC_LANGID_KINYARWANDA, + TT_NAME_MAC_LANGID_RUNDI, + TT_NAME_MAC_LANGID_NYANJA, + TT_NAME_MAC_LANGID_MALAGASY, + TT_NAME_MAC_LANGID_ESPERANTO, + TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_BASQUE, + TT_NAME_MAC_LANGID_CATALAN, + TT_NAME_MAC_LANGID_LATIN, + TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_GUARANI, + TT_NAME_MAC_LANGID_AYMARA, + TT_NAME_MAC_LANGID_TATAR, + TT_NAME_MAC_LANGID_UIGHUR, + TT_NAME_MAC_LANGID_DZONGKHA, + TT_NAME_MAC_LANGID_JAVANESE, + TT_NAME_MAC_LANGID_SUNDANESE, + TT_NAME_MAC_LANGID_GALICIAN, + TT_NAME_MAC_LANGID_AFRIKAANS, + TT_NAME_MAC_LANGID_BRETON, + TT_NAME_MAC_LANGID_INUKTITUT, + TT_NAME_MAC_LANGID_SCOTTISH_GAELIC, + TT_NAME_MAC_LANGID_MANX_GAELIC, + TT_NAME_MAC_LANGID_IRISH_GAELIC, + TT_NAME_MAC_LANGID_TONGAN, + TT_NAME_MAC_LANGID_GREEK_POLYTONIC, + TT_NAME_MAC_LANGID_GREENLANDIC, + TT_NAME_MAC_LANGID_AZER_ROMAN +}; + +/* Names are indexed with TT_NAME_MAC_LANGUAGE_ID values */ +static const char name_mac_langid_to_locale[][10] = { + "en-US", + "fr-FR", + "de-DE", + "it-IT", + "nl-NL", + "sv-SE", + "es-ES", + "da-DA", + "pt-PT", + "no-NO", + "he-IL", + "ja-JP", + "ar-AR", + "fi-FI", + "el-GR", + "is-IS", + "mt-MT", + "tr-TR", + "hr-HR", + "zh-HK", + "ur-PK", + "hi-IN", + "th-TH", + "ko-KR", + "lt-LT", + "pl-PL", + "hu-HU", + "et-EE", + "lv-LV", + "se-NO", + "fo-FO", + "fa-IR", + "ru-RU", + "zh-CN", + "nl-BE", + "gd-GB", + "sq-AL", + "ro-RO", + "cs-CZ", + "sk-SK", + "sl-SI", + "", + "sr-Latn", + "mk-MK", + "bg-BG", + "uk-UA", + "be-BY", + "uz-Latn", + "kk-KZ", + "az-Cyrl-AZ", + "az-AZ", + "hy-AM", + "ka-GE", + "", + "", + "tg-TJ", + "tk-TM", + "mn-Mong", + "mn-MN", + "ps-AF", + "ku-Arab", + "", + "sd-Arab", + "bo-CN", + "ne-NP", + "sa-IN", + "mr-IN", + "bn-IN", + "as-IN", + "gu-IN", + "pa-Arab", + "or-IN", + "ml-IN", + "kn-IN", + "ta-LK", + "te-IN", + "si-LK", + "", + "km-KH", + "lo-LA", + "vi-VN", + "id-ID", + "", + "ms-MY", + "ms-Arab", + "am-ET", + "ti-ET", + "", + "", + "sw-KE", + "rw-RW", + "", + "", + "", + "", + "cy-GB", + "eu-ES", + "ca-ES", + "", + "", + "", + "", + "tt-RU", + "ug-CN", + "", + "", + "", + "gl-ES", + "af-ZA", + "br-FR", + "iu-Latn-CA", + "gd-GB", + "", + "ga-IE", + "", + "", + "kl-GL", + "az-Latn" +}; + enum OPENTYPE_STRING_ID { OPENTYPE_STRING_COPYRIGHT_NOTICE = 0, @@ -737,6 +981,39 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT return codepage; } +static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT lang_id, WCHAR *locale, USHORT locale_len) +{ + static const WCHAR enusW[] = {'e','n','-','U','S',0}; + + switch (platform) { + case OPENTYPE_PLATFORM_MAC: + { + const char *locale_name = NULL; + + if (lang_id > TT_NAME_MAC_LANGID_AZER_ROMAN) + ERR("invalid mac lang id %d\n", lang_id); + else if (!name_mac_langid_to_locale[lang_id][0]) + FIXME("failed to map mac lang id %d to locale name\n", lang_id); + else + locale_name = name_mac_langid_to_locale[lang_id]; + + if (locale_name) + MultiByteToWideChar(CP_ACP, 0, name_mac_langid_to_locale[lang_id], -1, locale, locale_len); + else + strcpyW(locale, enusW); + break; + } + case OPENTYPE_PLATFORM_WIN: + if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, locale_len, 0)) { + FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); + strcpyW(locale, enusW); + } + break; + default: + FIXME("unknown platform %d\n", platform); + } +} + HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; @@ -790,6 +1067,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA UINT codepage; codepage = get_name_record_codepage(platform, encoding); + get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); @@ -806,12 +1084,6 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA name_string[i] = GET_BE_WORD(name_string[i]); } - if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, sizeof(locale)/sizeof(WCHAR), 0)) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; - FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); - strcpyW(locale, enusW); - } - TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); add_localizedstring(*strings, locale, name_string); heap_free(name_string);

1 0

Nikolay Sivov : msvcr120: Added VS2013 CRT dll.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: c8c810c21020bd0079ff0adcfee95eb53520a747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c810c21020bd0079ff0adcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:08:27 2014 +0300 msvcr120: Added VS2013 CRT dll. --- configure | 2 + configure.ac | 1 + dlls/msvcr120/Makefile.in | 34 + dlls/msvcr120/msvcr120.spec | 2489 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2526 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8c810c21020bd0079ff0…

1 0

Hans Leidekker : advapi32: Return success from LsaAddAccountRights.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 67e1cf839ac8724ec4158de9bdf2e1152c0ed0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e1cf839ac8724ec4158de9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:58:32 2014 +0100 advapi32: Return success from LsaAddAccountRights. --- dlls/advapi32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 483e902..2a8b791 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -118,7 +118,7 @@ NTSTATUS WINAPI LsaAddAccountRights( ULONG count) { FIXME("(%p,%p,%p,0x%08x) stub\n", policy, sid, rights, count); - return STATUS_OBJECT_NAME_NOT_FOUND; + return STATUS_SUCCESS; } /******************************************************************************

1 0

Hans Leidekker : msi: Call execute_script directly in InstallFinalize.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 609de1a80a6ea99523737c4ada266ddc069fb2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=609de1a80a6ea99523737c4ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 4 10:58:04 2014 +0100 msi: Call execute_script directly in InstallFinalize. --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 524c4f7..939e426 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5312,7 +5312,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) WCHAR *remove; /* first do the same as an InstallExecute */ - rc = ACTION_InstallExecute(package); + rc = execute_script(package, SCRIPT_INSTALL); if (rc != ERROR_SUCCESS) return rc;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
40
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 2014