January 2016 - Wine-Commits

Vincent Povirk : mscoree: Remove "Install Mono for Windows" message.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 26c9bd9f15c364215be9731bb050454c14d90767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c9bd9f15c364215be9731bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 9 16:16:24 2016 -0600 mscoree: Remove "Install Mono for Windows" message. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 35284b7..b0237b3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -126,11 +126,6 @@ static void CDECL set_print_handler_dummy(MonoPrintCallback callback) { } -static void missing_runtime_message(void) -{ - MESSAGE("wine: Install Mono for Windows to run .NET applications.\n"); -} - static HRESULT load_mono(LPCWSTR mono_path) { static const WCHAR lib[] = {'\\','l','i','b',0}; @@ -277,7 +272,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * if (!get_mono_path(mono_path)) { - missing_runtime_message(); + ERR("Wine Mono is not installed\n"); return CLR_E_SHIM_RUNTIME; } @@ -1306,8 +1301,6 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, } } - missing_runtime_message(); - return CLR_E_SHIM_RUNTIME; }

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayGetElemsize().
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 5f8f19299834ae03d46fc436925d8fd8fa2c0932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8f19299834ae03d46fc4369… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:48 2016 +0300 ole2disp: Implement SafeArrayGetElemsize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 0c033cd..20b7b6c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -99,6 +99,15 @@ USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetElemsize [OLE2DISP.18] + */ +USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cbElements; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 1fd2b0b..ca884a0 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -15,7 +15,7 @@ 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 -18 stub SAFEARRAYGETELEMSIZE +18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND 21 stub SAFEARRAYLOCK

1 0

Francois Gouget : kernel32/tests: Declare childPrintf() as a printf-style function.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: aea94f5134742567697289ffc44a8de13eff81c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea94f5134742567697289ffc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:43:04 2016 +0100 kernel32/tests: Declare childPrintf() as a printf-style function. And fix the corresponding warnings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index df0f2ec..23ade38 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -275,7 +275,7 @@ static void get_file_name(char* buf) * static void childPrintf * */ -static void childPrintf(HANDLE h, const char* fmt, ...) +static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { va_list valist; char buffer[1024+4*MAX_LISTED_ENV_VAR]; @@ -312,10 +312,10 @@ static void doChild(const char* file, const char* option) /* output of startup info (Ansi) */ GetStartupInfoA(&siA); childPrintf(hFile, - "[StartupInfoA]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" - "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" - "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" - "dwFlags=%lu\nwShowWindow=%u\n" + "[StartupInfoA]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n" + "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n" + "dwFlags=%u\nwShowWindow=%u\n" "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", siA.cb, encodeA(siA.lpDesktop), encodeA(siA.lpTitle), siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize, @@ -339,10 +339,10 @@ static void doChild(const char* file, const char* option) memset(&siW, 0, sizeof(siW)); GetStartupInfoW(&siW); childPrintf(hFile, - "[StartupInfoW]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" - "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" - "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" - "dwFlags=%lu\nwShowWindow=%u\n" + "[StartupInfoW]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n" + "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n" + "dwFlags=%u\nwShowWindow=%u\n" "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", siW.cb, encodeW(siW.lpDesktop), encodeW(siW.lpTitle), siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize, @@ -445,9 +445,9 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "InputCP=%d\nOutputCP=%d\n", GetConsoleCP(), GetConsoleOutputCP()); if (GetConsoleMode(hConIn, &modeIn)) - childPrintf(hFile, "InputMode=%ld\n", modeIn); + childPrintf(hFile, "InputMode=%u\n", modeIn); if (GetConsoleMode(hConOut, &modeOut)) - childPrintf(hFile, "OutputMode=%ld\n", modeOut); + childPrintf(hFile, "OutputMode=%u\n", modeOut); /* now that we have written all relevant information, let's change it */ SetLastError(0xdeadbeef);

1 0

Francois Gouget : tests: Use plain printf() calls instead of fprintf( stdout).
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 4a983e31187b754c29bf852dd4412be95d62d1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a983e31187b754c29bf852dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 13 12:41:42 2016 +0100 tests: Use plain printf() calls instead of fprintf(stdout). The fprintf() calls are a left-over from when errors were reported to stderr. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 65 +++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 567229a..a5b67a0 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -310,9 +310,9 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - fprintf( stdout, "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test succeeded inside todo block: ", + data->current_file, data->current_line ); + vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; } @@ -320,9 +320,9 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - fprintf( stdout, "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test marked todo: ", + data->current_file, data->current_line ); + vprintf(msg, args); } InterlockedIncrement(&todo_successes); return 1; @@ -332,17 +332,17 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - fprintf( stdout, "%s:%d: Test failed: ", - data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Test failed: ", + data->current_file, data->current_line ); + vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { if (report_success) - fprintf( stdout, "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + printf( "%s:%d: Test succeeded\n", + data->current_file, data->current_line); InterlockedIncrement(&successes); return 1; } @@ -365,9 +365,9 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_debug > 0) { - fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d: ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); - vfprintf(stdout, msg, valist); + vprintf(msg, valist); __winetest_va_end(valist); } } @@ -376,8 +376,8 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); - fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line ); - vfprintf(stdout, msg, args); + printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + vprintf(msg, args); skipped++; } @@ -447,7 +447,7 @@ void winetest_wait_child_process( HANDLE process ) DWORD exit_code = 1; if (WaitForSingleObject( process, 30000 )) - fprintf( stdout, "%s: child process wait failed\n", current_test->name ); + printf( "%s: child process wait failed\n", current_test->name ); else GetExitCodeProcess( process, &exit_code ); @@ -455,13 +455,13 @@ void winetest_wait_child_process( HANDLE process ) { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + printf( "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); InterlockedIncrement( &failures ); } else { - fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + printf( "%s: %u failures in child process\n", + current_test->name, exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -562,8 +562,9 @@ static void list_tests(void) { const struct test *test; - fprintf( stdout, "Valid test names:\n" ); - for (test = winetest_testlist; test->name; test++) fprintf( stdout, " %s\n", test->name ); + printf( "Valid test names:\n" ); + for (test = winetest_testlist; test->name; test++) + printf( " %s\n", test->name ); } @@ -575,7 +576,7 @@ static int run_test( const char *name ) if (!(test = find_test( name ))) { - fprintf( stdout, "Fatal: test '%s' does not exist.\n", name ); + printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } successes = failures = todo_successes = todo_failures = 0; @@ -585,11 +586,11 @@ static int run_test( const char *name ) if (winetest_debug) { - fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + printf( "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + test->name, successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", + skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -599,7 +600,7 @@ static int run_test( const char *name ) /* Display usage and exit */ static void usage( const char *argv0 ) { - fprintf( stdout, "Usage: %s test_name\n\n", argv0 ); + printf( "Usage: %s test_name\n\n", argv0 ); list_tests(); exit_process(1); } @@ -610,10 +611,10 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) tls_data *data = get_tls_data(); if (data->current_file) - fprintf( stdout, "%s:%d: this is the last test seen before the exception\n", - data->current_file, data->current_line ); - fprintf( stdout, "%s: unhandled exception %08x at %p\n", current_test->name, - ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + printf( "%s:%d: this is the last test seen before the exception\n", + data->current_file, data->current_line ); + printf( "%s: unhandled exception %08x at %p\n", current_test->name, + ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; }

1 0

Nikolay Sivov : dwrite: Pass drawing effect to renderer in DrawGlyphRun().
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 2b5928b2287fbe5b77beaa798353c731969b1bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5928b2287fbe5b77beaa798… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:07 2016 +0300 dwrite: Pass drawing effect to renderer in DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 +++- dlls/dwrite/tests/layout.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 344523c..09dbcfb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -184,6 +184,7 @@ struct layout_effective_run { UINT32 start; /* relative text position, 0 means first text position of a nominal run */ UINT32 length; /* length in codepoints that this run covers */ UINT32 glyphcount; /* total glyph count in this run */ + IUnknown *effect; /* original reference is kept only at range level */ FLOAT origin_x; /* baseline X position */ FLOAT origin_y; /* baseline Y position */ FLOAT align_dx; /* adjustment from text alignment */ @@ -1106,6 +1107,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const for (i = 0; i < length; i++) run->clustermap[i] = r->u.regular.clustermap[start + i] - r->u.regular.clustermap[start]; + run->effect = params->effect; list_add_tail(&layout->eruns, &run->entry); /* Strikethrough style is guaranteed to be consistent within effective run, @@ -2979,7 +2981,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, This->measuringmode, &glyph_run, &descr, - NULL); + run->effect); } /* 2. Inline objects */ diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bb5963f..07829bd 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2998,7 +2998,7 @@ static void test_SetDrawingEffect(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draweffect2_seq, "effect draw test 2", TRUE); + ok_sequence(sequences, RENDERER_ID, draweffect2_seq, "effect draw test 2", FALSE); IDWriteTextLayout_Release(layout); /* Inline object - effect set for same range */

1 0

Francois Gouget : shell32/tests: Trace the effective ShellExecuteEx() flags.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 9cc07a2b31c62ba5b60f00a9128988bb7195da33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc07a2b31c62ba5b60f00a91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:42:10 2016 +0100 shell32/tests: Trace the effective ShellExecuteEx() flags. shell_execute_ex() adds some flags for its own internal needs. The traces should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3acfe4d..cc6e06a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -164,17 +164,17 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR directory, LPCSTR class) { + char smask[11]; SHELLEXECUTEINFOA sei; BOOL success; INT_PTR rc; + /* Add some flags so we can wait for the child process */ + mask |= SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE; + strcpy(shell_call, "ShellExecuteEx("); - if (mask) - { - char smask[11]; - sprintf(smask, "0x%x", mask); - strcat_param(shell_call, "mask", smask); - } + sprintf(smask, "0x%x", mask); + strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); strcat_param(shell_call, "file", file); strcat_param(shell_call, "params", parameters); @@ -185,7 +185,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, trace("%s\n", shell_call); sei.cbSize=sizeof(sei); - sei.fMask=SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | mask; + sei.fMask=mask; sei.hwnd=NULL; sei.lpVerb=verb; sei.lpFile=file;

1 0

Vincent Povirk : mscoree: Remove search fallbacks when Wine Mono isn' t installed.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: f34be7c690a9d87422f2d05d90089a079f4e65e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34be7c690a9d87422f2d05d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 9 16:16:23 2016 -0600 mscoree: Remove search fallbacks when Wine Mono isn't installed. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 106 ++++-------------------------------------------- 1 file changed, 8 insertions(+), 98 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e3a724c..35284b7 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -589,112 +589,22 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path) return (attributes != INVALID_FILE_ATTRIBUTES); } -static BOOL get_mono_path_from_registry(LPWSTR path) -{ - static const WCHAR mono_key[] = {'S','o','f','t','w','a','r','e','\\','N','o','v','e','l','l','\\','M','o','n','o',0}; - static const WCHAR defaul_clr[] = {'D','e','f','a','u','l','t','C','L','R',0}; - static const WCHAR install_root[] = {'S','d','k','I','n','s','t','a','l','l','R','o','o','t',0}; - static const WCHAR slash[] = {'\\',0}; - - WCHAR version[64], version_key[MAX_PATH]; - DWORD len; - HKEY key; - WCHAR dll_path[MAX_PATH]; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, mono_key, 0, KEY_READ, &key)) - return FALSE; - - len = sizeof(version); - if (RegQueryValueExW(key, defaul_clr, 0, NULL, (LPBYTE)version, &len)) - { - RegCloseKey(key); - return FALSE; - } - RegCloseKey(key); - - lstrcpyW(version_key, mono_key); - lstrcatW(version_key, slash); - lstrcatW(version_key, version); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, version_key, 0, KEY_READ, &key)) - return FALSE; - - len = sizeof(WCHAR) * MAX_PATH; - if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)path, &len)) - { - RegCloseKey(key); - return FALSE; - } - RegCloseKey(key); - - return find_mono_dll(path, dll_path); -} - -static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path) -{ - static const WCHAR mono_two_dot_zero[] = {'\\','m','o','n','o','-','2','.','0', 0}; - WCHAR mono_dll_path[MAX_PATH]; - BOOL found = FALSE; - - strcpyW(mono_path, folder); - - strcatW(mono_path, mono_two_dot_zero); - - found = find_mono_dll(mono_path, mono_dll_path); - - return found; -} - static BOOL get_mono_path(LPWSTR path) { - static const WCHAR subdir_mono[] = {'\\','m','o','n','o',0}; - static const WCHAR sibling_mono[] = {'\\','.','.','\\','m','o','n','o',0}; - WCHAR base_path[MAX_PATH]; - const char *unix_data_dir; - WCHAR *dos_data_dir; - BOOL build_tree = FALSE; - static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); - - /* First try c:\windows\mono */ + static const WCHAR subdir_mono[] = {'\\','m','o','n','o','\\','m','o','n','o','-','2','.','0', 0}; + WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; + + /* c:\windows\mono\mono-2.0 */ GetWindowsDirectoryW(base_path, MAX_PATH); strcatW(base_path, subdir_mono); - if (get_mono_path_from_folder(base_path, path)) - return TRUE; - - /* Next: /usr/share/wine/mono */ - unix_data_dir = wine_get_data_dir(); - - if (!unix_data_dir) + if (find_mono_dll(base_path, mono_dll_path)) { - unix_data_dir = wine_get_build_dir(); - build_tree = TRUE; - } - - if (unix_data_dir) - { - if (!wine_get_dos_file_name) - wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); - - if (wine_get_dos_file_name) - { - dos_data_dir = wine_get_dos_file_name(unix_data_dir); - - if (dos_data_dir) - { - strcpyW(base_path, dos_data_dir); - strcatW(base_path, build_tree ? sibling_mono : subdir_mono); - - HeapFree(GetProcessHeap(), 0, dos_data_dir); - - if (get_mono_path_from_folder(base_path, path)) - return TRUE; - } - } + strcpyW(path, base_path); + return TRUE; } - /* Last: the registry */ - return get_mono_path_from_registry(path); + return FALSE; } struct InstalledRuntimeEnum

1 0

Hans Leidekker : bcrypt/tests: Don't load bcrypt dynamically.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 7897c5a60f06f73672a6a24e8c0da99883c90b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7897c5a60f06f73672a6a24e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:36 2016 +0100 bcrypt/tests: Don't load bcrypt dynamically. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/tests/Makefile.in | 2 +- dlls/bcrypt/tests/bcrypt.c | 54 ++++++++----------------------------------- 5 files changed, 14 insertions(+), 47 deletions(-) diff --git a/configure b/configure index 339a734..66dca2b 100755 --- a/configure +++ b/configure @@ -17379,7 +17379,7 @@ wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib -wine_fn_config_dll bcrypt enable_bcrypt +wine_fn_config_dll bcrypt enable_bcrypt implib wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll bluetoothapis enable_bluetoothapis wine_fn_config_dll browseui enable_browseui clean,po diff --git a/configure.ac b/configure.ac index 3712906..811e2aa 100644 --- a/configure.ac +++ b/configure.ac @@ -2723,7 +2723,7 @@ WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) -WINE_CONFIG_DLL(bcrypt) +WINE_CONFIG_DLL(bcrypt,,[implib]) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(bluetoothapis) WINE_CONFIG_DLL(browseui,,[clean,po]) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 54814a0..ef9d7ea 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,5 +1,6 @@ MODULE = bcrypt.dll IMPORTS = advapi32 +IMPORTLIB = bcrypt EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index b193519..0f130b1 100644 --- a/dlls/bcrypt/tests/Makefile.in +++ b/dlls/bcrypt/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = bcrypt.dll -IMPORTS = user32 +IMPORTS = bcrypt user32 C_SRCS = \ bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9e659d6..ad54ab2 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -25,57 +25,32 @@ #include "wine/test.h" -static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, - ULONG cbBuffer, ULONG dwFlags); -static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); - -static BOOL Init(void) -{ - HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); - if (!hbcrypt) - { - win_skip("bcrypt library not available\n"); - return FALSE; - } - - pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); - pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); - - return TRUE; -} - static void test_BCryptGenRandom(void) { NTSTATUS ret; UCHAR buffer[256]; - if (!pBCryptGenRandom) - { - win_skip("BCryptGenRandom is not available\n"); - return; - } - - ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ret = BCryptGenRandom(NULL, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ret = BCryptGenRandom(NULL, buffer, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); /* Zero sized buffer should work too */ - ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ memset(buffer, 0, 16); - ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } @@ -85,24 +60,15 @@ static void test_BCryptGetFipsAlgorithmMode(void) NTSTATUS ret; BOOLEAN enabled; - if (!pBCryptGetFipsAlgorithmMode) - { - win_skip("BCryptGetFipsAlgorithmMode is not available\n"); - return; - } - - ret = pBCryptGetFipsAlgorithmMode(&enabled); + ret = BCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); - ret = pBCryptGetFipsAlgorithmMode(NULL); + ret = BCryptGetFipsAlgorithmMode(NULL); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); } START_TEST(bcrypt) { - if (!Init()) - return; - test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); }

1 0

Hans Leidekker : bcrypt/tests: Add tests for SHA hashes.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: a3b10f13b166372a3d9217960732e16cb38c27d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b10f13b166372a3d9217960… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:37 2016 +0100 bcrypt/tests: Add tests for SHA hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b10f13b166372a3d921…

1 0

Nikolay Sivov : dwrite: Pass drawing effect to renderer in DrawStrikethrough().
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 1a8e957b194c53f5058e3b76dd058aaf5561ce5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8e957b194c53f5058e3b76d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:08 2016 +0300 dwrite: Pass drawing effect to renderer in DrawStrikethrough(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 09dbcfb..6d62b82 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3005,7 +3005,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, s->run->origin_x, SNAP_COORD(s->run->origin_y), &s->s, - NULL); + s->run->effect); } #undef SNAP_COORD

1 0