October 2014 - Wine-Commits

Nikolay Sivov : dwrite: Block attempts of registering local file loader.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 5b10a69c3ad3ffd4f27b892ba37164ac76be20c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b10a69c3ad3ffd4f27b892ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:24:47 2014 +0300 dwrite: Block attempts of registering local file loader. --- dlls/dwrite/main.c | 6 ++++++ dlls/dwrite/tests/font.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1e10431..05d853f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -813,6 +813,9 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + if (factory_get_file_loader(This, loader)) return DWRITE_E_ALREADYREGISTERED; @@ -838,6 +841,9 @@ static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *ifa if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + found = factory_get_file_loader(This, loader); if (!found) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2b84ba1..d9e927f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -885,8 +885,7 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); + factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); ok(coll2 != collection, "got %p, was %p\n", coll2, collection); @@ -943,6 +942,19 @@ if (file) { ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + + /* try with a different factory */ + factory2 = create_factory(); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory2); + IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Nikolay Sivov : dwrite/tests: Fix recently inroduced test failure.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: be69977cd5abc1620be87e777dbf29630fe4e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be69977cd5abc1620be87e777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 26 20:49:26 2014 +0300 dwrite/tests: Fix recently inroduced test failure. --- dlls/dwrite/tests/font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3830bc9..2b84ba1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1200,8 +1200,12 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFace_Release(face2); /* file was created with different factory */ + face2 = NULL; hr = IDWriteFactory_CreateFontFace(factory2, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face2); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (face2) + IDWriteFontFace_Release(face2); file2 = NULL; hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);

1 0

Iván Matellanes : msvcrt: Added _fflush_nolock implementation.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 4bb80afedcca6bdc510574488258ef1a16e4167f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb80afedcca6bdc510574488… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Oct 20 21:03:16 2014 +0200 msvcrt: Added _fflush_nolock implementation. Thanks to Piotr Caban for the test. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 20 ++++++++++++++++++++ dlls/msvcrt/file.c | 24 +++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a36661..9b6de75 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -799,7 +799,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d6b1a18..cf7beb5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1147,7 +1147,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 237539b..bb26bcc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -466,7 +466,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b810c5f..34a90e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -448,7 +448,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0a81edc..9bb29da 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -121,6 +121,7 @@ static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); +static int (__cdecl *p_fflush_nolock)(FILE*); /* make sure we use the correct errno */ #undef errno @@ -379,6 +380,7 @@ static BOOL init(void) SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); + SET(p_fflush_nolock, "_fflush_nolock"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1207,16 +1209,22 @@ struct block_file_arg FILE *write; HANDLE init; HANDLE finish; + int deadlock_test; }; static DWORD WINAPI block_file(void *arg) { struct block_file_arg *files = arg; + int deadlock_test; p_lock_file(files->read); p_lock_file(files->write); SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); + Sleep(200); + deadlock_test = InterlockedIncrement(&files->deadlock_test); + ok(deadlock_test == 1, "deadlock_test = %d\n", deadlock_test); p_unlock_file(files->read); p_unlock_file(files->write); return 0; @@ -1250,6 +1258,7 @@ static void test_nonblocking_file_access(void) arg.write = filew; arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.deadlock_test = 0; ok(arg.init != NULL, "CreateEventW failed\n"); ok(arg.finish != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); @@ -1276,7 +1285,18 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); + ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); + ret = p_fflush_nolock(filew); + ok(ret==0, "_fflush_nolock(filew) returned %d\n", ret); + SetEvent(arg.finish); + + ret = p_fflush_nolock(NULL); + ok(ret==0, "_fflush_nolock(NULL) returned %d\n", ret); + ret = InterlockedIncrement(&arg.deadlock_test); + ok(ret==2, "InterlockedIncrement returned %d\n", ret); + WaitForSingleObject(thread, INFINITE); CloseHandle(arg.init); CloseHandle(arg.finish); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2dd4da5..2e07342 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -919,24 +919,38 @@ int CDECL MSVCRT__flushall(void) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { + int ret; + + if(!file) { + msvcrt_flush_all_buffers(MSVCRT__IOWRT); + ret = 0; + } else { + MSVCRT__lock_file(file); + ret = MSVCRT__fflush_nolock(file); + MSVCRT__unlock_file(file); + } + + return ret; +} + +/********************************************************************* + * _fflush_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) +{ if(!file) { msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; - MSVCRT__lock_file(file); res = msvcrt_flush_buffer(file); - if(!res && (file->_flag & MSVCRT__IOCOMMIT)) res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; - MSVCRT__unlock_file(file); return res; } else if(file->_flag & MSVCRT__IOREAD) { - MSVCRT__lock_file(file); file->_cnt = 0; file->_ptr = file->_base; - MSVCRT__unlock_file(file); return 0; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 85484bc..9f00923 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -931,6 +931,7 @@ MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSV MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); +int __cdecl MSVCRT__fflush_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 1c154fc..305d251 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fflush_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Stefan Dösinger : wined3d: Update AMD drivers.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: c35f0161c0803a4f16c963f4ba06cb2077202386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35f0161c0803a4f16c963f4b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 24 11:28:57 2014 +0200 wined3d: Update AMD drivers. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a10d60e..d428d94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1166,9 +1166,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, {DRIVER_AMD_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, - {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, + {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Alexandre Julliard : msvcp90: Add inline wrappers for the memcpy_s/ memmove_s/mbstowcs_s functions.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 4b1aba754e5aab84fe74f595fb305f5293a29589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1aba754e5aab84fe74f595f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:47:03 2014 +0900 msvcp90: Add inline wrappers for the memcpy_s/memmove_s/mbstowcs_s functions. --- dlls/msvcp90/msvcp90.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0a60d46..d7c0a31 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -562,8 +562,23 @@ typedef struct { } complex_double; #if _MSVCP_VER < 80 -#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) -#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) -#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ), 0) +static inline int memcpy_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memcpy( dst, src, count ); + return 0; +} +static inline int memmove_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memmove( dst, src, count ); + return 0; +} +static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, const char *mbs, size_t count ) +{ + mbstowcs( wcs, mbs, count ); + return 0; +} +#define memcpy_s( dst, size, src, count ) memcpy_wrapper( dst, size, src, count ) +#define memmove_s( dst, size, src, count ) memmove_wrapper( dst, size, src, count ) +#define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count ) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif

1 0

Austin English : kernel32: Add a stub for CancelTimerQueueTimer.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 1ade676968244d17a03647e8c8d93bab66429100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ade676968244d17a03647e8c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 25 01:03:01 2014 -0500 kernel32: Add a stub for CancelTimerQueueTimer. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d08f90c..2b01df1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -182,7 +182,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelTimerQueueTimer +@ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckNameLegalDOS8Dot3A diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d399b82..04b3270 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1300,6 +1300,15 @@ BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, } /*********************************************************************** + * CancelTimerQueueTimer (KERNEL32.@) + */ +BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) +{ + FIXME("stub: %p %p\n", queue, timer); + return FALSE; +} + +/*********************************************************************** * DeleteTimerQueueTimer (KERNEL32.@) * * Cancels a timer-queue timer.

1 0

Bruno Jesus : advapi32/tests: Add a test for enumerating a registry key without setting it.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: cbc8d290b9860e047ba21f70fe8672be325393b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc8d290b9860e047ba21f70f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 21:38:03 2014 -0200 advapi32/tests: Add a test for enumerating a registry key without setting it. --- dlls/advapi32/tests/registry.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 85f50ce..82391e1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -517,6 +517,33 @@ static void test_enum_value(void) res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + /* test reading the value and data without setting them */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); + ok( !strcmp( data, "xxxxxxxxxx" ), "data is '%s' instead of xxxxxxxxxx\n", data ); + + val_count = 20; + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); + ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); + ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); + ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); + ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); + res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res );

1 0

Bruno Jesus : wininet: Add more tests to InternetGetConnectedStateEx.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 3beee00a99e7b9145239433b49cdabc9eb64fb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beee00a99e7b9145239433b4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 19:36:47 2014 -0200 wininet: Add more tests to InternetGetConnectedStateEx. --- dlls/wininet/tests/internet.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 688f786..fc965e2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1556,6 +1556,12 @@ todo_wine sz = strlen(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1566,11 +1572,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == strlen(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(strlen(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenA(buffer)); + + flags = 0; + buffer[0] = 0xDE; + res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1623,6 +1652,12 @@ todo_wine sz = lstrlenW(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1633,11 +1668,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0xDEAD; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } /* ############################### */

1 0

André Hentschel : winedump: Ensure function order in a printf (PVS-Studio).
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 86c249760d6da8bfc6d0e009fb3a7db50c102307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c249760d6da8bfc6d0e009f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 17:55:11 2014 +0200 winedump: Ensure function order in a printf (PVS-Studio). --- tools/winedump/tlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 26da2a4..df1ea4b 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -647,7 +647,8 @@ static BOOL dump_msft_custdata(seg_t *seg) break; default: printf(": %x ", n); - printf("\\%2.2x \\%2.2x\n", tlb_read_byte(), tlb_read_byte()); + printf("\\%2.2x ", tlb_read_byte()); + printf("\\%2.2x\n", tlb_read_byte()); } }

1 0

Alexandre Julliard : gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 55f24da978c8ad6553a7b8fa874a60648dc61e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f24da978c8ad6553a7b8fa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 14:55:48 2014 +0900 gdi32: Check the hatch masks instead of the rop masks for the null and mask optimization case. --- dlls/gdi32/dibdrv/objects.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 1f05ab0..bc8b60d 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1815,6 +1815,8 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) size -= 4; } + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1861,6 +1863,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.funcs->create_rop_masks( &brush->dib, hatches[brush->hatch], &fg_mask, &bg_mask, &brush->masks ); + + if (!fg_mask.and && !bg_mask.and) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -1878,6 +1883,9 @@ static BOOL create_dither_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOO rgb = make_rgb_colorref( pdev->dev.hdc, &pdev->dib, brush->colorref, &got_pixel, &pixel ); brush->dib.funcs->create_dither_masks( &brush->dib, brush->rop, rgb, &brush->masks ); + + if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ + return TRUE; } @@ -2018,7 +2026,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, ERR("Unexpected brush style %d\n", brush->style); return FALSE; } - if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL; /* ignore the and mask */ } GetBrushOrgEx(pdev->dev.hdc, &origin);

1 0