October 2015 - Wine-Commits

Aric Stewart : windowscodecs/tests: Handle failure to create TIFF decoder.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: af6413aaeb1d67db9ec77545ccef6d402756cf02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6413aaeb1d67db9ec77545c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 10:54:19 2015 -0500 windowscodecs/tests: Handle failure to create TIFF decoder. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/windowscodecs/tests/tiffformat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index d07caa3..e4a4b66 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -170,6 +170,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + if (FAILED(hr)) return NULL; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); @@ -190,6 +191,7 @@ static void test_tiff_palette(void) decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); ok(decoder != 0, "Failed to load TIFF image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -231,6 +233,7 @@ static void test_QueryCapability(void) hr = IWICImagingFactory_CreateDecoder(factory, &GUID_ContainerFormatTiff, NULL, &decoder); ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + if (FAILED(hr)) return; frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); @@ -322,6 +325,7 @@ static void test_tiff_8bpp_alpha(void) decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); ok(decoder != 0, "Failed to load TIFF image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr);

1 0

Nikolay Sivov : shell32: Added dll manifest file.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 972a74ddfe5d06325338196a26e5b9d295205101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972a74ddfe5d06325338196a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 30 15:02:01 2015 +0300 shell32: Added dll manifest file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32.manifest | 4 ++++ dlls/shell32/shell32.rc | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/shell32/shell32.manifest b/dlls/shell32/shell32.manifest new file mode 100644 index 0000000..1314f18 --- /dev/null +++ b/dlls/shell32/shell32.manifest @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.Shell.Shell32" version="5.1.0.0" processorArchitecture="" /> +</assembly> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 847d2ce..bfba962 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -457,6 +457,9 @@ IDR_AVI_FILEDELETE AVI searching.avi /* @makedep: AUTHORS */ AUTHORS RCDATA AUTHORS +/* @makedep: shell32.manifest */ +124 RT_MANIFEST shell32.manifest + /* please keep in sync with version.h values */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Aric Stewart : windowscodecs/tests: Handle failure to create PNG decoder.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: dc3bf7d85b7e4dd5884dbb1e32a7f0dee17ba3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3bf7d85b7e4dd5884dbb1e3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 10:54:15 2015 -0500 windowscodecs/tests: Handle failure to create PNG decoder. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/windowscodecs/tests/pngformat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index bf370a3..34cb533 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -295,6 +295,7 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + if (FAILED(hr)) return NULL; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); @@ -342,6 +343,7 @@ static void test_color_contexts(void) decoder = create_decoder(png_no_color_profile, sizeof(png_no_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; /* global color context */ hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); @@ -369,6 +371,7 @@ static void test_color_contexts(void) decoder = create_decoder(png_color_profile, sizeof(png_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; /* global color context */ count = 0xdeadbeef; @@ -546,6 +549,7 @@ static void test_png_palette(void) decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); ok(decoder != 0, "Failed to load PNG image data\n"); + if (!decoder) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr);

1 0

Ken Thomases : gdi32: Antialias fake bold or italic fonts regardless of GASP table.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: a05cdaa1b87d0337bbf5a171c6afd6b776218887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05cdaa1b87d0337bbf5a171c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Sep 29 02:27:15 2015 -0500 gdi32: Antialias fake bold or italic fonts regardless of GASP table. If the client requests a bold typeface of a font which doesn't actually provide a bold typeface, Wine fakes it using FT_Outline_Embolden(). Likewise, it fakes italic by apply a shear transform. These techniques work passably when antialiasing is in effect. However, when antialiasing is disabled at small sizes by the font's GASP table, the results are horrible. The glyphs have many spurs or appear furry. On the theory that fonts disable antialiasing via the GASP table at small sizes because hinting should produce pixel-perfect results and that that rationale is voided by the application of procedural bolding or italicizing, we ignore the GASP table and always antialias for fake bold or italic fonts. There is a new registry setting to disable this and revert to the previous behavior: [HKEY_CURRENT_USER\Software\Wine\Fonts] "AntialiasFakeBoldOrItalic"="n" Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/gdi32/freetype.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8e89cc5..d870b8c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -503,6 +503,7 @@ static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; static HKEY hkey_font_cache; +static BOOL antialias_fakes = TRUE; static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -4143,6 +4144,7 @@ static void reorder_font_list(void) */ BOOL WineEngInit(void) { + HKEY hkey; DWORD disposition; HANDLE font_mutex; @@ -4155,6 +4157,23 @@ BOOL WineEngInit(void) init_fontconfig(); #endif + if (!RegOpenKeyExW(HKEY_CURRENT_USER, wine_fonts_key, 0, KEY_READ, &hkey)) + { + static const WCHAR antialias_fake_bold_or_italic[] = { 'A','n','t','i','a','l','i','a','s','F','a','k','e', + 'B','o','l','d','O','r','I','t','a','l','i','c',0 }; + static const WCHAR true_options[] = { 'y','Y','t','T','1',0 }; + DWORD type, size; + WCHAR buffer[20]; + + size = sizeof(buffer); + if (!RegQueryValueExW(hkey, antialias_fake_bold_or_italic, NULL, &type, (BYTE*)buffer, &size) && + type == REG_SZ && size >= 1) + { + antialias_fakes = (strchrW(true_options, buffer[0]) != NULL); + } + RegCloseKey(hkey); + } + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { ERR("Failed to create font mutex\n"); @@ -5534,7 +5553,7 @@ done: case GGO_GRAY4_BITMAP: case GGO_GRAY8_BITMAP: case WINE_GGO_GRAY16_BITMAP: - if (is_hinting_enabled()) + if ((!antialias_fakes || (!ret->fake_bold && !ret->fake_italic)) && is_hinting_enabled()) { WORD gasp_flags; if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY))

1 0

Austin English : ntoskrnl.exe: Add KeEnterCriticalRegion/ KeLeaveCriticalRegion stubs.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 1a45f75dedf895d32c348ed460258048e65c25c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a45f75dedf895d32c348ed46… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 28 23:03:06 2015 -0400 ntoskrnl.exe: Add KeEnterCriticalRegion/KeLeaveCriticalRegion stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a4a37d9..96af772 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2304,3 +2304,19 @@ PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lo FIXME("(%p %p) stub\n", head, lock); return ExInterlockedRemoveHeadList( head, lock ); } + +/*********************************************************************** + * KeEnterCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeEnterCriticalRegion(void) +{ + FIXME(": stub\n"); +} + +/*********************************************************************** + * KeLeaveCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeLeaveCriticalRegion(void) +{ + FIXME(": stub\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0bb7d04..58ad879 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -523,7 +523,7 @@ @ stub KeDeregisterBugCheckReasonCallback @ stub KeDetachProcess @ stub KeDisconnectInterrupt -@ stub KeEnterCriticalRegion +@ stdcall KeEnterCriticalRegion() @ stub KeEnterKernelDebugger @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @@ -563,7 +563,7 @@ @ stub KeInsertQueueDpc @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc -@ stub KeLeaveCriticalRegion +@ stdcall KeLeaveCriticalRegion() @ stub KeLoaderBlock @ stub KeNumberProcessors @ stub KeProfileInterrupt

1 0

Dmitry Timoshkov : ntdll: Print process id in the relay log if requested.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 451156b4fa1bbdfe321427a4dd58f05340e8421f URL: http://source.winehq.org/git/wine.git/?a=commit;h=451156b4fa1bbdfe321427a4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 16:07:43 2015 +0800 ntdll: Print process id in the relay log if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/relay.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 0ba2731..ef0af0f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); +WINE_DECLARE_DEBUG_CHANNEL(pid); struct relay_descr /* descriptor for a module */ { @@ -340,6 +341,9 @@ void * WINAPI relay_trace_entry( struct relay_descr *descr, unsigned int idx, co { if (TRACE_ON(timestamp)) print_timestamp(); + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); + if (entry_point->name) DPRINTF( "%04x:Call %s.%s(", GetCurrentThreadId(), data->dllname, entry_point->name ); else @@ -365,6 +369,9 @@ void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, if (TRACE_ON(timestamp)) print_timestamp(); + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); + if (entry_point->name) DPRINTF( "%04x:Ret %s.%s()", GetCurrentThreadId(), data->dllname, entry_point->name ); else

1 0

Dmitry Timoshkov : ntdll: Print process id in the loader log if requested.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 7d2cd2fe61d0425537ff0366a5fffed516623efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2cd2fe61d0425537ff0366a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 16:07:49 2015 +0800 ntdll: Print process id in the loader log if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8a43310..831f049 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -49,6 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(snoop); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(imports); +WINE_DECLARE_DEBUG_CHANNEL(pid); #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) @@ -1036,8 +1037,12 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) for (callback = (const PIMAGE_TLS_CALLBACK *)dir->AddressOfCallBacks; *callback; callback++) { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } __TRY { call_dll_entry_point( (DLLENTRYPROC)*callback, module, reason, NULL ); @@ -1045,14 +1050,22 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), callback, module, reason_names[reason] ); + } return; } __ENDTRY if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } } } @@ -1079,6 +1092,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved size_t len = min( wm->ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) ); memcpy( mod_name, wm->ldr.BaseDllName.Buffer, len ); mod_name[len / sizeof(WCHAR)] = 0; + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call PE DLL (proc=%p,module=%p %s,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved ); @@ -1095,8 +1110,12 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, reason_names[reason], lpReserved ); + } status = GetExceptionCode(); } __ENDTRY @@ -1105,9 +1124,13 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved to the dll. We cannot assume that this module has not been deleted. */ if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret PE DLL (proc=%p,module=%p %s,reason=%s,res=%p) retval=%x\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved, retv ); + } else TRACE("(%p,%s,%p) - RETURN %d\n", module, reason_names[reason], lpReserved, retv ); return status;

1 0

Andrew Eikum : maintainers: Add MAINTAINERS file.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 93a685ad23eb518b0bfd52a8c44837e9b77bc1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a685ad23eb518b0bfd52a8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 23 10:25:50 2015 -0500 maintainers: Add MAINTAINERS file. --- MAINTAINERS | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..98622bd --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,104 @@ + + + List of Wine subsection maintainers + +When submitting patches to Wine, the guidelines at +<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +contains a list of maintainers for subsections of Wine. When submitting +patches, you may want to CC relevant people from this list. If you have +questions about your work in an area of Wine, you may find a list of +knowledgeable people here. + +Many areas of Wine don't have a specific maintainer, although there may +be people with knowledge of those areas. If an area is not listed here +at all, you can use the git log to find developers working in that area +recently. Or, you can send a mail to wine-devel, but be aware that there +may simply be no one knowledgeable about that subject on the list. + +This file uses a similar format to the Linux kernel MAINTAINERS file. +Descriptions of section entries used here: + + M: Primary maintainer. CC patches to: FullName <address(a)domain> + P: Other knowledgeable person. FullName <address(a)domain> + F: Files and directories with wildcard patterns. + One pattern per line. Multiple F: lines acceptable. + +Maintainers List + + ----------------------------------- + +Audio I/O +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dsound/ +F: dlls/dswave/ +F: dlls/mmdevapi/ +F: dlls/winealsa.drv/ +F: dlls/winecoreaudio.drv/ +F: dlls/wineoss.drv/ +F: dlls/winmm/ +F: dlls/x3daudio*/ +F: dlls/xapofx*/ +F: dlls/xaudio*/ + +Direct2D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +F: dlls/d2d*/ + +Direct3D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +P: Stefan Dösinger <stefan(a)codeweavers.com> +P: Józef Kucia <jkucia(a)codeweavers.com> +P: Matteo Bruni <mbruni(a)codeweavers.com> +F: dlls/d3d*/ +F: dlls/wined3d/ + +DirectInput +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dinput/ + +HTML rendering (Gecko) +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/mshtml/ +F: dlls/ieframe/ +F: dlls/shdocvw/ + +Input methods +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/imm32/ + +JavaScript +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/jscript/ + +Mac OS X graphics driver +M: Ken Thomases <ken(a)codeweavers.com> +F: dlls/winemac.drv/ + +Media format conversion +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/msacm32/ +F: dlls/*.acm/ + +Microsoft C Runtime +M: Piotr Caban <piotr(a)codeweavers.com> +F: dlls/msvc*/ + +MSI installers +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/msi/ + +OLE Typelibs +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/oleaut32/typelib.c + +Wine server, IPC +M: Alexandre Julliard <julliard(a)winehq.org> +F: server/ + +VB Script +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/vbscript/ + +XML parsing +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/msxml*/

1 0

Marcus Meissner : bcrypt: Add BCryptCreateHash stub.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 5b33f18cfc11f73e8b85fcae0f7e9a6326c8c5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b33f18cfc11f73e8b85fcae0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 25 11:23:40 2015 +0200 bcrypt: Add BCryptCreateHash stub. Signed-off-By: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 8 ++++++++ include/bcrypt.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 18d4d48..1c848e1 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -4,7 +4,7 @@ @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext -@ stub BCryptCreateHash +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) @ stub BCryptDecrypt @ stub BCryptDeleteContext @ stub BCryptDeriveKey diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4663e0f..b716aea 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -115,3 +115,11 @@ NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE* hash, UCHAR* hashobject, + ULONG hashobjectlen, UCHAR *secret, ULONG secretlen, ULONG flags) +{ + FIXME("%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, hash, hashobject, hashobjectlen, secret, secretlen, flags); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index d9b8cc6..fe3d854 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -49,6 +49,7 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_HANDLE; +typedef PVOID BCRYPT_HASH_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

Józef Kucia : d3d11: Implement ID3D11RasterizerState interface.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: e006be15b9694a15d03fe03d7fac9c12ab9b2921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e006be15b9694a15d03fe03d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:56 2015 +0200 d3d11: Implement ID3D11RasterizerState interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 10 ++- dlls/d3d11/device.c | 5 -- dlls/d3d11/state.c | 149 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 137 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e006be15b9694a15d03fe…

1 0