October 2014 - Wine-Commits

André Hentschel : setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: f272c126072dc96da2c1fce1118b09e9126c3013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f272c126072dc96da2c1fce11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:27 2014 +0200 setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index e38f720..f442157 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -84,8 +84,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) setupapi.CM_Get_Device_Interface_List_SizeA +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 48ab1e4..4fcf298 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -95,8 +95,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index c07278e..673bbbf 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -367,6 +367,26 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI } /*********************************************************************** + * CM_Get_Device_Interface_List_SizeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DEVINSTID_A id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_a(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_Device_Interface_List_SizeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DEVINSTID_W id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_w(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_Device_Interface_List_Size_ExA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id,

1 0

YongHao Hu : msvcp90/tests: Add cout<< float test.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: d33ce5629f3482a3525316d12e94af21daf43745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ce5629f3482a3525316d12… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:48:06 2014 +0800 msvcp90/tests: Add cout<< float test. --- dlls/msvcp90/tests/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 6eb23a9..470dc37 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -464,6 +464,8 @@ static fpos_int* (*__thiscall p_basic_istream_wchar_tellg)(basic_istr static basic_istream_wchar* (*__cdecl p_basic_istream_wchar_getline_bstr_delim)(basic_istream_wchar*, basic_string_wchar*, wchar_t); /* ostream */ +static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_float)(basic_ostream_char*, float); + static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); static basic_ostream_wchar* (*__thiscall p_basic_ostream_wchar_print_double)(basic_ostream_wchar*, double); @@ -544,6 +546,7 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void /* to silence compiler errors */ static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); +static void * (WINAPI *call_thiscall_func2_ptr_flt)( void *func, void *this, float a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); static void init_thiscall_thunk(void) @@ -562,6 +565,7 @@ static void init_thiscall_thunk(void) call_thiscall_func5 = (void *)thunk; call_thiscall_func2_ptr_dbl = (void *)thunk; + call_thiscall_func2_ptr_flt = (void *)thunk; call_thiscall_func2_ptr_fpos = (void *)thunk; } @@ -574,6 +578,7 @@ static void init_thiscall_thunk(void) (const void*)(c), (const void *)(d)) #define call_func2_ptr_dbl(func,_this,a) call_thiscall_func2_ptr_dbl(func,_this,a) +#define call_func2_ptr_flt(func,_this,a) call_thiscall_func2_ptr_flt(func,_this,a) #define call_func2_ptr_fpos(func,_this,a) call_thiscall_func2_ptr_fpos(func,_this,a) #else @@ -586,6 +591,7 @@ static void init_thiscall_thunk(void) #define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #define call_func2_ptr_dbl call_func2 +#define call_func2_ptr_flt call_func2 #define call_func2_ptr_fpos call_func2 #endif /* __i386__ */ @@ -682,6 +688,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -796,6 +805,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)N@Z"); @@ -909,6 +921,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1951,6 +1966,26 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_float(void) +{ + static const char float_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + float val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_flt(p_basic_ostream_char_print_float, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(float_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + static void test_ostream_print_double(void) { static const char double_str[] = "3.14159"; @@ -2008,6 +2043,7 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double();

1 0

YongHao Hu : msvcp90/tests: Add cout<< double test.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: edb68e7b225f6a87cadd3db9fa256dce0e23938e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb68e7b225f6a87cadd3db9f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:47:21 2014 +0800 msvcp90/tests: Add cout<< double test. --- dlls/msvcp90/tests/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 76107b0..6eb23a9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1951,6 +1951,46 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_double(void) +{ + static const char double_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_dbl(p_basic_ostream_char_print_double, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(double_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + +static void test_ostream_wchar_print_double(void) +{ + static const wchar_t double_str[] = { '3', '.', '1', '4', '1', '5', '9', 0 }; + + basic_stringstream_wchar wss; + basic_string_wchar pwstr; + const wchar_t *wstr; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_wchar_ctor, &wss); + call_func2_ptr_dbl(p_basic_ostream_wchar_print_double, &wss.base.base2, val); + + call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); + wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); + + ok(!lstrcmpW(double_str, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); +} START_TEST(ios) { @@ -1968,6 +2008,8 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_double(); + test_ostream_wchar_print_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Nikolay Sivov : urlmon: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 8735cfc08693c9552ad98ceec95e2470a739a5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8735cfc08693c9552ad98ceec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:42:56 2014 +0400 urlmon: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/urlmon/sec_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e1c7ec8..cfc68de 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -740,7 +740,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(display_uri); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, display_uri, -1, (LPSTR)secid, len, NULL, NULL); @@ -776,7 +776,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(host); SysFreeString(scheme); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, scheme, -1, (LPSTR)secid, len, NULL, NULL);

1 0

Austin English : kernel32: Add a stub for GetSystemFileCacheSize.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 2a5299ea32a473dd6341ab6a1e55aa1634eaa677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5299ea32a473dd6341ab6a1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:34:51 2014 -0500 kernel32: Add a stub for GetSystemFileCacheSize. --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 891582a..f0cd496 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -5,7 +5,7 @@ @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile @ stub GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx -@ stub GetSystemFileCacheSize +@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index db1b401..5a16a12 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1447,3 +1447,10 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile, lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual ); } + +BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD flags) +{ + FIXME("stub: %p %p %p\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2de2119..e82a64d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -637,6 +637,7 @@ @ stdcall GetStringTypeExA(long long str long ptr) @ stdcall GetStringTypeExW(long long wstr long ptr) @ stdcall GetStringTypeW(long wstr long ptr) +@ stdcall GetSystemFileCacheSize(ptr ptr ptr) @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() @ stdcall GetSystemDefaultLocaleName(ptr long)

1 0

Iván Matellanes : msvcrt: Added _fclose_nolock() implementation.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 9fda14a9d62d5b30a4611eb45d1b8bd6c8db147e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fda14a9d62d5b30a4611eb45… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 7 13:35:29 2014 +0200 msvcrt: Added _fclose_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 84ddcc9..2796576 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -794,7 +794,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 36c4137..ae6c356 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1142,7 +1142,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1745f64..fc38453 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -461,7 +461,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ba3757a..4267c2c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -443,7 +443,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7ce8b59..c57861a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3373,9 +3373,22 @@ int CDECL MSVCRT__putw(int val, MSVCRT_FILE* file) */ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) { - int r, flag; + int ret; MSVCRT__lock_file(file); + ret = MSVCRT__fclose_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fclose_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file) +{ + int r, flag; + flag = file->_flag; MSVCRT_free(file->_tmpfname); file->_tmpfname = NULL; @@ -3386,9 +3399,7 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) MSVCRT_free(file->_base); r=MSVCRT__close(file->_file); - file->_flag = 0; - MSVCRT__unlock_file(file); return ((r == -1) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 54cd11a..200e35c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -926,6 +926,7 @@ MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); +int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); MSVCRT_clock_t __cdecl MSVCRT_clock(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 737003d..184dd2b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -129,6 +129,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*); +int __cdecl _fclose_nolock(FILE*); int __cdecl feof(FILE*); int __cdecl ferror(FILE*); int __cdecl fflush(FILE*);

1 0

Nikolay Sivov : dwrite: Pass stream pointer to OpenType parsing code.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 1e65a32e2659b667c47d6662089fd52c798a17d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e65a32e2659b667c47d66620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 14:14:51 2014 +0400 dwrite: Pass stream pointer to OpenType parsing code. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 15 +++++---------- dlls/dwrite/opentype.c | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 736292e..af3ae79 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -106,7 +106,7 @@ extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DE extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) DECLSPEC_HIDDEN; /* Opentype font table functions */ -extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; +extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; extern VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index def64ce..a00b784 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1276,12 +1276,10 @@ static HRESULT WINAPI dwritefontfile_GetLoader(IDWriteFontFile *iface, IDWriteFo static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSupportedFontType, DWRITE_FONT_FILE_TYPE *fontFileType, DWRITE_FONT_FACE_TYPE *fontFaceType, UINT32 *numberOfFaces) { - HRESULT hr; - const void *font_data; - void *context; + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); IDWriteFontFileStream *stream; + HRESULT hr; - struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); *isSupportedFontType = FALSE; @@ -1293,12 +1291,9 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); if (FAILED(hr)) return S_OK; - hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, 28, &context); - if (SUCCEEDED(hr)) - { - hr = analyze_opentype_font(font_data, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); - IDWriteFontFileStream_ReleaseFileFragment(stream, context); - } + + hr = opentype_analyze_font(stream, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); + /* TODO: Further Analysis */ IDWriteFontFileStream_Release(stream); return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 318adcf..26ad333 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -180,11 +180,19 @@ typedef struct } TT_OS2_V2; #include "poppack.h" -HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) +HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ - const char* tag = font_data; + const void *font_data; + const char* tag; + void *context; + HRESULT hr; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, sizeof(TTC_Header_V1), &context); + if (FAILED(hr)) + return hr; + + tag = font_data; *supported = FALSE; *file_type = DWRITE_FONT_FILE_TYPE_UNKNOWN; if (face_type) @@ -212,6 +220,8 @@ HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_ { *file_type = DWRITE_FONT_FILE_TYPE_CFF; } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); return S_OK; }

1 0

Nikolay Sivov : uxtheme: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: d861dc5e613f4c19644d3f71951f7b108d426323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d861dc5e613f4c19644d3f719… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:44:50 2014 +0400 uxtheme: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/uxtheme/tests/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index eab7b34..49eba64 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -474,9 +474,9 @@ static void test_GetCurrentThemeName(void) hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + ok(hRes == E_NOT_SUFFICIENT_BUFFER || broken(hRes == E_FAIL /* WinXP SP1 */), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + "Expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); @@ -486,9 +486,9 @@ static void test_GetCurrentThemeName(void) currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + ok(hRes == E_NOT_SUFFICIENT_BUFFER || broken(hRes == E_FAIL /* WinXP SP1 */), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + "Expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes);

1 0

Nikolay Sivov : msi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 8f971bfee6cb88b2f9048e274b701538688b1151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f971bfee6cb88b2f9048e274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:27:49 2014 +0400 msi: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/msi/assembly.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 2f321db..a25b19d 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -251,7 +251,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) { return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } @@ -357,7 +357,7 @@ static enum clr_version get_clr_version( const WCHAR *filename ) if (!pGetFileVersion) return CLR_VERSION_V10; hr = pGetFileVersion( filename, NULL, 0, &len ); - if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return CLR_VERSION_V11; + if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { hr = pGetFileVersion( filename, strW, len, &len );

1 0

Nikolay Sivov : dwrite: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 37a02acc6a727930295178bbcda239b4381bb1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a02acc6a727930295178bbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:38:34 2014 +0400 dwrite: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/tests/analyzer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5851e90..1a05335 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -860,7 +860,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; if (max_glyph_count < length) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (substitution) FIXME("number substitution is not supported.\n"); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 1add761..233f072 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1121,7 +1121,7 @@ static void test_GetGlyphs(void) sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), fontface, FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); if (0) { /* NULL fontface - crashes on Windows */

1 0