wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Austin English : wsnmp32: Add stub for SnmpOpen.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 80c3a8f8bc58fff8725f52e23a4f9860af0f95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3a8f8bc58fff8725f52e23… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:12:16 2014 -0500 wsnmp32: Add stub for SnmpOpen. --- dlls/wsnmp32/wsnmp32.c | 6 ++++++ dlls/wsnmp32/wsnmp32.spec | 2 +- include/winsnmp.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 721842f..3dc54cb 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -45,6 +45,12 @@ SNMPAPI_STATUS WINAPI SnmpCleanup( void ) return SNMPAPI_SUCCESS; } +HSNMP_SESSION WINAPI SnmpOpen( HWND hwnd, UINT msg ) +{ + FIXME( "%p %u\n", hwnd, msg ); + return SNMPAPI_FAILURE; +} + SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode( smiUINT32 retransmit_mode ) { FIXME( "%u\n", retransmit_mode ); diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec index 197092a..61e48ba 100644 --- a/dlls/wsnmp32/wsnmp32.spec +++ b/dlls/wsnmp32/wsnmp32.spec @@ -11,7 +11,7 @@ 120 stub SnmpGetVendorInfo 200 stdcall SnmpStartup(ptr ptr ptr ptr ptr) 201 stdcall SnmpCleanup() -202 stub SnmpOpen +202 stdcall SnmpOpen(ptr long) 203 stub SnmpClose 204 stub SnmpSendMsg 205 stub SnmpRecvMsg diff --git a/include/winsnmp.h b/include/winsnmp.h index 64765de..79a5e88 100644 --- a/include/winsnmp.h +++ b/include/winsnmp.h @@ -27,6 +27,7 @@ typedef int smiINT, *smiLPINT; typedef smiINT smiINT32, *smiLPINT32; typedef unsigned int smiUINT32, *smiLPUINT32; typedef smiUINT32 SNMPAPI_STATUS; +typedef HANDLE HSNMP_SESSION; #define SNMPAPI_NO_SUPPORT 0 #define SNMPAPI_V1_SUPPORT 1 @@ -44,6 +45,7 @@ typedef smiUINT32 SNMPAPI_STATUS; #define SNMPAPI_SUCCESS 1 SNMPAPI_STATUS WINAPI SnmpCleanup(void); +HSNMP_SESSION WINAPI SnmpOpen(HWND,UINT); SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpSetTranslateMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32);

1 0

YongHao Hu : msvcp90/tests: Add cout<< float test.
by Alexandre Julliard 08 Oct '14

08 Oct '14

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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@N@Z"); @@ -796,6 +805,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAAAAV01@M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAAAAV01@N@Z"); @@ -909,6 +921,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@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 08 Oct '14

08 Oct '14

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

Austin English : kernel32: Add a stub for SetSystemFileCacheSize.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 96e920e01f90a2d9c343ad57986f8bf0ad1eb63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e920e01f90a2d9c343ad579… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:35:03 2014 -0500 kernel32: Add a stub for SetSystemFileCacheSize. --- .../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 f0cd496..5d3eb13 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 @@ -16,7 +16,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stub SetProcessWorkingSetSizeEx -@ stub SetSystemFileCacheSize +@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5a16a12..9037f8e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1454,3 +1454,10 @@ BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD fl SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags) +{ + FIXME("stub: %ld %ld %d\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e82a64d..d08f90c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,6 +1167,7 @@ @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) @ stdcall SetStdHandle(long long) +@ stdcall SetSystemFileCacheSize(long long long) @ stdcall SetSystemPowerState(long long) @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long)

1 0

Austin English : kernel32: Add a stub for GetSystemFileCacheSize.
by Alexandre Julliard 08 Oct '14

08 Oct '14

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 08 Oct '14

08 Oct '14

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 08 Oct '14

08 Oct '14

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

André Hentschel : winedump: Update minidump output.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: fdc7728219835e0223ea46543e8dad19e41b6777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc7728219835e0223ea46543… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:54:38 2014 +0200 winedump: Update minidump output. --- tools/winedump/minidump.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 321264b..2641868 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -342,10 +342,19 @@ void mdmp_dump(void) break; case 1: if (msi->u.s.ProductType == 1) str = "Win7"; - else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else if (msi->u.s.ProductType == 3) str = "Server 2008 R2"; + else str = "6-????"; + break; + case 2: + if (msi->u.s.ProductType == 1) str = "Win8"; + else if (msi->u.s.ProductType == 3) str = "Server 2012"; + else str = "6-????"; + break; + case 3: + if (msi->u.s.ProductType == 1) str = "Win8.1"; + else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; else str = "6-????"; break; - case 2: str = "Win8"; break; default: str = "6-????"; break; } break;

1 0

Henri Verbeet : wined3d: Track format conversion per-texture.
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 710694d9ca654f3d01a74a06240b0c6252b135be URL: http://source.winehq.org/git/wine.git/?a=commit;h=710694d9ca654f3d01a74a062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:22 2014 +0200 wined3d: Track format conversion per-texture. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 16 +++++++++------- dlls/wined3d/texture.c | 17 ++++++----------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 52b9d9d..6fbe296 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->flags & SFLAG_CONVERTED) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) { gl_info->gl_ops.gl.p_glEnable(textype); checkGLcall("glEnable(textype)"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0967220..527601f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -588,11 +588,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: - * SFLAG_CONVERTED: Converting the data back would take too long + * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count || surface->flags & (SFLAG_CONVERTED | SFLAG_DYNLOCK - | SFLAG_CLIENT | SFLAG_PIN_SYSMEM)) + if (surface->resource.map_count + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) + || surface->container->flags & WINED3D_TEXTURE_CONVERTED) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1323,7 +1324,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ - if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -4189,8 +4190,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, format = *wined3d_get_format(gl_info, conversion->dst_format); /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting - * called. */ + * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is + * getting called. */ if ((format.convert || conversion) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); @@ -5285,7 +5286,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert + if (dst_surface->container->flags & WINED3D_TEXTURE_CONVERTED + || dst_surface->container->resource.format->convert || wined3d_format_get_color_key_conversion(dst_surface->container, TRUE)) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bc75305..fb0f0e8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -765,7 +765,7 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED | WINED3D_TEXTURE_CONVERTED); for (i = 0; i < sub_count; ++i) { texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], @@ -850,7 +850,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_color_key_conversion *conversion; - BOOL converted = FALSE; GLenum internal; UINT i; @@ -858,11 +857,11 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (format->convert) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; } else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; format = wined3d_get_format(gl_info, conversion->dst_format); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } @@ -889,11 +888,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLsizei width = surface->pow2Width; const BYTE *mem = NULL; - if (converted) - surface->flags |= SFLAG_CONVERTED; - else - surface->flags &= ~SFLAG_CONVERTED; - if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; @@ -905,13 +899,14 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (gl_info->supported[APPLE_CLIENT_STORAGE]) { - if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) + if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION) + || texture->flags & WINED3D_TEXTURE_CONVERTED || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... - * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface + * WINED3D_TEXTURE_CONVERTED: The conversion destination memory is freed after loading the surface * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ec5088..810da0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2128,6 +2128,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_RGB_VALID 0x00000010 #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 +#define WINED3D_TEXTURE_CONVERTED 0x00000080 struct wined3d_texture { @@ -2345,7 +2346,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; /* Surface flags: */ -#define SFLAG_CONVERTED 0x00000001 /* Converted for color keying or palettized. */ +#define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ @@ -2355,7 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Only prepare the texture in device_update_volume( ).
by Alexandre Julliard 08 Oct '14

08 Oct '14

Module: wine Branch: master Commit: 4c454fd4abc29a8a45ef35c97a52dfe5070993cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c454fd4abc29a8a45ef35c97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:21 2014 +0200 wined3d: Only prepare the texture in device_update_volume(). --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa97c7d..ee3636e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3481,7 +3481,8 @@ static HRESULT device_update_volume(struct wined3d_device *device, context = context_acquire(device, NULL); - wined3d_volume_load(dst_volume, context, FALSE); + /* Only a prepare, since we're uploading the entire volume. */ + wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
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 October 2014