January 2018 - wine-devel

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer 22 Nov '20

22 Nov '20

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong 28 Sep '18

28 Sep '18

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

COM tracing ...
by Michael Meeks 21 Aug '18

21 Aug '18

Hi guys, Rather a peripheral question; apologies for that - but I'd imagine there are experts here that may be able to help. I have a black-box problem - a Windows app dealing with confidential data that I can't easily touch (and thus can't get to run under Wine) - which does some small but critical automation of MS Office - using VBS / COM scripting. I'd -really- love some input on how best to trace that series of COM method calls on Windows itself ie. the (remote) service activation, and the RPC beyond that - particularly the method names, parameters etc. of the COM/OLE Office API. I've tried (so far): http://www.rohitab.com/apimonitor which, while closed, looks interesting; but traces a lot in a hard-to-search way and doesn't appear to do the trick. https://support.microsoft.com/en-us/help/926098/how-to-enable-com-and-com-d… Sounds useful: using Event Tracing for Windows (ETW) but has this rather unhelpful property: "The binary file must be formatted by Microsoft so that it can be analyzed. Please forward the .etl files to your support contact. ..." ;-) Component models used to be all the rage in my youth ;-) surely someone solved the "strace for COM calls" problem elegantly some-when ! Crazily - might it be possible to instrument, interpose and use Wine's COM impl. on Windows [ which sounds a bit 'exciting' ;-], or ? Anyhow - help much appreciated & sorry for the noise ! Regards, Michael. -- michael.meeks(a)collabora.com <><, Pseudo Engineer, itinerant idiot

2 4

ODBC Databases: Jet/Access success
by Barry Bird 14 Jun '18

14 Jun '18

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

Google Summer of Code 2018
by André Hentschel 04 Mar '18

04 Mar '18

Hi, I'm currently doing the Org application for Wine, hopefully we'll have a great GSoC year! For now, I need two things from you: - Go through https://wiki.winehq.org/Summer_Of_Code and add/cleanup/remove ideas - Send me a mail if you would like to be a mentor (I will also invite usual mentor candidates to catch the lazy people :) )

5 5

[PATCH] windowscodecs: tiffformat: Fix TiffFrameDecode_GetResolution, add test
by joachim.priesner＠web.de 16 Feb '18

16 Feb '18

From: Joachim Priesner <joachim.priesner(a)web.de> The behavior for the invalid resolution case is different for Windows XP and Server 2003. Implement the behavior of current Windows versions, but allow the old behavior in the test. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- dlls/windowscodecs/tests/tiffformat.c | 137 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tiffformat.c | 60 +++++++-------- 2 files changed, 162 insertions(+), 35 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index e4a4b66ea8..f00b20f7bb 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> #include <stdarg.h> #include <stdio.h> @@ -84,8 +85,8 @@ static const struct tiff_1bpp_data { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0, @@ -124,8 +125,8 @@ static const struct tiff_8bpp_alpha { 0x115, IFD_SHORT, 1, 2 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ { 0x117, IFD_LONG, 1, 8 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, /* YRESOLUTION */ { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ { 0x152, IFD_SHORT, 1, 1 } /* EXTRASAMPLES: 1 - Associated alpha with pre-multiplied color */ @@ -134,6 +135,81 @@ static const struct tiff_8bpp_alpha { 96, 1 }, { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } }; + +static const struct tiff_resolution_test_data +{ + struct IFD_rational resx; + struct IFD_rational resy; + LONG resolution_unit; + double expected_dpi_x; + double expected_dpi_y; + /* if != 0: values for different behavior of some Windows versions */ + double broken_dpi_x; + double broken_dpi_y; +} tiff_resolution_test_data[] = +{ + { { 100, 1 }, { 50, 1 }, 0, 100.0, 50.0, 0, 0 }, /* invalid resolution unit */ + { { 50, 1 }, { 100, 1 }, 0, 50.0, 100.0, 0, 0 }, + + { { 100, 1 }, { 50, 1 }, 1, 100.0, 50.0, 0, 0 }, /* RESUNIT_NONE */ + { { 50, 1 }, { 100, 1 }, 1, 50.0, 100.0, 0, 0 }, + + { { 49, 1 }, { 49, 1 }, 2, 49.0, 49.0, 0, 0 }, /* same resolution for both X and Y */ + { { 33, 1 }, { 55, 1 }, 2, 33.0, 55.0, 0, 0 }, /* different resolutions for X and Y */ + { { 50, 2 }, { 66, 3 }, 2, 25.0, 22.0, 0, 0 }, /* denominator != 1 */ + + { { 100, 1 }, { 200, 1 }, 3, 254.0, 508.0, 0, 0 }, /* unit = centimeters */ + + /* XP and Server 2003 do not discard both resolution values if only one of them is invalid */ + { { 0, 1 }, { 29, 1 }, 2, 96.0, 96.0, 0, 29.0 }, /* resolution 0 */ + { { 58, 1 }, { 29, 0 }, 2, 96.0, 96.0, 58.0, 0 }, /* denominator 0 (division by zero) */ + + /* XP and Server 2003 convert the fallback value of 96 dpi to 243.84 dots per centimeter. */ + { { 0, 1 }, { 100, 1 }, 3, 96.0, 96.0, 243.84, 254.0 }, /* resolution 0 and unit = centimeters */ + { { 50, 1 }, { 72, 0 }, 3, 96.0, 96.0, 127.0, 243.84 } /* denominator 0 and unit = centimeters */ +}; + +static struct tiff_resolution_image_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational resx; + struct IFD_rational resy; + BYTE pixel_data[4]; +} tiff_resolution_image_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_resolution_image_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_resolution_image_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_resolution_image_data, resx) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_resolution_image_data, resy) }, /* YRESOLUTION */ + { 0x128, IFD_SHORT, 1, 1 }, /* RESOLUTIONUNIT -- value will be filled with test data */ + }, + 0, + { 72, 1 }, /* value will be filled with test data */ + { 72, 1 }, /* value will be filled with test data */ + { 0x11, 0x22, 0x33, 0 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -370,6 +446,58 @@ static void test_tiff_8bpp_alpha(void) IWICBitmapDecoder_Release(decoder); } +static void test_tiff_resolution(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + double dpi_x, dpi_y; + int i; + + for (i = 0; i < sizeof(tiff_resolution_test_data)/sizeof(tiff_resolution_test_data[0]); i++) + { + const struct tiff_resolution_test_data *test_data = &tiff_resolution_test_data[i]; + tiff_resolution_image_data.resx = test_data->resx; + tiff_resolution_image_data.resy = test_data->resy; + tiff_resolution_image_data.entry[12].value = test_data->resolution_unit; + + decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data)); + ok(decoder != 0, "%d: Failed to load TIFF image data\n", i); + if (!decoder) continue; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "%d: GetResolution error %#x\n", i, hr); + + if (test_data->broken_dpi_x != 0) + { + ok(fabs(dpi_x - test_data->expected_dpi_x) < 0.01 || broken(fabs(dpi_x - test_data->broken_dpi_x) < 0.01), + "%d: x: expected %f or %f, got %f\n", i, test_data->expected_dpi_x, test_data->broken_dpi_x, dpi_x); + } + else + { + ok(fabs(dpi_x - test_data->expected_dpi_x) < 0.01, + "%d: x: expected %f, got %f\n", i, test_data->expected_dpi_x, dpi_x); + } + + if (test_data->broken_dpi_y != 0) + { + ok(fabs(dpi_y - test_data->expected_dpi_y) < 0.01 || broken(fabs(dpi_y - test_data->broken_dpi_y) < 0.01), + "%d: y: expected %f or %f, got %f\n", i, test_data->expected_dpi_y, test_data->broken_dpi_y, dpi_y); + } + else + { + ok(fabs(dpi_y - test_data->expected_dpi_y) < 0.01, + "%d: y: expected %f, got %f\n", i, test_data->expected_dpi_y, dpi_y); + } + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + } +} + START_TEST(tiffformat) { HRESULT hr; @@ -384,6 +512,7 @@ START_TEST(tiffformat) test_tiff_palette(); test_QueryCapability(); test_tiff_8bpp_alpha(); + test_tiff_resolution(); IWICImagingFactory_Release(factory); CoUninitialize(); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a0eec53f5f..e7d4d444c7 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -529,21 +529,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->resolution_unit = 0; pTIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &decode_info->resolution_unit); - if (decode_info->resolution_unit != 0) + + ret = pTIFFGetField(tiff, TIFFTAG_XRESOLUTION, &decode_info->xres); + if (!ret) { - ret = pTIFFGetField(tiff, TIFFTAG_XRESOLUTION, &decode_info->xres); - if (!ret) - { - WARN("missing X resolution\n"); - decode_info->resolution_unit = 0; - } + WARN("missing X resolution\n"); + } - ret = pTIFFGetField(tiff, TIFFTAG_YRESOLUTION, &decode_info->yres); - if (!ret) - { - WARN("missing Y resolution\n"); - decode_info->resolution_unit = 0; - } + ret = pTIFFGetField(tiff, TIFFTAG_YRESOLUTION, &decode_info->yres); + if (!ret) + { + WARN("missing Y resolution\n"); } return S_OK; @@ -893,26 +889,28 @@ static HRESULT WINAPI TiffFrameDecode_GetResolution(IWICBitmapFrameDecode *iface { TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); - switch (This->decode_info.resolution_unit) + if (This->decode_info.xres == 0 || This->decode_info.yres == 0) { - default: - FIXME("unknown resolution unit %i\n", This->decode_info.resolution_unit); - /* fall through */ - case 0: /* Not set */ *pDpiX = *pDpiY = 96.0; - break; - case 1: /* Relative measurements */ - *pDpiX = 96.0; - *pDpiY = 96.0 * This->decode_info.yres / This->decode_info.xres; - break; - case 2: /* Inch */ - *pDpiX = This->decode_info.xres; - *pDpiY = This->decode_info.yres; - break; - case 3: /* Centimeter */ - *pDpiX = This->decode_info.xres / 2.54; - *pDpiY = This->decode_info.yres / 2.54; - break; + } + else + { + switch (This->decode_info.resolution_unit) + { + default: + FIXME("unknown resolution unit %i\n", This->decode_info.resolution_unit); + /* fall through */ + case 0: /* Not set */ + case 1: /* Relative measurements */ + case 2: /* Inch */ + *pDpiX = This->decode_info.xres; + *pDpiY = This->decode_info.yres; + break; + case 3: /* Centimeter */ + *pDpiX = This->decode_info.xres * 2.54; + *pDpiY = This->decode_info.yres * 2.54; + break; + } } TRACE("(%p) <-- %f,%f unit=%i\n", iface, *pDpiX, *pDpiY, This->decode_info.resolution_unit); -- 2.15.1

3 4

Re: [PATCH] arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64
by André Hentschel 13 Feb '18

13 Feb '18

Am 14.08.2017 um 12:35 schrieb Martin Storsjo: > Windows uses a different ABI for va_list on arm64 just like on x86_64. > > On x86_64, the calling convention for windows functions is completely > different from the one on other platforms. On arm64, they're mostly the > same, with the only exception being variadic functions (where all float > arguments are passed in integer registers, since the va_list is a single > pointer). > > Any functions using __builtin_ms_va_start need to be decorated with > __attribute__((ms_abi)). > > Add a check in configure for the support of __builtin_ms_va_list > (both features appared in clang at the same time, in the 5.0 release). > > This fixes running binaries that use e.g. printf style functions > (e.g. midl.exe from the windows 10 sdk), fixing > https://bugs.winehq.org/show_bug.cgi?id=38886. > > Signed-off-by: Martin Storsjo <martin(a)martin.st> > --- > clang 5.0, which this requires, isn't yet released, but is in RC2 and > will probably be released pretty soon. > --- > configure.ac | 7 +++++++ > include/msvcrt/crtdefs.h | 6 +++++- > include/windef.h | 6 +++++- > include/wine/test.h | 4 ++-- > 4 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 7d52b24..c33221f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -179,6 +179,13 @@ case $host in > CFLAGS="$CFLAGS -marm" > AC_SUBST(TARGETFLAGS,"-marm") > ;; > + aarch64*) > + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) > + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], > + [AC_MSG_RESULT([yes])], > + [AC_MSG_RESULT([no]) > + AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) Hi, The upstreamed variadic function handling is terrific, thanks for that! I also like this patch as logical next step, I'm just a bit worried because it locks out current builds without upgrading to an RC... At the moment I'm doing winelib builds with gcc for Linux/ARM64 and clang builds for Android/ARM64. It's quite easy on Linux to pick up a new clang version, not sure how long it takes until clang5 is picked up in the Android NDK... On the other hand, there are not much people building Wine for ARM64, and those can pretty easily revert your patch until they are at clang5 OK... We need this improvement, I'll sign it off :) Now, we only need to convince distributions to avoid x18

3 4

[PATCH 0/8] Initial dhtmled.ocx implementation
by Alex Henrie 09 Feb '18

09 Feb '18

See https://bugs.winehq.org/show_bug.cgi?id=29709 This patchset gets RSSeditor to show its user interface before exiting, which is as much as it does on Wine with native dhtmled.ocx and native triedit.dll. Jacek would be a good person to review these patches. Alex Henrie (8): include: Add dhtmled.idl dhtmled.ocx: Add stub DLL and stub DHTMLEdit object dhtmled.ocx: Add IQuickActivate interface to DHTMLEdit object dhtmled.ocx: Add IViewObject interface to DHTMLEdit object dhtmled.ocx: Add IOleObject interface to DHTMLEdit object dhtmled.ocx: Add IOleControl interface to HTMLEdit object dhtmled.ocx: Add IPersistStreamInit interface to HTMLEdit object dhtmled.ocx: Add IConnectionPointContainer interface to HTMLEdit object configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_classes.idl | 39 ++ dlls/dhtmled.ocx/dhtmled_private.h | 19 + dlls/dhtmled.ocx/dhtmled_tlb.idl | 21 + dlls/dhtmled.ocx/edit.c | 1124 ++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 162 +++++ include/Makefile.in | 1 + include/dhtmled.idl | 330 ++++++++++ 10 files changed, 1709 insertions(+) create mode 100644 dlls/dhtmled.ocx/Makefile.in create mode 100644 dlls/dhtmled.ocx/dhtmled.ocx.spec create mode 100644 dlls/dhtmled.ocx/dhtmled_classes.idl create mode 100644 dlls/dhtmled.ocx/dhtmled_private.h create mode 100644 dlls/dhtmled.ocx/dhtmled_tlb.idl create mode 100644 dlls/dhtmled.ocx/edit.c create mode 100644 dlls/dhtmled.ocx/main.c create mode 100644 include/dhtmled.idl -- 2.15.1

4 15

[PATCH] gdiplus: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 76e5b9b378..ea79f1183c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -30,6 +30,7 @@ #include "objbase.h" #include "ocidl.h" #include "wincodecsdk.h" +#include "wine/heap.h" #include "wine/list.h" #include "gdiplus.h" @@ -49,25 +50,6 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN; -- 2.14.3

2 1

[PATCH v2] ole32: Return error from IStream Clone.
by Daniel Lehman 05 Feb '18

05 Feb '18

v2: minus assert.h header

2 1

[PATCH 8/9] kerberos: Don't include GSS_C_DCE_STYLE in default gss_init_sec_context() flags.
by Dmitry Timoshkov 05 Feb '18

05 Feb '18

Otherwise the returned ticket won't be accepted by WWW server when wrapped in an HTTP request. Original Rob's patch doesn't have this flag either. This patch is one of the fixes to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ba89806957..66c795c377 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -326,7 +326,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam static ULONG flags_isc_req_to_gss( ULONG flags ) { - ULONG ret = GSS_C_DCE_STYLE; + ULONG ret = 0; if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; -- 2.15.1

2 19

[PATCH 4/5] d2d1: Replace d2d_calloc() with a global heap_calloc() helper.
by Henri Verbeet 01 Feb '18

01 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 2 +- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/d2d1_private.h | 9 --------- dlls/d2d1/geometry.c | 4 ++-- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/stroke.c | 2 +- include/wine/heap.h | 9 +++++++++ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 028fab3..0d4098f 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -511,7 +511,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d pitch = ((bpp * size.width) + 15) & ~15; if (pitch / bpp < size.width) return E_OUTOFMEMORY; - if (!(data = d2d_calloc(size.height, pitch))) + if (!(data = heap_calloc(size.height, pitch))) return E_OUTOFMEMORY; data_size = size.height * pitch; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 0531a3a..c46d940 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = d2d_calloc(stop_count, 2 * sizeof(*data)))) + if (!(data = heap_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -205,7 +205,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = d2d_calloc(stop_count, sizeof(*stops)))) + if (!((*gradient)->stops = heap_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); heap_free(*gradient); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 07f71a0..dbfb83c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,15 +477,6 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; -static inline void *d2d_calloc(size_t count, size_t size) -{ - SIZE_T s = count * size; - - if (size && s / size != count) - return NULL; - return heap_alloc(s); -} - static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4a2f7d7..5b5a75b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2025,7 +2025,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = d2d_calloc(vertex_count, sizeof(*vertices)))) + if (!(vertices = heap_calloc(vertex_count, sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2792,7 +2792,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = d2d_calloc(geometry->fill.bezier_vertex_count, + if (!(geometry->fill.bezier_vertices = heap_calloc(geometry->fill.bezier_vertex_count, sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a202279..7afbc84 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1162,7 +1162,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; - if (!(opacity_values = d2d_calloc(bitmap_size.height, bitmap_size.width))) + if (!(opacity_values = heap_calloc(bitmap_size.height, bitmap_size.width))) { ERR("Failed to allocate opacity values.\n"); goto done; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 63f88c7..511c134 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = d2d_calloc(dash_count, sizeof(*style->dashes)))) + if (!(style->dashes = heap_calloc(dash_count, sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; diff --git a/include/wine/heap.h b/include/wine/heap.h index 681887b..97d3a56 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -46,4 +46,13 @@ static inline void heap_free(void *mem) HeapFree(GetProcessHeap(), 0, mem); } +static inline void *heap_calloc(SIZE_T count, SIZE_T size) +{ + SIZE_T len = count * size; + + if (size && len / size != count) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + #endif /* __WINE_WINE_HEAP_H */ -- 2.1.4

2 1

[PATCH] mshtml: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 01 Feb '18

01 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51a1addaf2..ea38a66f24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -30,6 +30,7 @@ #include "tlogstg.h" #include "shdeprecated.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/unicode.h" @@ -1176,31 +1177,11 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] jscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 01 Feb '18

01 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/jscript.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 756d7cf954..1a247511ac 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -31,6 +31,7 @@ #include "resource.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct _jsval_t jsval_t; @@ -54,26 +55,6 @@ void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] ieframe: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 01 Feb '18

01 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/ieframe.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 3e6ac6c6be..8adf47e053 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -38,6 +38,7 @@ #include "docobjectservice.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct ConnectionPoint ConnectionPoint; @@ -334,26 +335,6 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] kernel32: Change error returns from GlobalFree.
by Daniel Lehman 01 Feb '18

01 Feb '18

2 1

[PATCH] dxgi: Fix a trailing '\n' in a FIXME().
by Francois Gouget 01 Feb '18

01 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 267b11b9d91..832e2cb132d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -379,7 +379,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IDXGIFac static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IDXGIFactory4 *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!n", iface, cookie); + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IDXGIFactory4 *iface, -- 2.15.1

2 1

[PATCH 5/5] d3d10: Use the global memory allocation helpers.
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 6 +-- dlls/d3d10/d3d10_private.h | 8 +-- dlls/d3d10/effect.c | 119 ++++++++++++++++++++++----------------------- dlls/d3d10/shader.c | 4 +- dlls/d3d10/stateblock.c | 5 +- 5 files changed, 63 insertions(+), 79 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 52585f0..f2fbb41 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -222,8 +222,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", data, data_size, flags, device, effect_pool, effect); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 effect object memory\n"); return E_OUTOFMEMORY; @@ -303,8 +302,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 shader reflection object memory\n"); return E_OUTOFMEMORY; diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 93b6e35..e785b8b 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "wine/rbtree.h" +#include "wine/heap.h" #define COBJMACROS #include "winbase.h" @@ -278,13 +279,6 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; -static inline void *d3d10_calloc(SIZE_T count, SIZE_T size) -{ - if (count > ~(SIZE_T)0 / size) - return NULL; - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); -} - static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4760489..10d8404 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -285,7 +285,7 @@ static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, c return TRUE; } - if (!(*s = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(*s = heap_alloc(len))) { ERR("Failed to allocate string memory.\n"); return FALSE; @@ -308,8 +308,7 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } - *name = HeapAlloc(GetProcessHeap(), 0, name_len); - if (!*name) + if (!(*name = heap_alloc(name_len))) { ERR("Failed to allocate name memory.\n"); return FALSE; @@ -355,7 +354,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct return E_INVALIDARG; } - if (!(e = d3d10_calloc(count, sizeof(*e)))) + if (!(e = heap_calloc(count, sizeof(*e)))) { ERR("Failed to allocate signature memory.\n"); return E_OUTOFMEMORY; @@ -370,7 +369,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) { WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); - HeapFree(GetProcessHeap(), 0, e); + heap_free(e); return E_INVALIDARG; } read_dword(&ptr, &e[i].SemanticIndex); @@ -396,8 +395,8 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct static void shader_free_signature(struct d3d10_effect_shader_signature *s) { - HeapFree(GetProcessHeap(), 0, s->signature); - HeapFree(GetProcessHeap(), 0, s->elements); + heap_free(s->signature); + heap_free(s->elements); } static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) @@ -422,8 +421,7 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag if (tag == TAG_ISGN) sig = &s->input_signature; else sig = &s->output_signature; - sig->signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!sig->signature) + if (!(sig->signature = heap_alloc_zero(size))) { ERR("Failed to allocate input signature data\n"); return E_OUTOFMEMORY; @@ -698,7 +696,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->basetype = 0; t->type_class = D3D10_SVC_STRUCT; - if (!(t->members = d3d10_calloc(t->member_count, sizeof(*t->members)))) + if (!(t->members = heap_calloc(t->member_count, sizeof(*t->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -759,8 +757,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Elementtype for type at offset: %#x\n", t->id); /* allocate elementtype - we need only one, because all elements have the same type */ - t->elementtype = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t->elementtype)); - if (!t->elementtype) + if (!(t->elementtype = heap_alloc_zero(sizeof(*t->elementtype)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -828,8 +825,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, return WINE_RB_ENTRY_VALUE(entry, struct d3d10_effect_type, entry); } - type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); - if (!type) + if (!(type = heap_alloc_zero(sizeof(*type)))) { ERR("Failed to allocate type memory.\n"); return NULL; @@ -841,14 +837,14 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, if (FAILED(hr = parse_fx10_type(data, data_size, offset, type))) { ERR("Failed to parse type info, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, type); + heap_free(type); return NULL; } if (wine_rb_put(&effect->types, &offset, &type->entry) == -1) { ERR("Failed to insert type entry.\n"); - HeapFree(GetProcessHeap(), 0, type); + heap_free(type); return NULL; } @@ -948,7 +944,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) if (v->type->member_count) { - if (!(v->members = d3d10_calloc(v->type->member_count, sizeof(*v->members)))) + if (!(v->members = heap_calloc(v->type->member_count, sizeof(*v->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -990,7 +986,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) { unsigned int bufferoffset = v->buffer_offset; - if (!(v->elements = d3d10_calloc(v->type->element_count, sizeof(*v->elements)))) + if (!(v->elements = heap_calloc(v->type->element_count, sizeof(*v->elements)))) { ERR("Failed to allocate elements memory.\n"); return E_OUTOFMEMORY; @@ -1592,7 +1588,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); - if (!(p->annotations = d3d10_calloc(p->annotation_count, sizeof(*p->annotations)))) + if (!(p->annotations = heap_calloc(p->annotation_count, sizeof(*p->annotations)))) { ERR("Failed to allocate pass annotations memory.\n"); return E_OUTOFMEMORY; @@ -1609,7 +1605,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return hr; } - if (!(p->objects = d3d10_calloc(p->object_count, sizeof(*p->objects)))) + if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) { ERR("Failed to allocate effect objects memory.\n"); return E_OUTOFMEMORY; @@ -1655,7 +1651,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, read_dword(ptr, &t->annotation_count); TRACE("Technique has %u annotations.\n", t->annotation_count); - if (!(t->annotations = d3d10_calloc(t->annotation_count, sizeof(*t->annotations)))) + if (!(t->annotations = heap_calloc(t->annotation_count, sizeof(*t->annotations)))) { ERR("Failed to allocate technique annotations memory.\n"); return E_OUTOFMEMORY; @@ -1672,7 +1668,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return hr; } - if (!(t->passes = d3d10_calloc(t->pass_count, sizeof(*t->passes)))) + if (!(t->passes = heap_calloc(t->pass_count, sizeof(*t->passes)))) { ERR("Failed to allocate passes memory\n"); return E_OUTOFMEMORY; @@ -1723,7 +1719,7 @@ static HRESULT parse_fx10_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) + if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1897,7 +1893,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) + if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1927,8 +1923,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, unsigned int stride = 0; /* Generate our own type, it isn't in the fx blob. */ - l->type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*l->type)); - if (!l->type) + if (!(l->type = heap_alloc_zero(sizeof(*l->type)))) { ERR("Failed to allocate local buffer type memory.\n"); return E_OUTOFMEMORY; @@ -1986,7 +1981,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count); - if (!(l->annotations = d3d10_calloc(l->annotation_count, sizeof(*l->annotations)))) + if (!(l->annotations = heap_calloc(l->annotation_count, sizeof(*l->annotations)))) { ERR("Failed to allocate local buffer annotations memory.\n"); return E_OUTOFMEMORY; @@ -2003,13 +1998,13 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return hr; } - if (!(l->members = d3d10_calloc(l->type->member_count, sizeof(*l->members)))) + if (!(l->members = heap_calloc(l->type->member_count, sizeof(*l->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - if (!(l->type->members = d3d10_calloc(l->type->member_count, sizeof(*l->type->members)))) + if (!(l->type->members = heap_calloc(l->type->member_count, sizeof(*l->type->members)))) { ERR("Failed to allocate type members memory.\n"); return E_OUTOFMEMORY; @@ -2112,8 +2107,8 @@ static void d3d10_effect_type_member_destroy(struct d3d10_effect_type_member *ty TRACE("effect type member %p.\n", typem); /* Do not release typem->type, it will be covered by d3d10_effect_type_destroy(). */ - HeapFree(GetProcessHeap(), 0, typem->semantic); - HeapFree(GetProcessHeap(), 0, typem->name); + heap_free(typem->semantic); + heap_free(typem->name); } static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context) @@ -2124,8 +2119,8 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context if (t->elementtype) { - HeapFree(GetProcessHeap(), 0, t->elementtype->name); - HeapFree(GetProcessHeap(), 0, t->elementtype); + heap_free(t->elementtype->name); + heap_free(t->elementtype); } if (t->members) @@ -2136,11 +2131,11 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context { d3d10_effect_type_member_destroy(&t->members[i]); } - HeapFree(GetProcessHeap(), 0, t->members); + heap_free(t->members); } - HeapFree(GetProcessHeap(), 0, t->name); - HeapFree(GetProcessHeap(), 0, t); + heap_free(t->name); + heap_free(t); } static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) @@ -2156,31 +2151,31 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d } ptr = data + e->index_offset; - if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) + if (!(e->local_buffers = heap_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n"); return E_OUTOFMEMORY; } - if (!(e->local_variables = d3d10_calloc(e->local_variable_count, sizeof(*e->local_variables)))) + if (!(e->local_variables = heap_calloc(e->local_variable_count, sizeof(*e->local_variables)))) { ERR("Failed to allocate local variable memory.\n"); return E_OUTOFMEMORY; } - if (!(e->anonymous_shaders = d3d10_calloc(e->anonymous_shader_count, sizeof(*e->anonymous_shaders)))) + if (!(e->anonymous_shaders = heap_calloc(e->anonymous_shader_count, sizeof(*e->anonymous_shaders)))) { ERR("Failed to allocate anonymous shaders memory\n"); return E_OUTOFMEMORY; } - if (!(e->used_shaders = d3d10_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) + if (!(e->used_shaders = heap_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) { ERR("Failed to allocate used shaders memory\n"); return E_OUTOFMEMORY; } - if (!(e->techniques = d3d10_calloc(e->technique_count, sizeof(*e->techniques)))) + if (!(e->techniques = heap_calloc(e->technique_count, sizeof(*e->techniques)))) { ERR("Failed to allocate techniques memory\n"); return E_OUTOFMEMORY; @@ -2398,15 +2393,15 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) TRACE("variable %p.\n", v); - HeapFree(GetProcessHeap(), 0, v->name); - HeapFree(GetProcessHeap(), 0, v->semantic); + heap_free(v->name); + heap_free(v->semantic); if (v->annotations) { for (i = 0; i < v->annotation_count; ++i) { d3d10_effect_variable_destroy(&v->annotations[i]); } - HeapFree(GetProcessHeap(), 0, v->annotations); + heap_free(v->annotations); } if (v->members) @@ -2415,7 +2410,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { d3d10_effect_variable_destroy(&v->members[i]); } - HeapFree(GetProcessHeap(), 0, v->members); + heap_free(v->members); } if (v->elements) @@ -2424,7 +2419,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { d3d10_effect_variable_destroy(&v->elements[i]); } - HeapFree(GetProcessHeap(), 0, v->elements); + heap_free(v->elements); } if (v->type) @@ -2508,7 +2503,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) TRACE("pass %p\n", p); - HeapFree(GetProcessHeap(), 0, p->name); + heap_free(p->name); if (p->objects) { @@ -2516,7 +2511,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { d3d10_effect_object_destroy(&p->objects[i]); } - HeapFree(GetProcessHeap(), 0, p->objects); + heap_free(p->objects); } if (p->annotations) @@ -2525,7 +2520,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { d3d10_effect_variable_destroy(&p->annotations[i]); } - HeapFree(GetProcessHeap(), 0, p->annotations); + heap_free(p->annotations); } } @@ -2535,14 +2530,14 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) TRACE("technique %p\n", t); - HeapFree(GetProcessHeap(), 0, t->name); + heap_free(t->name); if (t->passes) { for (i = 0; i < t->pass_count; ++i) { d3d10_effect_pass_destroy(&t->passes[i]); } - HeapFree(GetProcessHeap(), 0, t->passes); + heap_free(t->passes); } if (t->annotations) @@ -2551,7 +2546,7 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) { d3d10_effect_variable_destroy(&t->annotations[i]); } - HeapFree(GetProcessHeap(), 0, t->annotations); + heap_free(t->annotations); } } @@ -2561,14 +2556,14 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) TRACE("local buffer %p.\n", l); - HeapFree(GetProcessHeap(), 0, l->name); + heap_free(l->name); if (l->members) { for (i = 0; i < l->type->member_count; ++i) { d3d10_effect_variable_destroy(&l->members[i]); } - HeapFree(GetProcessHeap(), 0, l->members); + heap_free(l->members); } if (l->type) @@ -2580,7 +2575,7 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) { d3d10_effect_variable_destroy(&l->annotations[i]); } - HeapFree(GetProcessHeap(), 0, l->annotations); + heap_free(l->annotations); } } @@ -2636,7 +2631,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_technique_destroy(&This->techniques[i]); } - HeapFree(GetProcessHeap(), 0, This->techniques); + heap_free(This->techniques); } if (This->local_variables) @@ -2645,7 +2640,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_variable_destroy(&This->local_variables[i]); } - HeapFree(GetProcessHeap(), 0, This->local_variables); + heap_free(This->local_variables); } if (This->local_buffers) @@ -2654,7 +2649,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_local_buffer_destroy(&This->local_buffers[i]); } - HeapFree(GetProcessHeap(), 0, This->local_buffers); + heap_free(This->local_buffers); } if (This->anonymous_shaders) @@ -2662,17 +2657,17 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) for (i = 0; i < This->anonymous_shader_count; ++i) { d3d10_effect_variable_destroy(&This->anonymous_shaders[i].shader); - HeapFree(GetProcessHeap(), 0, This->anonymous_shaders[i].type.name); + heap_free(This->anonymous_shaders[i].type.name); } - HeapFree(GetProcessHeap(), 0, This->anonymous_shaders); + heap_free(This->anonymous_shaders); } - HeapFree(GetProcessHeap(), 0, This->used_shaders); + heap_free(This->used_shaders); wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); ID3D10Device_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refcount; diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index a6a9a30..c97d8df 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -68,9 +68,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return refcount; } diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 470d325..ebeebf7 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -275,7 +275,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) { stateblock_cleanup(stateblock); ID3D10Device_Release(stateblock->device); - HeapFree(GetProcessHeap(), 0, stateblock); + heap_free(stateblock); } return refcount; @@ -522,8 +522,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, TRACE("device %p, mask %p, stateblock %p.\n", device, mask, stateblock); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 stateblock object memory.\n"); return E_OUTOFMEMORY; -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use more resource access flags in wined3d_texture_use_pbo().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 101f9ad..f166c2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP + return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in wined3d_surface_blt().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f34ad0..388b803 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { TRACE("Depth/stencil blit.\n"); - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, @@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blit_op = WINED3D_BLIT_OP_RAW_BLIT; } - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, -- 2.1.4

1 0

[PATCH 1/5] wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f91c21..5f34ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2744,14 +2744,16 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) - return resource->pool == WINED3D_POOL_SYSTEM_MEM; + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU); texture = texture_from_resource(resource); locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) - return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, -- 2.1.4

1 0

[PATCH] comctl32/tests: Add test for v6 combobox dropdown size
by Fabian Maurer 31 Jan '18

31 Jan '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d9429b4..74cbe7851e 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -33,6 +33,8 @@ #define EDITBOX_ID 0 #define COMBO_ID 1995 +#define COMBO_YBORDERSIZE() 2 + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ @@ -1151,6 +1153,137 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } + +static void test_listbox_size(DWORD style) +{ + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + UINT x, y; + BOOL ret; + int i, test; + const char wine_test[] = "Wine Test"; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + BOOL todo_regular; + BOOL todo_nointegral; + } info_height[] = { + {2, 24, -1, TRUE, TRUE}, + {2, 41, -1, TRUE, TRUE}, + {2, 300, -1, TRUE}, + {6, 50, -1, TRUE, TRUE}, + {6, 1, -1, TRUE, TRUE}, + {6, 800, -1, TRUE}, + {80, 10, -1, TRUE, TRUE}, + {100, 900, -1, TRUE, TRUE}, + {2, 100, -1, TRUE}, + + {2, 12, 30, FALSE, TRUE}, + {100, 12, 30, TRUE, TRUE}, + {2, 12, 1, TRUE, TRUE}, + {100, 12, 1, TRUE, TRUE}, + {2, 12, 100, FALSE, TRUE}, + {100, 12, 100, TRUE, TRUE}, + {15, 12, 4, TRUE, TRUE}, + {15, 12, 15, TRUE, TRUE}, + + {10, 24, -1, TRUE, TRUE}, + {10, 41, -1, TRUE, TRUE}, + {10, 42, -1, TRUE, TRUE}, + {10, 50, -1, TRUE, TRUE}, + }; + + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Expected maximum of visible items to be 30, got %d\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = GetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + + if(info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "Expected maximum of visible items to be %d, got %d\n", + min_visible_expected, min_visible_actual); + } + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + ret = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(ret, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if(style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo + - (cbInfo.rcItem.bottom + COMBO_YBORDERSIZE()) + - list_height_nonclient + - 1; + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if( expected_height_list < 0) + expected_height_list = 0; + + todo_wine_if(info_test->todo_nointegral) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine_if(info_test->todo_regular) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1325,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_listbox_size(CBS_DROPDOWN); + test_listbox_size(CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx); -- 2.16.1

4 6

[PATCH] msscript.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e55a1..1f706f5380 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -28,6 +28,7 @@ #include "msscript.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); @@ -103,16 +104,6 @@ struct ScriptControl { static HINSTANCE msscript_instance; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - typedef enum tid_t { IScriptControl_tid, LAST_tid -- 2.14.3

1 0

[PATCH] msident: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msident/msident.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 3efb190a39..8b9842f960 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,19 +24,10 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE msident_instance; typedef struct { -- 2.14.3

1 0

[PATCH] jsproxy: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jsproxy/main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index a52fbb4df7..d1ac903eb6 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -51,6 +51,7 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" static HINSTANCE instance; @@ -87,16 +88,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; -- 2.14.3

1 0

[PATCH] inseng: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inseng/inseng_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c95d2c7321..93649e20e9 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -33,19 +33,10 @@ #include "inseng.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE instance; struct InstallEngine { -- 2.14.3

1 0

[PATCH] inetcpl.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/inetcpl.h | 19 ------------------- dlls/inetcpl.cpl/security.c | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 4aae2922f3..50d4bd1e66 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -31,25 +31,6 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - -/* ######### */ - #define NUM_PROPERTY_PAGES 8 /* icons */ diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 6d7905785b..543ada433d 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,6 +37,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -- 2.14.3

1 0

[PATCH] inetcomm: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/inetcomm_private.h | 10 ---------- dlls/inetcomm/mimeole.c | 1 + dlls/inetcomm/protocol.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 816493bb0b..b27cbd7bc1 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -83,13 +83,3 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDD HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186ca1f..681ca820d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -33,6 +33,7 @@ #include "mimeole.h" #include "propvarutil.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index b7b01d4aaf..028463a269 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -25,6 +25,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); -- 2.14.3

1 0

[PATCH] hlink: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/hlink_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 33b58ac42f..1b7847bb74 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,12 @@ #include "ole2.h" #include "hlink.h" +#include "wine/heap.h" #include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR hlink_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] testbot: Better wrap the database backend code.
by Francois Gouget 31 Jan '18

31 Jan '18

ObjectModel::BackEnd no longer exposes its global active backends variable. Also provide a way to close all database connections so the code does not have to assume we only have the 'WineTestBot' one which would defeat the point of the BackEnd module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 +++++++++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++++---- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 827879cf..d6375647 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connection - $ActiveBackEnds{'WineTestBot'}->Close(); + # Make sure the child process does not inherit the database connections + CloseAllDBBackEnds(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 6c5c813d..0bb48cf7 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT %ActiveBackEnds); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(%ActiveBackEnds); +@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); sub new($@) { @@ -51,4 +51,33 @@ sub _initialize($) #my ($self) = @_; } + +my %_ActiveBackEnds; + +sub AddDBBackEnd($$) +{ + my ($Name, $BackEnd) = @_; + $_ActiveBackEnds{$Name} = $BackEnd; +} + +sub GetDBBackEnd($) +{ + my ($Name) = @_; + return $_ActiveBackEnds{$Name}; +} + +sub RemoveDBBackEnd($) +{ + my ($Name) = @_; + delete $_ActiveBackEnds{$Name}; +} + +sub CloseAllDBBackEnds() +{ + foreach my $BackEnd (values %_ActiveBackEnds) + { + $BackEnd->Close(); + } +} + 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 565d4a8e..d4b07777 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$@) +sub UseDBIBackEnd($$$$$$) { - my $class = shift; - my $DbSelector = shift; + my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; + my $BackEnd = $class->new(); + $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; + AddDBBackEnd($DbSelector, $BackEnd); } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2ba6b4b5..bb9a8328 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connection - $self->GetBackEnd()->Close(); + # Make sure the child process will use its own database connections + CloseAllDBBackEnds(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index b46fa41d..20ff6b1e 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } 1; -- 2.15.1

1 1

[PATCH 5/6] d2d1: Introduce a helper function to allocate arrays.
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 6 ++++-- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/d2d1_private.h | 9 +++++++++ dlls/d2d1/geometry.c | 6 +++--- dlls/d2d1/render_target.c | 4 ++-- dlls/d2d1/stroke.c | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43ed094..028fab3 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -509,9 +509,11 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d } pitch = ((bpp * size.width) + 15) & ~15; - data_size = pitch * size.height; - if (!(data = heap_alloc(data_size))) + if (pitch / bpp < size.width) return E_OUTOFMEMORY; + if (!(data = d2d_calloc(size.height, pitch))) + return E_OUTOFMEMORY; + data_size = size.height * pitch; rect.X = 0; rect.Y = 0; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6759019..0531a3a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) + if (!(data = d2d_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -205,7 +205,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = d2d_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); heap_free(*gradient); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index caeb4b9..2c10252 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,15 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +static inline void *d2d_calloc(size_t count, size_t size) +{ + SIZE_T s = count * size; + + if (size && s / size != count) + return NULL; + return heap_alloc(s); +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 88beee2..c805084 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2052,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) + if (!(vertices = d2d_calloc(vertex_count, sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2819,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count - * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = d2d_calloc(geometry->fill.bezier_vertex_count, + sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 73f15f7..cc820cf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1175,12 +1175,12 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; - opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = heap_alloc(opacity_values_size))) + if (!(opacity_values = d2d_calloc(bitmap_size.height, bitmap_size.width))) { ERR("Failed to allocate opacity values.\n"); goto done; } + opacity_values_size = bitmap_size.height * bitmap_size.width; if (FAILED(hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texture_type, &bounds, opacity_values, opacity_values_size))) diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index a0830e3..63f88c7 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = d2d_calloc(dash_count, sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; -- 2.1.4

3 2

[PATCH website] Remove static Download pages and redirect to wiki
by Rosanne DiMesio 31 Jan '18

31 Jan '18

The Download page is now on the wiki at https://wiki.winehq.org/Download. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/htaccess.sample | 12 +-- templates/de/download.template | 165 ----------------------------------- templates/de/home.template | 2 +- templates/en/download.template | 159 ---------------------------------- templates/en/home.template | 2 +- templates/es/home.template | 2 +- templates/fr/download.template | 178 -------------------------------------- templates/fr/home.template | 2 +- templates/ko/download.template | 159 ---------------------------------- templates/ko/home.template | 2 +- templates/pl/download.template | 159 ---------------------------------- templates/pl/home.template | 2 +- templates/pt/download.template | 162 ---------------------------------- templates/pt/home.template | 2 +- templates/tr/download.template | 149 ------------------------------- templates/tr/home.template | 2 +- templates/uk/download.template | 153 -------------------------------- templates/uk/home.template | 2 +- templates/zh-cn/download.template | 159 ---------------------------------- templates/zh-cn/home.template | 2 +- 20 files changed, 16 insertions(+), 1459 deletions(-) delete mode 100644 templates/de/download.template delete mode 100644 templates/en/download.template delete mode 100644 templates/fr/download.template delete mode 100644 templates/ko/download.template delete mode 100644 templates/pl/download.template delete mode 100644 templates/pt/download.template delete mode 100644 templates/tr/download.template delete mode 100644 templates/uk/download.template delete mode 100644 templates/zh-cn/download.template diff --git a/include/htaccess.sample b/include/htaccess.sample index ae532686..2e25cdfb 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -36,11 +36,11 @@ RedirectPermanent /dev https://www.winehq.org/getinvolv RedirectPermanent /dev.shtml https://www.winehq.org/getinvolved RedirectPermanent /dev.html https://www.winehq.org/getinvolved RedirectPermanent /devstart.shtml https://www.winehq.org/getinvolved -RedirectPermanent /download/index.php https://www.winehq.org/download -RedirectPermanent /download.shtml https://www.winehq.org/download -RedirectPermanent /download.html https://www.winehq.org/download -RedirectPermanent /download-mirrors.html https://www.winehq.org/download -RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download +RedirectPermanent /download/index.php https://wiki.winehq.org/Download +RedirectPermanent /download.shtml https://wiki.winehq.org/Download +RedirectPermanent /download.html https://wiki.winehq.org/Download +RedirectPermanent /download-mirrors.html https://wiki.winehq.org/Download +RedirectPermanent /download-mirrors.shtml https://wiki.winehq.org/Download RedirectPermanent /site/download-deb https://wiki.winehq.org/Debian RedirectPermanent /download/debian https://wiki.winehq.org/Debian RedirectPermanent /download/ubuntu https://wiki.winehq.org/Ubuntu @@ -67,7 +67,7 @@ RedirectPermanent /todo https://wiki.winehq.org/KnownIss RedirectPermanent /site/history https://wiki.winehq.org/WineHistory RedirectPermanent /fun_projects https://wiki.winehq.org/Fun_Projects RedirectPermanent /winelib https://wiki.winehq.org/Winelib -RedirectMatch ^/download/deb.*$ https://www.winehq.org/download/ +RedirectMatch ^/download/deb.*$ https://wiki.winehq.org/Download RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf diff --git a/templates/de/download.template b/templates/de/download.template deleted file mode 100644 index b5969715..00000000 --- a/templates/de/download.template +++ /dev/null @@ -1,165 +0,0 @@ - - - -<h1 class="title">Wine Downloads</h1> - -<a name="crossover"></a> -<h2>Wine mit Support</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - ist eine auf Hochglanz polierte Wine-Version, die von <b><a href="https://www.codeweavers.com">CodeWeavers</a></b> - bereitgestellt wird. CrossOver vereinfacht die Bedienung von Wine und CodeWeavers leistet exzellenten technischen - Support für seine Nutzer. Alle Käufe von CrossOver werden direkt zur finanziellen Unterstützung - der Wine-Entwickler genutzt. Darum ist CrossOver eine großartige Möglichkeit, sowohl Unterstützung für - Wine zu bekommen, als auch das Wine-Projekt zu unterstützen.<br> - CodeWeavers stellt vollständig funktionsfähige - <b><a href="https://www.codeweavers.com/products">Testversionen von Crossover</a></b> zur Verfügung.</p> - <p class="small">Diese Empfehlung ist die primäre Anerkennung, die CodeWeavers als Dank - für das Hosten der Wine-Webseite erbeten hat.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine Binärpakete</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Neueste stabile Version: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Neueste Entwicklungsversion: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Lesen Sie die <a href="https://wiki.winehq.org/HowTo">Installations- und Konfigurationsanleitung (en)</a>, - um zu erfahren, welche Schritte nach der Installation auszuführen sind.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ Binärpakete -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Die folgenden Pakete werden von WineHQ erstellt und unterstützt.<br> - Bitte melden Sie Probleme mit diesen Paketen im <a href="http://bugs.winehq.org">WineHQ Bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - WineHQ Binärpakete für Ubuntu 14.04, 16.04, 16.10 und 17.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ Binärpakete für Debian Wheezy, Jessie, Stretch, Buster und Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ Binärpakete für Fedora 24, 25 und 26</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - WineHQ Binärpakete für macOS 10.8 und höher</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Binärpakete der Distibutionen -</div> - -<div class="whq-info-box center"> - Die folgenden Pakete werden von den jeweiligen Distributionen erstellt und unterstützt.<br> - Bei Problemen mit diesen Paketen melden Sie das bitte dem zuständigen Maintainer. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - binäre und Quellcode .rpms, sowie tägliche Snapshot-RPMs für alle openSUSE-Versionen (11.4 bis 13.2 und Leap 42.1) wie auch SUSE Linux Enterprise 11 und 12<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - binäre txz (Slackware 14.2) und tgz (für ältere Versionen)<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - Quelltext für FreeBSD 5.3 und neuer<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Tools von Drittanbietern</h2> - -<p>Manchmal sorgt eine Anpassung von Wine dafür, dass bestimmte Anwendungen funktionieren, jedoch können die Änderungen -aus verschiedenen Gründen nicht in Wine selbst aufgenommen werden. Um gegenwärtige Defizite von Wine zu überwinden, -wurden über die Jahre diverse Hilfsprogramme für Endanwender erstellt. Diese Anwendungen werden seitens der Wine-Entwickler -in keinster Weise unterstützt, könnten aber dennoch nützlich sein. -Weitergehende Informationen dazu finden Sie auf <a href="https://wiki.winehq.org/ThirdPartyApplications">unserer Wiki-Seite (en)</a> -zu Drittanwendungen.</p> - -<a name="source"></a> -<h2>Quelltext-Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Unsere offizielle Seite zur Veröffentlichung von Quelltexten. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Die aktuelle Entwicklungsversion. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Alternative Downloadseite für offizielle Quellcode- und Dokumentations-Tarballs. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Anmerkung:</b> Die Informationen über <a href="https://wiki.winehq.org/Recommended_Packages">empfohlene Pakete (en)</a> - enthalten Hinweise zur Konfiguration und zum Kompilieren von Wine. -</div> diff --git a/templates/de/home.template b/templates/de/home.template index 92a42d3e..433bc733 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Installieren Sie die neueste Wine-Version.</span> diff --git a/templates/en/download.template b/templates/en/download.template deleted file mode 100644 index 27351b6a..00000000 --- a/templates/en/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">Wine Downloads</h1> - -<a name="crossover"></a> -<h2>Supported Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - is a polished version of Wine provided by <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver makes it easier to use Wine and CodeWeavers provides excellent technical support to its users. - All purchases of CrossOver are used to directly fund the developers working on Wine. So CrossOver is both a great way to get - support in using Wine and to support the Wine Project.<br> - CodeWeavers provides fully functional - <b><a href="https://www.codeweavers.com/products">trial versions of CrossOver</a></b>.</p> - <p class="small">This endorsement is the primary recognition that CodeWeavers has - requested in exchange for hosting the Wine web site.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine Binary Packages</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Latest stable release: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Latest development release: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>See the <a href="https://wiki.winehq.org/HowTo">installation and configuration how-to</a> for post-installation instructions.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ Binary Packages -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - These packages are built and supported by WineHQ.<br> - Please report any problems with them in <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - WineHQ binary packages for Ubuntu 14.04, 16.04, 16.10, 17.04, and 17.10</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ binary packages for Debian Wheezy, Jessie, Stretch, Buster, and Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ binary packages for Fedora 24, 25, and 26 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - WineHQ binary packages for Mageia 6 </p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - WineHQ binary packages for macOS 10.8 and higher</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Distro Binary Packages -</div> - -<div class="whq-info-box center"> - These packages are built and supported by the distros.<br> - Please report any problems with them to the package maintainer. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.4 up to 13.2 and Leap 42.1) and SUSE Linux Enterprise 11 and 12.<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - binary txz (Slackware 14.2), and tgz (for older versions)<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - source for FreeBSD 5.3 or later<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>3rd Party Tools</h2> - -<p>Sometimes a customization of Wine can cause an application to work, but this change cannot be incorporated into Wine for some reason. To help overcome current deficiencies in Wine, various third party applications for end users have been made over the years. These applications are entirely unsupported by the Wine developers, however you may find them useful. For more information, see <a href="https://wiki.winehq.org/ThirdPartyApplications">our wiki page</a> on third party applications.</p> - -<a name="source"></a> -<h2>Wine Source Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Our official source release site. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - For the latest development version. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Alternative download site for the official source and documentation tarballs. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Note:</b> See the <a href="https://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine. -</div> diff --git a/templates/en/home.template b/templates/en/home.template index b7735dff..d525e1a2 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Install the latest Wine.</span> diff --git a/templates/es/home.template b/templates/es/home.template index a96945e6..2577b447 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Descarga</span> <span class="subtitle">Instala la última versión de Wine.</span> diff --git a/templates/fr/download.template b/templates/fr/download.template deleted file mode 100644 index b8d89cfc..00000000 --- a/templates/fr/download.template +++ /dev/null @@ -1,178 +0,0 @@ - - - -<h1 class="title">Télécharger Wine</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Wine avec support</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Produit</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Description</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux ou Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - est une version affinée de Wine fournie par <b><a href="http://www.codeweavers.com">CodeWeavers</a></b>. -CrossOver facilite l'utilisation de Wine et fournit un excellent support -technique à ses utilisateurs. -Tous les achats de CrossOver sont utilisés pour financer directement les -développeurs travaillant sur Wine. Ainsi, CrossOver constitue à la fois un -excellent moyen d'obtenir du support lors de l'utilisation de Wine et un -soutien au projet Wine.<br>CodeWeavers fournit des - <b><a href="http://www.codeweavers.com/products/download_trial/">versions -d'évaluation de CrossOver</a></b> entièrement fonctionnelles. - </td> - </tr> -</table> - -<p class="small" align="center">Cet endossement est la principale exigence de -CodeWeavers en échange de l'hébergement du site web de Wine.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Téléchargements binaires de Wine</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Dernière version stable :</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: -center;"><b>Voyez la - <a href="https://wiki.winehq.org/HowTo">procédure d'installation et de configuration</a> - pour les instructions de post-installation.</b></td> -</tr> -<tr> - <td>Dernière version de développement :</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small"></font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Paquets binaires WineHQ</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Maintenanceur</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"></td> - <td align="center"><b>Ces paquets sont construits et supportés par WineHQ.<br> - Veuillez rapporter tout problème rencontré (en anglais) dans le <a href="http://bugs.winehq.org">bugzilla de WineHQ</a>.</b> - </td> - <td></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"> - <img src="{$root}/images/winehq_logo_glass_sm.png" alt="WineHQ" border="0"> - </td> - <td> - <p><b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Ubuntu 12.04, 14.04, 15.04, 15.10, 16.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Debian Wheezy, Jessie, Stretchi et Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Fedora 22 and 23 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Mageia 4 and 5</p> - <p><b>macOS</b> - - prévu ; pas encore disponible pour le téléchargement.</p> - <td><a href="mailto:michael@fds-team.de">Michael Müller</a></td> - </tr> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small"></font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Paquets binaires des distributions</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Maintenanceur</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"></td> - <td align="center"><b>Ces paquets sont construits et supportés par les distributions.<br> - Veuillez rapporter tout problème rencontré au maintenanceur du paquet.</b> - </td> - <td></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - .rpm binaires et sources, et instantanés quotidiens pour toutes les versions de openSUSE - (11.4 jusqu'à 13.2 et Leap 42.1) et SUSE Linux Enterprise 11 et 12.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - .txz binaires (Slackware 14.2), et .tgz binaires (pour les versions plus anciennes)</td> - <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - code source pour FreeBSD 5.3 ou ultérieur</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>Outils tiers</h2> - -<p>Parfois, il arrive qu'une adaptation de Wine permette à une application de -fonctionner correctement, mais qu'elle ne puisse être incorporée à Wine pour une -raison quelconque. Pour pallier les imperfections actuelles de Wine, diverses -applications tierces pour utilisateurs finaux ont été conçues au fil des ans. -Les développeurs Wine ne supportent en aucun cas ces applications, mais -il se peut que vous les trouviez utiles. Pour plus d'informations, voyez notre page -wiki sur les <a -href="https://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</p> - -<h2><a name="source"></a>Téléchargement des sources de Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Emplacement</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Description</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Site officiel de téléchargement. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Version de développement la plus récente. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Site de téléchargement alternatif pour les tarballs officiels de -sources et de documentation.</td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; -background-color: #F0F0F0;"><b>Note:</b> Voyez les <a -href="https://wiki.winehq.org/Recommended_Packages">paquets recommandés</a> pour -de l'aide sur la configuration et la construction de Wine.</div> - diff --git a/templates/fr/home.template b/templates/fr/home.template index a0846b29..400c9de0 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Téléchargement</span> <span class="subtitle">Installez la dernière version de Wine.</span> diff --git a/templates/ko/download.template b/templates/ko/download.template deleted file mode 100644 index be114816..00000000 --- a/templates/ko/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">와인 내려받기</h1> - -<a name="crossover"></a> -<h2>지원되는 와인판본</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">크로스오버</a></b>는 - <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>가 제공하는 세련된 와인입니다. - 크로스오버는 사용하기 편리하며 CodeWeavers가 완벽한 기술 지원을 해줍니다. - 크로스오버 판매금은 전액 와인 개발자에게 돌아갑니다. 즉 크로스오버는 사용감과 와인 개발 지원이라는 두 마리 토끼를 한 번에 잡습니다 .<br> - CodeWeavers에서는 모든 기능을 갖춘 - <b><a href="https://www.codeweavers.com/products">크로스오버 체험판</a></b>을 제공합니다.</p> - <p class="small">본 광고는 CodeWeavers에서 누리집 호스팅을 맡으며한 제1의 요청입니다.</p> - </div> -</div> - -<a name="binary"></a> -<h2>와인 실행 파일 꾸러미</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - 최신 안정판 : - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">와인 {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - 최신 개발자판 : - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">와인 {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b><a href="https://wiki.winehq.org/HowTo">설치와 구성 방법</a>의 설치전 부분을 확인 하시기 바랍니다.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 와인HQ 실행파일 꾸러미 -</div> - -<p class="small margin-bottom-md text-right"><b>유지보수자 :</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - 이 꾸러미는 와인HQ에서 제작하고 지원합니다.<br> - <a href="http://bugs.winehq.org">와인HQ의 버그질라</a>에 오류를 보고해 주십시오. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="와인HQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 우분투 14.04, 16.04, 16.10, 17.04, 17.10용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Debian Wheezy, Jessie, Stretch, Buster, Sid용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Fedora 24, 25, 26용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Mageia 6용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - macOS 10.8 및 이상판용 와인HQ 실행 파일</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 배포판 와인 실행파일 -</div> - -<div class="whq-info-box center"> - 이 꾸러미는 각 배포판이 제작하고 지원합니다.<br> - 각 꾸러미 유지보수자에게 오류 보고를 해주시기 바랍니다. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - 배포되는 실행파일과 원시 부호입니다. 모든 openSUSE판용 RPM 패키지 매니저 (11.4 up to 13.2 and Leap 42.1)와 SUSE Linux 기업용11과 12를 지원합니다.<br> - <span class="small"><b>유지보수부 :</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - 실행용 txz (Slackware 14.2)와 tgz (이전판용)<br> - <span class="small"><b>유지보수 :</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - FreeBSD 5.3및 이후판용 원시 부호<br> - <span class="small"><b>유지보수 :</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>제3 도구</h2> - -<p>일부 개작된 와인은 일부 응용 무른모를 동작시킬 수 있으나, 몇몇 이유로 공식 승인을 받지 않았습니다. 현 와인의 부족한 점을 채우기 위해, 여러 제3의 응용 무른모가 최종 사용자를 위해 수년간 개발되었습니다. -이 응용 무른모들은 와인 개발진이 지원하지 않으나, 여러분이 편리하게 이용하실 수 있습니다. -더 많은 정보는 <a href="https://wiki.winehq.org/ThirdPartyApplications">위키</a>에서 확인 할 수 있습니다.</p> - -<a name="source"></a> -<h2>와인 부호 내려받기</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - 저희 공식 부호 배포 누리집 입니다. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - 최신 개발자판 입니다. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - 공식 부호와 tar로 압축된 문서를 내려받을 수 있는 대체 누리집 입니다. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>일러두기 :</b> <a href="https://wiki.winehq.org/Recommended_Packages">권장 꾸러미</a>를 확인하여 와인 설치와 구성에 관한 도움을 얻을 수 있습니다. -</div> diff --git a/templates/ko/home.template b/templates/ko/home.template index be8359b6..70b14ee9 100644 --- a/templates/ko/home.template +++ b/templates/ko/home.template @@ -53,7 +53,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">내려받기</span> <span class="subtitle">최신판 와인 설치하기</span> diff --git a/templates/pl/download.template b/templates/pl/download.template deleted file mode 100644 index 71972b67..00000000 --- a/templates/pl/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">Pobieralnia Wine</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Wine ze wsparciem technicznym</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Produkt</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opis</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux or Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - jest bardziej dopracowaną wersją Wine dostarczaną przez <b><a href="http://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver usprawnia używanie Wine, a CodeWeavers zapewnia wspaniałe wsparcie techniczne swoim użytkownikom. - Wszystkie fundusze ze sprzedaży CrossOvera są przekazywane bezpośrednio na wsparcie dla programistów pracujących nad Wine. - Tak więc CrossOver jest idealną drogą do uzyskania wsparcia jak również do wspierania Projektu Wine. CodeWeavers dostarcza w pełni funkcjonalną - <b><a href="http://www.codeweavers.com/products/download_trial/">wersję trialową CrossOver</a></b>. - </td> - </tr> -</table> - -<p class="small" align="center">Ta rekomendacja jest głównym dowodem uznania wymaganym przez CodeWeavers w zamian za hostowanie strony Wine.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Pobieralnia binariów Wine</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Najnowsze stabilne wydanie:</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Zajrzyj do - <a href="https://wiki.winehq.org/HowTo">samouczka konfiguracji i instalacji</a> - , aby zaznajomić się z czynnościami po-instalacyjnymi.</b></td> -</tr> -<tr> - <td>Najnowsze rozwojowe wydanie:</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">System</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Uwagi</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opiekun</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/ubuntu">Pobierz paczki dla Ubuntu</a></b> - - binarne i źródłowe paczki .deb dla Ubuntu</td> - <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/debian">Pobierz paczki dla Debian</a></b> - - binarne paczki .deb dla Debian</td> - <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> - </td> - <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Pobierz paczki dla Red Hat / CentOS / Fedora</a></b> - - binarne i źródłowe paczki .rpm dla Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 i - kompatybilnych dystrybucji. - Meta paczka Wine jest dostępna przez <tt>yum</tt> - dzięki repozytorium EPEL / Fedora Extras / Fedora poprzez wpisanie w terminalu <tt>$ yum install - wine </tt>" - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Pobierz paczki dla SUSE</a></b> - - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.4 - 13.2 i SUSE Linux Enterprise 11.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Pobierz paczki dla Slackware</a></b> - - binarne paczki txz (Slackware 14.2), i tgz (dla starszych wersji)</td> - <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">Pobierz paczki dla FreeBSD</a></b> - - źródło dla FreeBSD 5.3 lub późniejszych</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>Aplikacje osób trzecich</h2> - -<p>Czasami pewne zmiany Wine mogą sprawić, -że aplikacja będzie działać, ale z pewnych powodów zmiany te nie -mogą być wcielone do Wine. Stworzono różne aplikacje (tzw. -aplikacje osób trzecich), aby pomóc przezwyciężyć niedobory w -Wine. Aplikacje te są całkowicie niewspierane przez programistów -Wine, jednakże mogą ci się przydać. Aby dowiedzieć się więcej, -odwiedź <a href="https://wiki.winehq.org/ThirdPartyApplications">naszą -stronę wiki</a> w poszukiwaniu aplikacji osób trzecich.</p> - -<h2><a name="source"></a>Pobieralnia źródeł Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Położenie</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opis</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Nasza oficjalna strona źródeł. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Do najnowszych wydań rozwojowych. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Alternatywna strona z oficjalnymi źródłami i dokumentacją. </td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Notka:</b> Zobacz <a href="https://wiki.winehq.org/Recommended_Packages">zalecane paczki</a> , aby uzyskać pomoc przy konfiguracji i kompilacji Wine.</div> - diff --git a/templates/pl/home.template b/templates/pl/home.template index a6318211..f068c277 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -53,7 +53,7 @@ za to z wyglądem podobnym do innych aplikacji na twoim komputerze.</p> <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Pobieralnia</span> <span class="subtitle">Wgraj sobie najnowsze Wine.</span> diff --git a/templates/pt/download.template b/templates/pt/download.template deleted file mode 100644 index 510cfb34..00000000 --- a/templates/pt/download.template +++ /dev/null @@ -1,162 +0,0 @@ - - - -<h1 class="title">Downloads do Wine</h1> - -<a name="crossover"></a> -<h2>Wine com Suporte</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - é uma versão mais polida do Wine fornecida pela empresa <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver torna mais fácil o uso do Wine e a CodeWeavers provê um excelente suporte técnico para seus usuários. - Todas as compras do CrossOver são usados para financiar diretamente os desenvolvedores trabalhando no Wine. - Logo, Crossover é ao mesmo tempo uma ótima maneira de utilizar o Wine e apoior o projeto. - A CodeWeavers oferece - <b><a href="https://www.codeweavers.com/products">versões de demonstração do CrossOver</a></b> - totalmente funcionais.</p> - <p class="small">Este endosso é o reconhecimento que a CodeWeavers solicitou em troca da hospedagem do site do Wine.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Pacotes Binários do Wine</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Última versão estável: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Última versão de desenvolvimento: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Leia o <a href="https://wiki.winehq.org/HowTo">how-to de instalação e configuração</a> para instruções pós-instalação.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Pacotes binários fornecidos pelo WineHQ -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Pacotes construídos e com suporte do WineHQ.<br> - Por favor, reporte qualquer problema encontrado neles no <a href="http://bugs.winehq.org">bugzilla do WineHQ</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Ubuntu 12.04, 14.04, 15.04, 15.10 e 16.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Debian Wheezy, Jessie, Stretch e Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Fedora 22, 23 e 24</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Mageia 4 e 5</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para macOS 10.8 e superior</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Pacotes Binários de Distruições -</div> - -<div class="whq-info-box center"> - Esses pacotes são construídos e suportados pelas distribuições.<br> - Por favor, reporte qualquer problema encontrado para o respectivo mantenedor do pacote. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - lançamento binário e código-fonte em .rpms e snapshots diários em RPMs para todos openSUSE versões (11.4 até 13.2 e Leap 42.1) e SUSE Linux Enterprise 11 e 12.<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - txz binário (Slackware 14.2), e tgz (para versões mais antigas)<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - código-fonte para FreeBSD 5.3 ou superior<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Ferramentas de Terceiros</h2> - -<p>Algumas vezes uma personalização do Wine pode fazer um aplicativo funcionar, mas está mudança não pode ser incorporada no Wine por alguma razão. -Para ajudar a superar essas deficiências no Wine várias ferramentas de terceiros para usuários finais foram criadas ao longo dos anos. -Esses aplicativos são completamente NÃO suportados pelos desenvolvedores do Wine, apesar disso você pode achar neles alguma utilidade. -Para mais informações veja<a href="https://wiki.winehq.org/ThirdPartyApplications">nossa página wiki</a> sobre ferramentas de terceiros.</p> - -<a name="source"></a> -<h2>Download de código-fonte</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Nosso site oficial para lançamentos. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Para a última versão em desenvolvimento. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Site alternativo para downloads do código-fonte oficial e documentação em formato tar. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Nota:</b> Veja a lista de <a href="https://wiki.winehq.org/Recommended_Packages">pacotes recomendados</a> para ajuda para configurar ou compilar o Wine. -</div> diff --git a/templates/pt/home.template b/templates/pt/home.template index 85bdaf50..ad6c8340 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -53,7 +53,7 @@ com um visual semelhante às outras aplicações do seu computador.</p> <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Instale a última versão do Wine.</span> diff --git a/templates/tr/download.template b/templates/tr/download.template deleted file mode 100644 index ce09d364..00000000 --- a/templates/tr/download.template +++ /dev/null @@ -1,149 +0,0 @@ - - - -<h1 class="title">Wine İndirmeleri</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Destekli Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Ürün</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Tanım</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux veya Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - Wine'ın <b><a href="http://www.codeweavers.com">CodeWeavers</a></b> tarafından sağlanan parlatılmış sürümüdür. - CrossOver, Wine'ı daha kolay kullanmayı kılar ve CodeWeavers kullanıcılarına mükemmel teknik destek sunar. - CrossOver için yapılmış tüm ödemeler, doğrudan Wine üzerinde çalışan geliştiricilere gönderilir. Bu yüzden CrossOver, Wine kullanımına destek almak ve Wine Projesine destek olmak için mükemmel bir yoldur. CodeWeavers tam özellikli - <b><a href="http://www.codeweavers.com/products/download_trial/">CrossOver deneme sürümünü</a></b> sağlamaktadır. - </td> - </tr> -</table> - -<p class="small" align="center">Bu açıklama, CodeWeavers'ın Wine web sitesine ev sahipliği yapmak için istediği birincil algılama değişikliğidir.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine İkili İndirmeleri</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Son kararlı sürüm:</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Kurulum sonrası talimatları için - <a href="https://wiki.winehq.org/HowTo">kurulum ve yapılandırma nasıl yapılır</a> - sayfasına bakın.</b></td> -</tr> -<tr> - <td>Son geliştirme sürümü:</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Sistem</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Notlar</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Bakımcı</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/ubuntu">Ubuntu paketleri indirin</a></b> - - Ubuntu için .debs ikili ve kaynak paketi - <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/debian">Debian paketleri indirin</a></b> - - Debian için ikili .deb dosyaları</td> - <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> - </td> - <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora paketleri indirin</a></b> - - Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 ve uyumlu dağıtımlar için ikili ve kaynak .rpms dosyaları - Wine üst paketi <tt>yum</tt> aracılığıyla <tt>$ yum install - wine </tt> çalıştırılarak EPEL / Fedora Extras / Fedora deposundan alınabilir. - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE paketleri indirin</a></b> - - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 11.4 - 13.2 ve SUSE Linux Enterprise 11 için.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware paketleri indirin</a></b> - - ikili txz (Slackware 14.2) ve tgz (daha eski sürümler için) dosyaları</td> - <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD paketleri indirin</a></b> - - FreeBSD 5.3 ve sonrası için kaynaklar</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>3. Parti Araçlar</h2> - -<p>Bazen bir Wine özelleştirmesi bir uygulamanın çalışmasını sağlarken, bazı nedenlerden dolayı Wine içerisine katılamayabilir. Bu, Wine içerisindeki güncel sorunları önlemek adına son kullanıcılar için çeşitli üçünkü parti uygulamalar yıllardır geliştirilmektedir. Bu uygulamalar Wine geliştiricileri tarafından desteklenmemektedir ancak kullanışlı olabilirler. Daha fazla bilgi için üçüncü parti yazılımlara ayrılmış <a href="https://wiki.winehq.org/ThirdPartyApplications">wiki sayfamıza</a> bakmanızı öneriririz.</p> - -<h2><a name="source"></a>Wine Kaynak Dosyalar</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Konum</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Açıklama</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Resmi kaynak yayın sitemiz. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Son geliştirme sürümü için. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Resmi kaynak ve belgeler için alternatif indirme sitesi. </td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Not:</b> Wine yapılandırması ve derlemesi hakkında yardım için <a href="https://wiki.winehq.org/Recommended_Packages">önerilen paketler</a> sayfasına bakın.</div> - diff --git a/templates/tr/home.template b/templates/tr/home.template index 81bf2c3d..1da7bd83 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">İndir</span> <span class="subtitle">Wine yükleyin.</span> diff --git a/templates/uk/download.template b/templates/uk/download.template deleted file mode 100644 index feb738ad..00000000 --- a/templates/uk/download.template +++ /dev/null @@ -1,153 +0,0 @@ - - - -<h1 class="title">Завантаження Wine</h1> - -<a name="crossover"></a> -<h2>Підтримка Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - це допрацьована версія Wine від <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. З CrossOver зручніше використовувати Wine, крім того CodeWeavers забезпечують чудову технічну підтримку своїм користувачам. Всі покупки зроблені через CrossOver напряму підтримують розробників, що працюють над Wine. Тож CrossOver це гарна можливість отримати підтримку у використанні Wine та надати підтримку Wine, як проекту.<br>Ви можете <b><a href="https://www.codeweavers.com/products">завантажити повнофункціональну пробну версію CrossOver</a></b>.</p> - <p class="small">Наявність цієї реклами - головна вимога від CodeWeavers за те, що вони хостять вебсайт Wine.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Завантаження готових пакунків Wine</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Останній стабільний реліз: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Останній розробницький реліз: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Щоб отримати післяінсталяційні інструкції, дивіться <a href="https://wiki.winehq.org/HowTo">інструкцію по інсталяції та конфігурації</a>.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Готові пакунки -</div> - -<p class="small margin-bottom-md text-right"><b>Супроводжувач:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Ці пакунки побудовані та підтримуються WineHQ.<br> - При винекненні проблем, будь ласка, повідомляйте до <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - Готові пакунки WineHQ для Ubuntu 14.04, 16.04, 16.10, 17.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Готові пакунки WineHQ для Debian Wheezy, Jessie, Stretch, Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Готові пакунки WineHQ для Fedora 24, 25 та новіших версій</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Готові пакунки WineHQ для Mageia 5</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - Готові пакунки WineHQ для macOS 10.8 та новіших версій</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Готові дистрибутивні пакунки -</div> - -<div class="whq-info-box center"> - Ці пакунки побудовані та підтримуються супроводжувачами дистрибутива.<br> - При винекненні проблем, будь ласка, повідомляйте супроводжувачам пакунку. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - бінарні та вихідні .rpms та щоденні RPMs знімки для всіх версій openSUSE (від 11.4 до 13.2 та Leap 42.1) і SUSE Linux Enterprise 11 та 12.<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - бінарні txz (Slackware 14.2) та tgz (для старіших версій)<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - вихідні файли для FreeBSD 5.3 або пізніших версій<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Сторонні додатки</h2> - -<p>Інколи модифікація Wine може призвести до того, що якась програма запрацює, та ця модифікація не може бути застосована до основної версії Wine з певних причин. За роки існування для усунення існуючих недоліків Wine було створено багато сторонніх програм. Ці програми ніяк не підтримуються безпосередніми розробниками Wine, але все ж, вони можуть стати вам в нагоді. Детальну інформацією дивіться на <a href="https://wiki.winehq.org/ThirdPartyApplications">нашій вікі-сторінці</a>.</p> - -<a name="source"></a> -<h2>Завантажити вихідний код Wine</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Наш офіційний сайт. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Останні розробницькі версії. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Альтернативний сайт для завантаження вихідних файлів та документації. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Примітка:</b> Дивіться <a href="https://wiki.winehq.org/Recommended_Packages">рекомендовані пакунки</a> для допомоги при конфігурації та побудові Wine. -</div> diff --git a/templates/uk/home.template b/templates/uk/home.template index 4acd3a7d..ace895cc 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Завантажити</span> <span class="subtitle">Встановити останню версію Wine.</span> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template deleted file mode 100644 index a372d441..00000000 --- a/templates/zh-cn/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">下载 Wine</h1> - -<a name="crossover"></a> -<h2>被支持的 Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - 是由 <b><a href="https://www.codeweavers.com">CodeWeavers</a></b> 提供的一个经过打磨的 Wine。 - CrossOver 使得 Wine 更易于使用，同时 CodeWeavers 为用户提供了极好的技术支持。 - 所有 CrossOver 的销售收入都将被直接用于支持 Wine 开发者。所以使用 CrossOver 可谓一举两得，既可以得到使用 Wine 的帮助， - 又可以支持 Wine 项目。<br> - CodeWeavers 提供全功能的 - <b><a href="https://www.codeweavers.com/products">CrossOver 试用版</a></b>。</p> - <p class="small">This endorsement is the primary recognition that CodeWeavers has - requested in exchange for hosting the Wine web site.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine 安装包下载</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - 最新稳定版： - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - 最新开发版： - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>查看 <a href="https://wiki.winehq.org/HowTo">installation and configuration how-to</a> 获取快速安装说明。</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ 提供的安装包 -</div> - -<p class="small margin-bottom-md text-right"><b>维护者:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - 这些安装包由 WineHQ 构建并提供支持。<br> - 如果您在使用过程发现问题，请提交到 <a href="http://bugs.winehq.org">WineHQ 的 bugzilla</a>。 -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 适用于 Ubuntu 14.04、16.04、16.10 和 17.04 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - 适用于 Debian Wheezy、Jessie、Stretch 和 Sid 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - 适用于 Fedora 24 和 25 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - 适用于 Mageia 5 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - 适用于 macOS 10.8 或更新版本的 WineHQ 安装包</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 由发行版提供的安装包 -</div> - -<div class="whq-info-box center"> - 这些安装包由各发行版构建并提供支持。<br> - 如果您在使用过程发现问题，请提交给打包的维护者。 -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - 供给所有版本的 openSUSE（11.4 到 13.2 和 Leap 42.1）和 SUSE Linux Enterprise 11、12 的安装包、.rmps 源码包及每日构建 RPMs。<br> - <span class="small"><b>维护者：</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - txz 安装包（Slackware 14.2）和 tgz（供给旧版本 Slackware）<br> - <span class="small"><b>维护者：</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - 供给 FreeBSD 5.3 或更新版本的软件源<br> - <span class="small"><b>维护者：</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>第三方工具</h2> - -<p>有时候，一个经过修改的 Wine 可以让一个应用程序工作，但由于种种原因这些修改并没有被合并到 Wine 中。同时为了克服 Wine 的不足，这些年来出现了许多面向终端用户的第三方工具。然而这些第三方应用都是不被 Wine 开发者提供支持的，虽然有时候他们对您很有用。更多相关内容，请查看我们 <a href="https://wiki.winehq.org/ThirdPartyApplications">关于第三方应用</a> 的 wiki 页面。</p> - -<a name="source"></a> -<h2>Wine Source Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - 官方源码发布网站。 -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - 获取最新开发版。 -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - 备选官方源码和文档打包下载网站。 -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>注意：</b>查看 <a href="https://wiki.winehq.org/Recommended_Packages">recommended packages</a> 获取配置和构建 Wine 的帮助。 -</div> diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index f0df5d5f..a7c9ecce 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -50,7 +50,7 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而 <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">下载</span> <span class="subtitle">安装最新版的 Wine.</span> -- 2.12.3

1 0

[PATCH 1/4] user32: Make it possible to created windows for redirected classes
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 2 +- dlls/user32/user_private.h | 2 ++ dlls/user32/win.c | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 8aa568dde3..a70bcb1a04 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -325,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -static const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0ffdcddfef..bf0e3c7626 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,6 +269,8 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname) DECLSPEC_HIDDEN; + /* message spy definitions */ #define SPY_DISPATCHMESSAGE 0x0100 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 382ca1086e..c3360f9f86 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1333,13 +1333,16 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, RECT rect; WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; + const WCHAR *p = className; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - TRACE("%s %s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + className = CLASS_GetVersionedName(className); + + TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), - debugstr_w(className), + debugstr_w(p), p != className ? "->" : "", p != className ? debugstr_w(className) : "", cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams ); if(TRACE_ON(win)) dump_window_styles( cs->style, cs->dwExStyle ); -- 2.15.1

2 4

Re: [PATCH] user32: Allow mouse messages to land on windows below top-level HTTRANSPARENT windows.
by Alexandre Julliard 31 Jan '18

31 Jan '18

Huw Davies <huw(a)codeweavers.com> writes: > @@ -2502,7 +2502,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H > } > else > { > - msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); > + msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest ); In general we want to trust the X11 window information over the wineserver. In particular I don't think we want to send a mouse click to some unrelated window that may be behind another X11 window. Also note that the same patch in staging has been reported to cause regressions. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH resend 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Initial version was dependent on some patches in my local tree; sorry for the spam. dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f492ecc..917ab61 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10071,6 +10070,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10114,6 +10120,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10123,6 +10134,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 10f0fd0..c1b55b5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,6 +983,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

3 4

[PATCH] dbghelp: Use correct module name buffer length when doing enumeration
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Manually tested on Windows. dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 684111c86c..f37991dacd 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module { struct process* process; IMAGEHLP_MODULEW64 module; + WCHAR modulename[64]; /* used for enumeration */ struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6c7f2dcb6d..9f90d5e0ca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -102,6 +102,7 @@ void module_set_module(struct module* module, const WCHAR* name) { module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); + module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } const WCHAR *get_wine_loader_name(void) @@ -812,7 +813,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; - if (!EnumModulesCallback(module->module.ModuleName, + if (!EnumModulesCallback(module->modulename, module->module.BaseOfImage, UserContext)) break; } -- 2.15.1

1 0

[PATCH 6/6] d2d1: Use d2d_array_reserve() in d2d_clip_stack_push().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 30 ++++++++++++++++++++++++++++-- dlls/d2d1/geometry.c | 27 --------------------------- dlls/d2d1/render_target.c | 17 ++--------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2c10252..07f71a0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -62,8 +62,8 @@ extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int size; - unsigned int count; + size_t size; + size_t count; }; struct d2d_error_state @@ -486,6 +486,32 @@ static inline void *d2d_calloc(size_t count, size_t size) return heap_alloc(s); } +static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c805084..4a2f7d7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -562,33 +562,6 @@ static void d2d_rect_get_bezier_segment_bounds(D2D_RECT_F *bounds, const D2D1_PO d2d_rect_get_bezier_bounds(bounds, &q[0], &q[1], &q[2]); } -static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return TRUE; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return FALSE; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = max_capacity; - - if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) - return FALSE; - - *elements = new_elements; - *capacity = new_capacity; - return TRUE; -} - static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc820cf..a202279 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -95,21 +95,8 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F { D2D1_RECT_F r; - if (stack->count == stack->size) - { - D2D1_RECT_F *new_stack; - unsigned int new_size; - - if (stack->size > UINT_MAX / 2) - return FALSE; - - new_size = stack->size * 2; - if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) - return FALSE; - - stack->stack = new_stack; - stack->size = new_size; - } + if (!d2d_array_reserve((void **)&stack->stack, &stack->size, stack->count + 1, sizeof(*stack->stack))) + return FALSE; r = *rect; if (stack->count) -- 2.1.4

1 0

[PATCH 4/6] wined3d: Use the resource access flags in surface_blt_special().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 520f88c..5f91c21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1990,10 +1990,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + /* Get the swapchain. One of the surfaces has to be a primary surface. */ + if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Destination is in sysmem, rejecting gl blt\n"); + WARN("Destination resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } @@ -2002,9 +2002,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (src_surface) { src_texture = src_surface->container; - if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Src is in sysmem, rejecting gl blt\n"); + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 3/6] wined3d: Use the resource access flags in wined3d_resource_set_priority().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 44f9f00..437261b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -284,7 +284,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (resource->pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(resource->access)) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; -- 2.1.4

1 0

[PATCH 2/6] wined3d: Use the resource access flags in resource_cleanup().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 172a054..44f9f00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,7 +262,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (!(resource->usage & WINED3DUSAGE_PRIVATE)) { - if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); -- 2.1.4

1 0

[PATCH 1/6] wined3d: Use the resource access flags in resource_init().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 12 +++++++----- dlls/wined3d/utils.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cf01f93..172a054 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -83,6 +83,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + DWORD access = resource_access_from_pool(pool); BOOL tex_2d_ok = FALSE; unsigned int i; @@ -104,9 +105,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_check_usage(usage); - if (usage & WINED3DUSAGE_SCRATCH && pool != WINED3D_POOL_SYSTEM_MEM) + if (usage & WINED3DUSAGE_SCRATCH && access & WINED3D_RESOURCE_ACCESS_GPU) { - ERR("WINED3DUSAGE_SCRATCH used with pool %s.\n", debug_d3dpool(pool)); + ERR("Trying to create a scratch resource with access flags %s.\n", + wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } @@ -197,9 +199,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access |= WINED3D_RESOURCE_ACCESS_MAP; + access |= WINED3D_RESOURCE_ACCESS_MAP; + resource->access = access; resource->width = width; resource->height = height; resource->depth = depth; @@ -226,7 +228,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (!(usage & WINED3DUSAGE_PRIVATE)) { /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(access & WINED3D_RESOURCE_ACCESS_CPU) && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd8aa06..a79c3af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4129,6 +4129,22 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +const char *wined3d_debug_resource_access(DWORD access) +{ + char buf[91]; + + buf[0] = '\0'; +#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP); +#undef ACCESS_TO_STR + if (access) + FIXME("Unrecognised access flag(s) %#x.\n", access); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; +} + const char *debug_d3dusage(DWORD usage) { char buf[552]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f95330f..8006f3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,8 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; + static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -- 2.1.4

1 0

[PATCH 04/13] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index ad3223c166..fe7ccb418d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

2 2

[PATCH 13/13] secur32: Add support for switching between Kerberos and NTLM in Negotiate provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Based on generic wrapper.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/negotiate.c | 330 ++++++++++++++++++++++++++++++++++++-------- dlls/secur32/ntlm.c | 4 +- dlls/secur32/secur32_priv.h | 19 +-- dlls/secur32/wrapper.c | 2 +- 4 files changed, 277 insertions(+), 78 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index bf16258fc2..c7ab97ef79 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -62,20 +62,41 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}; + static SEC_WCHAR kerberosW[] = {'K','e','r','b','e','r','o','s',0}; SECURITY_STATUS ret; + SecurePackage *package; + CredHandle myCred; TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - FIXME("forwarding to NTLM\n"); - ret = ntlm_AcquireCredentialsHandleW( pszPrincipal, ntlmW, fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, - phCredential, ptsExpiry ); + if (!pszPackage) + return SEC_E_SECPKG_NOT_FOUND; + + package = SECUR32_findPackageW(kerberosW); + if (!package || !package->provider) + { + package = SECUR32_findPackageW(ntlmW); + if (!package || !package->provider) + return SEC_E_SECPKG_NOT_FOUND; + } + + if (!package->provider->fnTableW.AcquireCredentialsHandleW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ret = package->provider->fnTableW.AcquireCredentialsHandleW( + pszPrincipal, package->infoW.Name, fCredentialUse, pLogonID, + pAuthData, pGetKeyFn, pGetKeyArgument, &myCred, + ptsExpiry); if (ret == SEC_E_OK) { - NtlmCredentials *cred = (NtlmCredentials *)phCredential->dwLower; - cred->no_cached_credentials = (pAuthData == NULL); + ret = SECUR32_makeSecHandle(phCredential, package, &myCred); + if (ret != SEC_E_OK) + package->provider->fnTableW.FreeCredentialsHandle(&myCred); } return ret; } @@ -173,15 +194,56 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry ) { + SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; + CtxtHandle myCtxt; + TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_InitializeSecurityContextW( phCredential, phContext, pszTargetName, - fContextReq, Reserved1, TargetDataRep, - pInput, Reserved2, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (phContext) + { + package = (SecurePackage *)phContext->dwUpper; + ctxt = (PCtxtHandle)phContext->dwLower; + } + if (phCredential) + { + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + } + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.InitializeSecurityContextW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.InitializeSecurityContextW( + cred, ctxt, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -223,13 +285,49 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext( ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + SecurePackage *package; + PCredHandle cred; + CtxtHandle myCtxt; + SECURITY_STATUS ret; + TRACE("%p, %p, %p, 0x%08x, %u, %p, %p, %p, %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_AcceptSecurityContext( phCredential, phContext, pInput, - fContextReq, TargetDataRep, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.AcceptSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if(phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + TRACE("realCtx: %p\n", realCtxt); + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.AcceptSecurityContext( + cred, phContext ? &myCtxt : NULL, pInput, fContextReq, + TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -257,9 +355,31 @@ static SECURITY_STATUS SEC_ENTRY nego_CompleteAuthToken(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_DeleteSecurityContext(PCtxtHandle phContext) { + SecurePackage *package; + PCtxtHandle ctxt; + SECURITY_STATUS ret; + TRACE("%p\n", phContext); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DeleteSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; - return ntlm_DeleteSecurityContext( phContext ); + ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + HeapFree(GetProcessHeap(), 0, ctxt); + + return ret; } /*********************************************************************** @@ -288,29 +408,28 @@ static SECURITY_STATUS SEC_ENTRY nego_ApplyControlToken(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.QueryContextAttributesW) { - SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; - info->PackageInfo = ntlm_package_infoW; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.QueryContextAttributesW(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -319,29 +438,28 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableA.QueryContextAttributesA) { - SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; - info->PackageInfo = ntlm_package_infoA; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesA( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableA.QueryContextAttributesA(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -388,9 +506,28 @@ static SECURITY_STATUS SEC_ENTRY nego_RevertSecurityContext(PCtxtHandle phContex static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_MakeSignature( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.MakeSignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.MakeSignature(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -399,9 +536,28 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_VerifySignature( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.VerifySignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.VerifySignature(ctxt, pMessage, MessageSeqNo, pfQOP); } /*********************************************************************** @@ -409,9 +565,31 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { + SecurePackage *package; + PCredHandle cred; + SECURITY_STATUS ret; + TRACE("%p\n", phCredential); - return ntlm_FreeCredentialsHandle( phCredential ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.FreeCredentialsHandle) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + cred = (PCredHandle)phCredential->dwLower; + + ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + HeapFree(GetProcessHeap(), 0, cred); + + return ret; } /*********************************************************************** @@ -420,9 +598,28 @@ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCreden static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_EncryptMessage( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.EncryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.EncryptMessage(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -431,9 +628,28 @@ static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_DecryptMessage( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DecryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.DecryptMessage(ctxt, pMessage, MessageSeqNo, pfQOP); } static const SecurityFunctionTableA negoTableA = { diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f48ce..2d0557b200 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -151,7 +151,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; @@ -172,7 +172,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); if(pAuthData != NULL) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 973b75c699..e029ea12c4 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -189,24 +189,7 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; - -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index dba675422d..85941d0361 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); * and stored in phSec->dwLower). SecHandle is equivalent to both a * CredHandle and a CtxtHandle. */ -static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) { SECURITY_STATUS ret; -- 2.15.1

2 1

[PATCH 12/13] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * Copyright 2016 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %s 0x%08x %d %d %p %d %p %p %p %p)\n", phCredential, phContext, debugstr_w(pszTargetName), - fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

2 1

[PATCH 11/13] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 548aff4576..e8939a2d6e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 10/13] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 374f0b1010..548aff4576 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 09/13] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4991e6ec32..374f0b1010 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

2 1

[PATCH 08/13] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c255bd2b96..4991e6ec32 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

2 1

[PATCH 07/13] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 09eff78bbe..c255bd2b96 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

2 1

[PATCH 06/13] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 6cc55f4b34..09eff78bbe 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + BOOLEAN mapped_context; + + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); + + if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, + ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ -- 2.15.1

2 1

[PATCH 05/13] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fe7ccb418d..6cc55f4b34 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

2 1

[PATCH 03/13] secur32: Implement FreeCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8e676fd3a9..ad3223c166 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -377,13 +377,32 @@ done: return status; } +static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%p\n", credential); + if (!credential) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->FreeCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ lsa_AcquireCredentialsHandleW, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ NULL, /* AcceptSecurityContext */ @@ -415,7 +434,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ lsa_AcquireCredentialsHandleA, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ NULL, /* AcceptSecurityContext */ -- 2.15.1

2 1

[PATCH 02/13] secur32: Implement AcquireCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a683fcb25f..8e676fd3a9 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -243,12 +243,146 @@ static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = lsa_RegisterCallback }; +static SECURITY_STATUS lsa_lookup_package(SEC_WCHAR *nameW, struct lsa_package **lsa_package) +{ + ULONG i; + UNICODE_STRING package_name, name; + + for (i = 0; i < loaded_packages_count; i++) + { + if (RtlAnsiStringToUnicodeString(&package_name, loaded_packages[i].name, TRUE)) + return SEC_E_INSUFFICIENT_MEMORY; + + RtlInitUnicodeString(&name, nameW); + + if (RtlEqualUnicodeString(&package_name, &name, TRUE)) + { + RtlFreeUnicodeString(&package_name); + *lsa_package = &loaded_packages[i]; + return SEC_E_OK; + } + + RtlFreeUnicodeString(&package_name); + } + + return SEC_E_SECPKG_NOT_FOUND; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( + SEC_WCHAR *principal, SEC_WCHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package; + UNICODE_STRING principal_us; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!package) return SEC_E_SECPKG_NOT_FOUND; + + status = lsa_lookup_package(package, &lsa_package); + if (status != SEC_E_OK) return status; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpAcquireCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (principal) + RtlInitUnicodeString(&principal_us, principal); + + status = lsa_package->lsa_api->SpAcquireCredentialsHandle(principal ? &principal_us : NULL, + credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, &lsa_credential, ts_expiry); + if (status == SEC_E_OK) + { + credential->dwLower = (ULONG_PTR)lsa_credential; + credential->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( + SEC_CHAR *principal, SEC_CHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + int len_user = 0, len_domain = 0, len_passwd = 0; + SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; + SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (principal) + { + int len = MultiByteToWideChar( CP_ACP, 0, principal, -1, NULL, 0 ); + if (!(principalW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, principal, -1, principalW, len ); + } + if (package) + { + int len = MultiByteToWideChar( CP_ACP, 0, package, -1, NULL, 0 ); + if (!(packageW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); + } + if (auth_data) + { + id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; + + if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (!(auth_dataW = HeapAlloc( GetProcessHeap(), 0, sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; + if (id->UserLength) + { + len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = HeapAlloc( GetProcessHeap(), 0, len_user * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); + } + if (id->DomainLength) + { + len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = HeapAlloc( GetProcessHeap(), 0, len_domain * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); + } + if (id->PasswordLength) + { + len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(passwd = HeapAlloc( GetProcessHeap(), 0, len_passwd * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); + } + auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_dataW->User = user; + auth_dataW->UserLength = len_user; + auth_dataW->Domain = domain; + auth_dataW->DomainLength = len_domain; + auth_dataW->Password = passwd; + auth_dataW->PasswordLength = len_passwd; + } + else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + } + + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + get_key_arg, credential, ts_expiry ); +done: + if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) HeapFree( GetProcessHeap(), 0, auth_dataW ); + HeapFree( GetProcessHeap(), 0, packageW ); + HeapFree( GetProcessHeap(), 0, principalW ); + HeapFree( GetProcessHeap(), 0, user ); + HeapFree( GetProcessHeap(), 0, domain ); + HeapFree( GetProcessHeap(), 0, passwd ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ - NULL, /* AcquireCredentialsHandleW */ + lsa_AcquireCredentialsHandleW, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ @@ -280,7 +414,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = 1, NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ - NULL, /* AcquireCredentialsHandleA */ + lsa_AcquireCredentialsHandleA, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ -- 2.15.1

2 1

[PATCH 01/13] secur32: Add support for loading SSP/AP dll as an SSPI provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 135 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1028c18e71..a683fcb25f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2004 Juan Lang * Copyright (C) 2007 Kai Blin - * Copyright (C) 2017 Dmitry Timoshkov + * Copyright (C) 2017,2018 Dmitry Timoshkov * * Local Security Authority functions, as far as secur32 has them. * @@ -31,10 +31,12 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "rpc.h" +#include "secur32_priv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(lsa); +WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') @@ -42,10 +44,10 @@ struct lsa_package { ULONG package_id; HMODULE mod; - ULONG version; LSA_STRING *name; - SECPKG_FUNCTION_TABLE *api; - ULONG table_count; + ULONG lsa_api_version, lsa_table_count, user_api_version, user_table_count; + SECPKG_FUNCTION_TABLE *lsa_api; + SECPKG_USER_FUNCTION_TABLE *user_api; }; static struct lsa_package *loaded_packages; @@ -69,8 +71,8 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id { if (loaded_packages[i].package_id == package_id) { - if (loaded_packages[i].api->CallPackageUntrusted) - return loaded_packages[i].api->CallPackageUntrusted(NULL /* FIXME*/, + if (loaded_packages[i].lsa_api->CallPackageUntrusted) + return loaded_packages[i].lsa_api->CallPackageUntrusted(NULL /* FIXME*/, in_buffer, NULL, in_buffer_length, out_buffer, out_buffer_length, status); return SEC_E_UNSUPPORTED_FUNCTION; @@ -228,6 +230,83 @@ static LSA_DISPATCH_TABLE lsa_dispatch = lsa_CopyFromClientBuffer }; +static NTSTATUS NTAPI lsa_RegisterCallback(ULONG callback_id, PLSA_CALLBACK_FUNCTION callback) +{ + FIXME("%u,%p: stub\n", callback_id, callback); + return STATUS_NOT_IMPLEMENTED; +} + +static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = +{ + lsa_AllocateLsaHeap, + lsa_FreeLsaHeap, + lsa_RegisterCallback +}; + +static const SecurityFunctionTableW lsa_sspi_tableW = +{ + 1, + NULL, /* EnumerateSecurityPackagesW */ + NULL, /* QueryCredentialsAttributesW */ + NULL, /* AcquireCredentialsHandleW */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextW */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesW */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoW */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextW */ + NULL, /* AddCredentialsW */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesW */ +}; + +static const SecurityFunctionTableA lsa_sspi_tableA = +{ + 1, + NULL, /* EnumerateSecurityPackagesA */ + NULL, /* QueryCredentialsAttributesA */ + NULL, /* AcquireCredentialsHandleA */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextA */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesA */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoA */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextA */ + NULL, /* AddCredentialsA */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesA */ +}; + static void add_package(struct lsa_package *package) { struct lsa_package *new_loaded_packages; @@ -247,26 +326,41 @@ static void add_package(struct lsa_package *package) static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG package_id) { - NTSTATUS (NTAPI *lsa_mode_init)(ULONG,PULONG,PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); + + memset(package, 0, sizeof(*package)); package->mod = LoadLibraryW(name); if (!package->mod) return FALSE; - lsa_mode_init = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); - if (lsa_mode_init) + pSpLsaModeInitialize = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); + if (pSpLsaModeInitialize) { NTSTATUS status; - status = lsa_mode_init(SECPKG_INTERFACE_VERSION, &package->version, &package->api, &package->table_count); + status = pSpLsaModeInitialize(SECPKG_INTERFACE_VERSION, &package->lsa_api_version, &package->lsa_api, &package->lsa_table_count); if (status == STATUS_SUCCESS) { - status = package->api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); + status = package->lsa_api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); if (status == STATUS_SUCCESS) { TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), - package->version, package->api, package->table_count); + package->lsa_api_version, package->lsa_api, package->lsa_table_count); package->package_id = package_id; + + status = package->lsa_api->Initialize(package_id, NULL /* FIXME: params */, NULL); + if (status == STATUS_SUCCESS) + { + pSpUserModeInitialize = (void *)GetProcAddress(package->mod, "SpUserModeInitialize"); + if (pSpUserModeInitialize) + { + status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); + if (status == STATUS_SUCCESS) + package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + } + } return TRUE; } } @@ -278,16 +372,17 @@ static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG p #define MAX_SERVICE_NAME 260 -static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void **context) +void load_auth_packages(void) { static const WCHAR LSA_KEY[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','L','s','a',0 }; DWORD err, i; HKEY root; + SecureProvider *provider; err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, LSA_KEY, 0, KEY_READ, &root); - if (err != ERROR_SUCCESS) return FALSE; + if (err != ERROR_SUCCESS) return; i = 0; for (;;) @@ -310,19 +405,40 @@ static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void ** RegCloseKey(root); - return TRUE; + if (!loaded_packages_count) return; + + provider = SECUR32_addProvider(&lsa_sspi_tableA, &lsa_sspi_tableW, NULL); + if (!provider) + { + ERR("Failed to add SSP/AP provider\n"); + return; + } + + for (i = 0; i < loaded_packages_count; i++) + { + SecPkgInfoW *info; + + info = HeapAlloc(GetProcessHeap(), 0, loaded_packages[i].lsa_table_count * sizeof(*info)); + if (info) + { + NTSTATUS status; + + status = loaded_packages[i].lsa_api->GetInfo(info); + if (status == STATUS_SUCCESS) + SECUR32_addPackages(provider, loaded_packages[i].lsa_table_count, NULL, info); + + HeapFree(GetProcessHeap(), 0, info); + } + } } NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, PLSA_STRING package_name, PULONG package_id) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; ULONG i; TRACE("%p %p %p\n", lsa_handle, package_name, package_id); - InitOnceExecuteOnce(&init_once, load_auth_packages, NULL, NULL); - for (i = 0; i < loaded_packages_count; i++) { if (!RtlCompareString(loaded_packages[i].name, package_name, FALSE)) -- 2.15.1

2 1

[PATCH] ole32: Return error from IStream Clone.
by Daniel Lehman 31 Jan '18

31 Jan '18

2 1

[PATCH] ole32/tests: Move stream creation to test function that's using it
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index e20d81b8b0..6a0498aa60 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -43,16 +43,20 @@ do { \ } \ } while(0) -static void test_streamonhglobal(IStream *pStream) +static void test_streamonhglobal(void) { const char data[] = "Test String"; ULARGE_INTEGER ull; + IStream *pStream; LARGE_INTEGER ll; char buffer[128]; ULONG read; STATSTG statstg; HRESULT hr; + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ull.QuadPart = sizeof(data); hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -293,6 +297,8 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + + IStream_Release(pStream); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -510,14 +516,7 @@ static void test_freed_hglobal(void) START_TEST(hglobalstream) { - HRESULT hr; - IStream *pStream; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok_ole_success(hr, "CreateStreamOnHGlobal"); - - test_streamonhglobal(pStream); - IStream_Release(pStream); + test_streamonhglobal(); test_copyto(); test_freed_hglobal(); } -- 2.15.1

2 1

[PATCH] ole32/tests: Add a trailing '\n' to ok() calls.
by Francois Gouget 31 Jan '18

31 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/compobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index aef10376d1c..f1e0134731c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2795,7 +2795,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -2806,7 +2806,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); hr = CoRegisterMessageFilter(&MessageFilter, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); @@ -2817,7 +2817,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); IStream_Release(stream); -- 2.15.1

2 1

[PATCH] gdi32/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..70e44f3822 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winnls.h" +#include "wine/heap.h" #include "wine/test.h" static inline BOOL match_off_by_n(int a, int b, unsigned int n) @@ -109,22 +110,6 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; -- 2.14.3

2 1

[PATCH] dwrite/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 24e8e73b2c..c226dba19f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "d2d1.h" +#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -121,16 +122,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0}; -- 2.14.3

2 1

[PATCH] d3dx9: Added D3DXCreateKeyframedAnimationSet stub
by Alistair Leslie-Hughes 31 Jan '18

31 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/animation.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index d816fd8..0b9626f 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index e15230d..a957005 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index f122583..d4eee10 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index a0a74a5..b6ba5a7 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 818bd7a..420ecc6 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -469,3 +469,15 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, return D3D_OK; } + +HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set) +{ + FIXME("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " + "callback_key_count %u, callback_keys %p, animation_set %p stub.\n", + debugstr_a(name), ticks_per_second, playback_type, animation_count, + callback_key_count, callback_keys, animation_set); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) -- 1.9.1

2 1

[PATCH 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d95b831..e134d54 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10273,6 +10272,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10316,6 +10322,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10325,6 +10336,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5579de4..f68227a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -928,6 +928,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_GetMinimizedPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

2 3

[PATCH] iccvid: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iccvid/iccvid.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e5d514703e..89d282ba78 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,6 +51,7 @@ #include "iccvid_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -81,16 +82,6 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* ------------------------------------------------------------------------ */ static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL; -- 2.14.3

1 0

[PATCH] hhctrl.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 5318b5f06f..b358f54378 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -40,6 +40,7 @@ #include "wine/itss.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #define WB_GOBACK 0 @@ -244,31 +245,11 @@ HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR strdupW(LPCWSTR str) { LPWSTR ret; -- 2.14.3

1 0

[PATCH] dnsapi: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 8a025211af..0b679731e9 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -22,20 +22,7 @@ # error You must include config.h to use this header #endif -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline LPSTR dns_strdup_a( LPCSTR src ) { -- 2.14.3

1 0

[PATCH] explorerframe: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b3634c4..14e551c48d 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a487..a50f8a97d3 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); -- 2.14.3

1 0

[PATCH 1/5] wined3d: Enable the multi-threaded command stream by default.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 28a34a7..6c23d0b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - FALSE, /* No multithreaded CS by default. */ + TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ -- 2.1.4

3 2

[PATCH] kernel32: add QueryProcessCycleTime stub (try 2)
by Austin English 30 Jan '18

30 Jan '18

Try 2: remove accidental double pointer (Thanks Nikolay) Signed-off-by: Austin English <austinenglish(a)gmail.com> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1f6f..0def2d7b3a 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..5ce637233a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe58118fd..b0b866967c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..ca33bfdce7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo -- 2.13.6

1 0

[PATCH 1/2] include: Add CertRegisterSystemStore and CertUnregisterSystemStore
by Alex Henrie 30 Jan '18

30 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/store.c | 2 +- include/wincrypt.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 91a3cbc0dc..bc4ebde5f6 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1414,7 +1414,7 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } -BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags) { HCERTSTORE hstore; diff --git a/include/wincrypt.h b/include/wincrypt.h index 6986bd819e..a793e8ad22 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4084,6 +4084,11 @@ BOOL WINAPI CertEnumSystemStoreLocation(DWORD dwFlags, void *pvArg, BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum); +BOOL WINAPI CertRegisterSystemStore(const void *store, DWORD flags, + CERT_SYSTEM_STORE_INFO *info, void *reserved); + +BOOL WINAPI CertUnregisterSystemStore(const void *store, DWORD flags); + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum); -- 2.16.1

1 1

[PATCH 0/7] Minimal headless WMP implementation
by Anton Romanov 30 Jan '18

30 Jan '18

This series implement enough of WMP for WPF's MediaPlayer class to be mostly functional and makes "Magic The Gathering: Online" have sound. Anton Romanov (7): wmp: Add IWMPPlayer interface wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents wmp: add IWMPControls stub implementation wmp: Add wmp defs wmp: Add IWMPMedia stub wmp: Add IWMPNetwork stub wmp: Implement minimal headless WMP dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 388 ++++++++++++++++++ dlls/wmp/oleobj.c | 81 +--- dlls/wmp/player.c | 1013 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/oleobj.c | 2 +- dlls/wmp/wmp_main.c | 2 + dlls/wmp/wmp_private.h | 59 ++- dlls/wmp/wmpids.h | 437 ++++++++++++++++++++ include/wmp.idl | 27 +- 9 files changed, 1924 insertions(+), 88 deletions(-) create mode 100644 dlls/wmp/events.c create mode 100644 dlls/wmp/wmpids.h -- 2.15.1

1 7

[PATCH 1/6] dxgi: Add FIXME messages for unhandled DXGI_SWAP_CHAIN_FULLSCREEN_DESC fields.
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/factory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f8816b3c23b..aa9cdb88fb6c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -254,8 +254,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p partial stub!\n", + TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); if (!device || !swapchain_desc || !swapchain) @@ -309,6 +309,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); wined3d_desc.backbuffer_width = swapchain_desc->Width; wined3d_desc.backbuffer_height = swapchain_desc->Height; -- 2.13.6

2 11

[PATCH 1/4] wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource().
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78443d174a27..bb9b915a5980 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2170,31 +2170,31 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; + struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; - if (op->resource->type == WINED3D_RTYPE_BUFFER) + context = context_acquire(cs->device, NULL, 0); + + if (resource->type == WINED3D_RTYPE_BUFFER) { - struct wined3d_buffer *buffer = buffer_from_resource(op->resource); + struct wined3d_buffer *buffer = buffer_from_resource(resource); - context = context_acquire(op->resource->device, NULL, 0); if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); - context_release(context); goto done; } wined3d_buffer_upload_data(buffer, context, box, op->data.data); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - context_release(context); goto done; } - texture = wined3d_texture_from_resource(op->resource); + texture = wined3d_texture_from_resource(resource); level = op->sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); @@ -2204,8 +2204,6 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi addr.buffer_object = 0; addr.addr = op->data.data; - context = context_acquire(op->resource->device, NULL, 0); - /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) @@ -2217,13 +2215,13 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_upload_data(texture, op->sub_resource_idx, context, box, &addr, op->data.row_pitch, op->data.slice_pitch); - context_release(context); - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); done: - wined3d_resource_release(op->resource); + context_release(context); + + wined3d_resource_release(resource); } void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, -- 2.13.6

3 7

[v2 PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed one changed file programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 11782fea97..e0ad4d8751 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -425,7 +425,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(hProcess, mod_loader_cb, (void*)&mli); + SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); return imh_mod->BaseOfImage != 0; -- 2.15.1

1 0

[PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); -- 2.15.1

1 0

[PATCH 1/3] dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbghelp/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c6c9d5eb19..765a7235a1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -934,7 +934,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi.SizeOfStruct = miw64.SizeOfStruct; + mi.SizeOfStruct = ModuleInfo->SizeOfStruct; mi.BaseOfImage = miw64.BaseOfImage; mi.ImageSize = miw64.ImageSize; mi.TimeDateStamp = miw64.TimeDateStamp; @@ -968,7 +968,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - miw.SizeOfStruct = miw64.SizeOfStruct; + miw.SizeOfStruct = ModuleInfo->SizeOfStruct; miw.BaseOfImage = miw64.BaseOfImage; miw.ImageSize = miw64.ImageSize; miw.TimeDateStamp = miw64.TimeDateStamp; @@ -1003,7 +1003,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi64.SizeOfStruct = miw64.SizeOfStruct; + mi64.SizeOfStruct = ModuleInfo->SizeOfStruct; mi64.BaseOfImage = miw64.BaseOfImage; mi64.ImageSize = miw64.ImageSize; mi64.TimeDateStamp = miw64.TimeDateStamp; -- 2.15.1

1 2

[PATCH 5/5] d2d1: Use the global memory allocation helpers.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 14 +++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 29 ++++++++++---------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 32 +++++++++++----------- dlls/d2d1/geometry.c | 57 ++++++++++++++++++---------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/render_target.c | 20 +++++++------- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++--- dlls/d2d1/wic_render_target.c | 2 +- include/wine/heap.h | 2 +- 15 files changed, 88 insertions(+), 91 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b03482a..43ed094 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) { ID3D10ShaderResourceView_Release(bitmap->view); ID2D1Factory_Release(bitmap->factory); - HeapFree(GetProcessHeap(), 0, bitmap); + heap_free(bitmap); } return refcount; @@ -286,7 +286,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return hr; } - if ((*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { d2d_bitmap_init(*bitmap, factory, view, size, desc); TRACE("Created bitmap %p.\n", *bitmap); @@ -340,7 +340,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device goto failed; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { hr = E_OUTOFMEMORY; goto failed; @@ -386,7 +386,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device return hr; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -510,7 +510,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d pitch = ((bpp * size.width) + 15) & ~15; data_size = pitch * size.height; - if (!(data = HeapAlloc(GetProcessHeap(), 0, data_size))) + if (!(data = heap_alloc(data_size))) return E_OUTOFMEMORY; rect.X = 0; @@ -520,13 +520,13 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) { WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } hr = d2d_bitmap_create(factory, device, size, data, pitch, &bitmap_desc, bitmap); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 105caa9..de58872 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende { ID2D1RenderTarget_Release(render_target->dxgi_target); ID2D1Bitmap_Release(render_target->bitmap); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ba07006..6759019 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -67,10 +67,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { - HeapFree(GetProcessHeap(), 0, gradient->stops); + heap_free(gradient->stops); ID3D10ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); - HeapFree(GetProcessHeap(), 0, gradient); + heap_free(gradient); } return refcount; @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * stop_count * sizeof(*data)))) + if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -168,7 +168,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D buffer_data.SysMemSlicePitch = 0; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) { ERR("Failed to create buffer, hr %#x.\n", hr); @@ -188,7 +188,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D return hr; } - if (!(*gradient = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**gradient)))) + if (!(*gradient = heap_alloc_zero(sizeof(**gradient)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -205,10 +205,10 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); - HeapFree(GetProcessHeap(), 0, *gradient); + heap_free(*gradient); return E_OUTOFMEMORY; } memcpy((*gradient)->stops, stops, stop_count * sizeof(*stops)); @@ -233,7 +233,7 @@ static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D10Device *devic static void d2d_brush_destroy(struct d2d_brush *brush) { ID2D1Factory_Release(brush->factory); - HeapFree(GetProcessHeap(), 0, brush); + heap_free(brush); } static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, @@ -386,7 +386,7 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_SOLID, desc, @@ -566,10 +566,11 @@ static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl d2d_linear_gradient_brush_GetGradientStopCollection, }; -HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) +HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, @@ -798,7 +799,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, { struct d2d_brush *b; - if (!(b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*b)))) + if (!(b = heap_alloc_zero(sizeof(*b)))) return E_OUTOFMEMORY; d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); @@ -1034,7 +1035,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f876cbf..caeb4b9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -20,6 +20,7 @@ #define __WINE_D2D1_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> #include <limits.h> diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index cdd43b12..d5e4f47 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -94,7 +94,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface1_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index f202332..9bacc85 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -104,7 +104,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -137,13 +137,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor TRACE("iface %p, rect %s, geometry %p.\n", iface, debug_d2d_rect_f(rect), geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -187,7 +187,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact TRACE("iface %p, src_geometry %p, transform %p, transformed_geometry %p.\n", iface, src_geometry, transform, transformed_geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); @@ -204,7 +204,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i TRACE("iface %p, geometry %p.\n", iface, geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_path_geometry_init(object, (ID2D1Factory *)iface); @@ -225,13 +225,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *if TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -250,7 +250,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n", iface, desc, text_rendering_params, state_block); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); @@ -283,19 +283,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa TRACE("iface %p, target %p, desc %p, render_target %p.\n", iface, target, desc, render_target); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_factory_get_device(factory, &device))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -319,13 +319,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -356,13 +356,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -512,7 +512,7 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_factory_init(object, factory_type, factory_options); diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ab5a0b5..88beee2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -581,12 +581,7 @@ static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_ if (new_capacity < element_count) new_capacity = max_capacity; - if (*elements) - new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); - else - new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); - - if (!new_elements) + if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) return FALSE; *elements = new_elements; @@ -1438,7 +1433,7 @@ static BOOL d2d_cdt_generate_faces(const struct d2d_cdt *cdt, struct d2d_geometr return TRUE; fail: - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); + heap_free(geometry->fill.faces); geometry->fill.faces = NULL; geometry->fill.faces_size = 0; geometry->fill.face_count = 0; @@ -2035,7 +2030,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) ret = d2d_geometry_apply_intersections(geometry, &intersections); done: - HeapFree(GetProcessHeap(), 0, intersections.intersections); + heap_free(intersections.intersections); return ret; } @@ -2057,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = HeapAlloc(GetProcessHeap(), 0, vertex_count * sizeof(*vertices)))) + if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2091,14 +2086,14 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) if (!d2d_cdt_generate_faces(&cdt, geometry)) goto fail; - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(cdt.edges); return S_OK; fail: geometry->fill.vertices = NULL; geometry->fill.vertex_count = 0; - HeapFree(GetProcessHeap(), 0, vertices); - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(vertices); + heap_free(cdt.edges); return E_FAIL; } @@ -2368,13 +2363,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, static void d2d_geometry_cleanup(struct d2d_geometry *geometry) { - HeapFree(GetProcessHeap(), 0, geometry->outline.bezier_faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.beziers); - HeapFree(GetProcessHeap(), 0, geometry->outline.faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); - HeapFree(GetProcessHeap(), 0, geometry->fill.vertices); + heap_free(geometry->outline.bezier_faces); + heap_free(geometry->outline.beziers); + heap_free(geometry->outline.faces); + heap_free(geometry->outline.vertices); + heap_free(geometry->fill.bezier_vertices); + heap_free(geometry->fill.faces); + heap_free(geometry->fill.vertices); ID2D1Factory_Release(geometry->factory); } @@ -2604,11 +2599,11 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].original_bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].vertices); + heap_free(geometry->u.path.figures[i].bezier_controls); + heap_free(geometry->u.path.figures[i].original_bezier_controls); + heap_free(geometry->u.path.figures[i].vertices); } - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures); + heap_free(geometry->u.path.figures); geometry->u.path.figures = NULL; geometry->u.path.figures_size = 0; } @@ -2824,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = HeapAlloc(GetProcessHeap(), 0, - geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count + * sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; @@ -2889,7 +2884,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac { struct d2d_figure *figure = &geometry->u.path.figures[i]; size_t size = figure->bezier_control_count * sizeof(*figure->original_bezier_controls); - if (!(figure->original_bezier_controls = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(figure->original_bezier_controls = heap_alloc(size))) goto done; memcpy(figure->original_bezier_controls, figure->bezier_controls, size); } @@ -2904,7 +2899,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac done: if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); + heap_free(geometry->fill.bezier_vertices); geometry->fill.bezier_vertex_count = 0; d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; @@ -3063,7 +3058,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac { d2d_path_geometry_free_figures(geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3579,7 +3574,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom if (!refcount) { d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3821,7 +3816,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; - if (!(geometry->fill.vertices = HeapAlloc(GetProcessHeap(), 0, 4 * sizeof(*geometry->fill.vertices)))) + if (!(geometry->fill.vertices = heap_alloc(4 * sizeof(*geometry->fill.vertices)))) goto fail; if (!d2d_array_reserve((void **)&geometry->fill.faces, &geometry->fill.faces_size, 2, sizeof(*geometry->fill.faces))) @@ -3923,7 +3918,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed geometry->fill.vertices = NULL; ID2D1Geometry_Release(geometry->u.transformed.src_geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 7cbbbaa..04d3353 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISwapChain_Release(render_target->swapchain); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 25a331b..0f7ade2 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) if (!refcount) { ID2D1Factory_Release(layer->factory); - HeapFree(GetProcessHeap(), 0, layer); + heap_free(layer); } return refcount; @@ -103,7 +103,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { - if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + if (!(*layer = heap_alloc_zero(sizeof(**layer)))) return E_OUTOFMEMORY; (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index eb223ad..ee53c69 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) if (!refcount) { ID2D1Factory_Release(mesh->factory); - HeapFree(GetProcessHeap(), 0, mesh); + heap_free(mesh); } return refcount; @@ -100,7 +100,7 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) { - if (!(*mesh = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**mesh)))) + if (!(*mesh = heap_alloc_zero(sizeof(**mesh)))) return E_OUTOFMEMORY; (*mesh)->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0c44014..73f15f7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -77,7 +77,7 @@ static void d2d_size_set(D2D1_SIZE_U *dst, float width, float height) static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) { - if (!(stack->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) + if (!(stack->stack = heap_alloc(INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) return FALSE; stack->size = INITIAL_CLIP_STACK_SIZE; @@ -88,7 +88,7 @@ static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) static void d2d_clip_stack_cleanup(struct d2d_clip_stack *stack) { - HeapFree(GetProcessHeap(), 0, stack->stack); + heap_free(stack->stack); } static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F *rect) @@ -104,7 +104,7 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F return FALSE; new_size = stack->size * 2; - if (!(new_stack = HeapReAlloc(GetProcessHeap(), 0, stack->stack, new_size * sizeof(*stack->stack)))) + if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) return FALSE; stack->stack = new_stack; @@ -272,7 +272,7 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * ID3D10RenderTargetView_Release(render_target->view); ID3D10Device_Release(render_target->device); ID2D1Factory_Release(render_target->factory); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; @@ -434,14 +434,14 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar TRACE("iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p.\n", iface, size, pixel_size, format, options, rt); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_bitmap_render_target_init(object, render_target, size, pixel_size, format, options))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1176,7 +1176,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = HeapAlloc(GetProcessHeap(), 0, opacity_values_size))) + if (!(opacity_values = heap_alloc(opacity_values_size))) { ERR("Failed to allocate opacity values.\n"); goto done; @@ -1237,7 +1237,7 @@ done: ID2D1BitmapBrush_Release(opacity_brush); if (opacity_bitmap) ID2D1Bitmap_Release(opacity_bitmap); - HeapFree(GetProcessHeap(), 0, opacity_values); + heap_free(opacity_values); IDWriteGlyphRunAnalysis_Release(analysis); } @@ -3243,13 +3243,13 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac struct d2d_d3d_render_target *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_d3d_render_target_init(object, factory, surface, outer_unknown, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 90195fe..3a3cb2e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i if (state_block->text_rendering_params) IDWriteRenderingParams_Release(state_block->text_rendering_params); ID2D1Factory_Release(state_block->factory); - HeapFree(GetProcessHeap(), 0, state_block); + heap_free(state_block); } return refcount; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index c5a1d50..a0830e3 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -68,8 +68,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) { ID2D1Factory_Release(style->factory); if (style->desc.dashStyle == D2D1_DASH_STYLE_CUSTOM) - HeapFree(GetProcessHeap(), 0, style->dashes); - HeapFree(GetProcessHeap(), 0, style); + heap_free(style->dashes); + heap_free(style); } return refcount; @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = HeapAlloc(GetProcessHeap(), 0, dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index ef8b356..5642fd4 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -144,7 +144,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget * ID3D10Texture2D_Release(render_target->readback_texture); ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/include/wine/heap.h b/include/wine/heap.h index 014ef61..681887b 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -22,7 +22,7 @@ #ifndef __WINE_WINE_HEAP_H #define __WINE_WINE_HEAP_H -#include <windef.h> +#include <winbase.h> static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) { -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use the resource access flags in wined3d_device_evict_managed_resources().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a642c9..3ad0d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4651,7 +4651,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) + if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in wined3d_device_update_texture().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c1855..6a642c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3768,14 +3768,15 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) + if (src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU + || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) { - WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source resource is GPU accessible or a scratch resource.\n"); return WINED3DERR_INVALIDCALL; } - if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) { - WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Destination resource is CPU accessible.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in buffer_init().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49b189e..fd26611 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1365,7 +1365,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING + || wined3d_resource_access_is_managed(buffer->resource.access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1383,9 +1384,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (!(buffer->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Not creating a BO because the buffer is in system memory.\n"); + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 082c1ec..f95330f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +static inline BOOL wined3d_resource_access_is_managed(unsigned int access) +{ + return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); +} + struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource); -- 2.1.4

1 0

[PATCH 4/4] localspl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localspl/localmon.c | 1 + dlls/localspl/localspl_private.h | 23 ----------------------- dlls/localspl/provider.c | 3 ++- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4ee3efb8cd..4be1ad6101 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -33,6 +33,7 @@ #include "localspl_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 8c49623622..f27005c16d 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,27 +51,4 @@ void setup_provider(void) DECLSPEC_HIDDEN; #define PORT_IS_LPR 8 -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) -{ - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - - #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4f6bac376e..3538947281 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -31,8 +31,9 @@ #include "ddk/winddiui.h" #include "ddk/winsplp.h" -#include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" #include "wine/unicode.h" #include "localspl_private.h" -- 2.14.3

2 1

[PATCH] kerberos: Add support for KerbQueryTicketCacheMessage. (v3)
by Dmitry Timoshkov 30 Jan '18

30 Jan '18

Based on the code written by George Popoff. v2: Copy full ticket info (including Realm/Server name) to flat buffer. v3: Fix compilation without libkrb5. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++ 2 files changed, 519 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b4a37f754f..78e4e932c1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2017 George Popoff * Copyright 2008 Robert Shearman for CodeWeavers * Copyright 2017 Hans Leidekker for CodeWeavers * @@ -36,6 +37,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "rpc.h" #include "sspi.h" #include "ntsecapi.h" @@ -88,8 +90,37 @@ static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_free_context); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cc_close); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_next_cred); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_decode_ticket); +MAKE_FUNCPTR(krb5_unparse_name_flags); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR +static inline void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void *heap_realloc(void *p, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, p, size); +} + +static inline void heap_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -106,6 +137,20 @@ static void load_krb5(void) } LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_free_context) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cc_close) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_next_cred) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_decode_ticket) + LOAD_FUNCPTR(krb5_unparse_name_flags) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_cred_contents) #undef LOAD_FUNCPTR return; @@ -157,15 +202,381 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS return STATUS_SUCCESS; } +#ifdef SONAME_LIBKRB5 + +struct ticket_info +{ + ULONG count, allocated; + KERB_TICKET_CACHE_INFO *info; +}; + +static NTSTATUS krb5_error_to_status(krb5_error_code error) +{ + switch (error) + { + case 0: return STATUS_SUCCESS; + default: + /* FIXME */ + return STATUS_UNSUCCESSFUL; + } +} + +static void free_ticket_info(struct ticket_info *info) +{ + ULONG i; + + for (i = 0; i < info->count; i++) + { + heap_free(info->info[i].RealmName.Buffer); + heap_free(info->info[i].ServerName.Buffer); + } + + heap_free(info->info); +} + +static WCHAR *utf8_to_wstr(const char *utf8) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + wstr = heap_alloc(len * sizeof(WCHAR)); + if (wstr) + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); + + return wstr; +} + +static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code error; + krb5_creds credentials; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + error = p_krb5_cc_start_seq_get(context, cache, &cursor); + if (error) return krb5_error_to_status(error); + + for (;;) + { + error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); + if (error) + { + if (error == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status(error); + break; + } + + if (p_krb5_is_config_principal(context, credentials.server)) + { + p_krb5_free_cred_contents(context, &credentials); + continue; + } + + if (info->count == info->allocated) + { + KERB_TICKET_CACHE_INFO *new_info; + ULONG new_allocated; + + if (info->allocated) + { + new_allocated = info->allocated * 2; + new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); + } + else + { + new_allocated = 16; + new_info = heap_alloc(sizeof(*new_info) * new_allocated); + } + if (!new_info) + { + p_krb5_free_cred_contents(context, &credentials); + status = STATUS_NO_MEMORY; + break; + } + + info->info = new_info; + info->allocated = new_allocated; + } + + error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); + if (error) + { + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); + + error = p_krb5_unparse_name_flags(context, credentials.server, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); + if (error) + { + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); + + name_without_realmW = utf8_to_wstr(name_without_realm); + RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); + + realm_name = strchr(name_with_realm, '@'); + if (!realm_name) + { + ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); + realm_name = name_with_realm; + } + else + realm_name++; + + /* realm_name - now contains only realm! */ + + realm_nameW = utf8_to_wstr(realm_name); + RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); + + if (!credentials.times.starttime) + credentials.times.starttime = credentials.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); + RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); + RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); + + info->info[info->count].TicketFlags = credentials.ticket_flags; + + error = p_krb5_decode_ticket(&credentials.ticket, &ticket); + + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_unparsed_name(context, name_without_realm); + p_krb5_free_cred_contents(context, &credentials); + + if (error) + { + status = krb5_error_to_status(error); + break; + } + + info->info[info->count].EncryptionType = ticket->enc_part.enctype; + + p_krb5_free_ticket(context, ticket); + + info->count++; + } + + p_krb5_cc_end_seq_get(context, cache, &cursor); + + return status; +} + +static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UNICODE_STRING *src) +{ + dst->Buffer = client_ws; + dst->Length = src->Length; + dst->MaximumLength = src->MaximumLength; +} + +static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info *info, void **out, ULONG *out_size) +{ + NTSTATUS status; + ULONG i; + SIZE_T size, client_str_off; + char *client_resp, *client_ticket, *client_str; + KERB_QUERY_TKT_CACHE_RESPONSE resp; + + size = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); + if (info->count != 0) + size += (info->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); + + client_str_off = size; + + for (i = 0; i < info->count; i++) + { + size += info->info[i].RealmName.MaximumLength; + size += info->info[i].ServerName.MaximumLength; + } + + status = lsa_dispatch.AllocateClientBuffer(lsa_req, size, (void **)&client_resp); + if (status != STATUS_SUCCESS) return status; + + resp.MessageType = KerbQueryTicketCacheMessage; + resp.CountOfTickets = info->count; + size = FIELD_OFFSET(KERB_QUERY_TKT_CACHE_RESPONSE, Tickets); + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_resp, &resp); + if (status != STATUS_SUCCESS) goto fail; + + if (!info->count) + { + *out = client_resp; + *out_size = sizeof(resp); + return STATUS_SUCCESS; + } + + *out_size = size; + + client_ticket = client_resp + size; + client_str = client_resp + client_str_off; + + for (i = 0; i < info->count; i++) + { + KERB_TICKET_CACHE_INFO ticket; + + ticket = info->info[i]; + + init_client_us(&ticket.RealmName, client_str, &info->info[i].RealmName); + + size = info->info[i].RealmName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].RealmName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + init_client_us(&ticket.ServerName, client_str, &info->info[i].ServerName); + + size = info->info[i].ServerName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].ServerName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + status = lsa_dispatch.CopyToClientBuffer(lsa_req, sizeof(ticket), client_ticket, &ticket); + if (status != STATUS_SUCCESS) goto fail; + + client_ticket += sizeof(ticket); + *out_size += sizeof(ticket); + } + + *out = client_resp; + return STATUS_SUCCESS; + +fail: + lsa_dispatch.FreeClientBuffer(lsa_req, client_resp); + return status; +} + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + NTSTATUS status; + KERB_QUERY_TKT_CACHE_REQUEST *query; + struct ticket_info info; + krb5_error_code error; + krb5_context context = NULL; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) + return STATUS_INVALID_PARAMETER; + + query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + + if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) + return STATUS_ACCESS_DENIED; + + info.count = 0; + info.allocated = 0; + info.info = NULL; + + error = p_krb5_init_context(&context); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + error = p_krb5_cccol_cursor_new(context, &cursor); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + for (;;) + { + error = p_krb5_cccol_cursor_next(context, cursor, &cache); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache(context, cache, &info); + + p_krb5_cc_close(context, cache); + + if (status != STATUS_SUCCESS) + goto done; + } + + status = copy_to_client(lsa_req, &info, out, out_len); + +done: + if (cursor) + p_krb5_cccol_cursor_free(context, &cursor); + + if (context) + p_krb5_free_context(context); + + free_ticket_info(&info); + + return status; +} + +#else /* SONAME_LIBKRB5 */ + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", lsa_req, in, in_len, out, out_len); + return STATUS_NOT_IMPLEMENTED; +} + +#endif /* SONAME_LIBKRB5 */ + static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { - FIXME("%p,%p,%p,%u,%p,%p,%p: stub\n", request, in_buffer, client_buffer_base, + KERB_PROTOCOL_MESSAGE_TYPE msg; + + TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, in_buffer_length, out_buffer, out_buffer_length, status); - *status = STATUS_NOT_IMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!in_buffer || in_buffer_length < sizeof(msg)) + return STATUS_INVALID_PARAMETER; + + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; + + switch (msg) + { + case KerbQueryTicketCacheMessage: + *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + break; + + case KerbRetrieveTicketMessage: + FIXME("KerbRetrieveTicketMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + case KerbPurgeTicketCacheMessage: + FIXME("KerbPurgeTicketCacheMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + default: /* All other requests should call LsaApCallPackage */ + WARN("%u => access denied\n", msg); + *status = STATUS_ACCESS_DENIED; + break; + } + + return *status; } static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index d0339a97ef..6d5e01d675 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -169,6 +169,15 @@ typedef struct _OBJECT_ATTRIBUTES { } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -349,6 +358,102 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif +#define KERB_TICKET_FLAGS_reserved 0x80000000 +#define KERB_TICKET_FLAGS_forwardable 0x40000000 +#define KERB_TICKET_FLAGS_forwarded 0x20000000 +#define KERB_TICKET_FLAGS_proxiable 0x10000000 +#define KERB_TICKET_FLAGS_proxy 0x08000000 +#define KERB_TICKET_FLAGS_may_postdate 0x04000000 +#define KERB_TICKET_FLAGS_postdated 0x02000000 +#define KERB_TICKET_FLAGS_invalid 0x01000000 +#define KERB_TICKET_FLAGS_renewable 0x00800000 +#define KERB_TICKET_FLAGS_initial 0x00400000 +#define KERB_TICKET_FLAGS_pre_authent 0x00200000 +#define KERB_TICKET_FLAGS_hw_authent 0x00100000 +#define KERB_TICKET_FLAGS_ok_as_delegate 0x00040000 +#define KERB_TICKET_FLAGS_name_canonicalize 0x00010000 +#define KERB_TICKET_FLAGS_cname_in_pa_data 0x00040000 +#define KERB_TICKET_FLAGS_reserved1 0x00000001 + +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE +{ + KerbDebugRequestMessage = 0, + KerbQueryTicketCacheMessage, + KerbChangeMachinePasswordMessage, + KerbVerifyPacMessage, + KerbRetrieveTicketMessage, + KerbUpdateAddressesMessage, + KerbPurgeTicketCacheMessage, + KerbChangePasswordMessage, + KerbRetrieveEncodedTicketMessage, + KerbDecryptDataMessage, + KerbAddBindingCacheEntryMessage, + KerbSetPasswordMessage, + KerbSetPasswordExMessage, + KerbVerifyCredentialsMessage, + KerbQueryTicketCacheExMessage, + KerbPurgeTicketCacheExMessage, + KerbRefreshSmartcardCredentialsMessage, + KerbAddExtraCredentialsMessage, + KerbQuerySupplementalCredentialsMessage, + KerbTransferCredentialsMessage, + KerbQueryTicketCacheEx2Message, + KerbSubmitTicketMessage, + KerbAddExtraCredentialsExMessage, + KerbQueryKdcProxyCacheMessage, + KerbPurgeKdcProxyCacheMessage, + KerbQueryTicketCacheEx3Message, + KerbCleanupMachinePkinitCredsMessage, + KerbAddBindingCacheEntryExMessage, + KerbQueryBindingCacheMessage, + KerbPurgeBindingCacheMessage, + KerbQueryDomainExtendedPoliciesMessage, + KerbQueryS4U2ProxyCacheMessage +} KERB_PROTOCOL_MESSAGE_TYPE, *PKERB_PROTOCOL_MESSAGE_TYPE; + +typedef struct _KERB_TICKET_CACHE_INFO +{ + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; + +typedef struct _KERB_QUERY_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; +} KERB_QUERY_TKT_CACHE_REQUEST, *PKERB_QUERY_TKT_CACHE_REQUEST; + +typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; + +typedef struct _KERB_RETRIEVE_TKT_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING TargetName; + ULONG TicketFlags; + ULONG CacheOptions; + LONG EncryptionType; + SecHandle CredentialsHandle; +} KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; + +typedef struct _KERB_PURGE_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; +} KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 -- 2.15.1

2 1

[PATCH 1/2] include: Add activation.idl with IActivationFactory interface.
by Nikolay Sivov 30 Jan '18

30 Jan '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 include/activation.idl diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..fdf736e4eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000000..b86c9f6b6f --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +} -- 2.15.1

1 1

[PATCH 1/2] comctl32/tests: Enable IP address control tests on version 6
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/ipaddress.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 6d8e9ccf4b..52581899a7 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -22,6 +22,7 @@ #include <commctrl.h> #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) @@ -63,5 +64,15 @@ static void test_get_set_text(void) START_TEST(ipaddress) { + ULONG_PTR cookie; + HANDLE ctxt; + + test_get_set_text(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + test_get_set_text(); + + unload_v6_module(cookie, ctxt); } -- 2.15.1

1 1

[PATCH 3/4] dwrite: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 457d863d7b..31b977a159 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -20,6 +20,7 @@ #include "d2d1.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -30,31 +31,6 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] advapi32: Support WinLogonIdsSid in IsWellKnownSid
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e666062..84aa2f1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -104,6 +104,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, -- 1.9.1

1 0

[PATCH] dpnet: Use the global HeapAlloc() wrappers
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/dpnet_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 44ff289d..2e72360 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -25,6 +25,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" #include "wine/unicode.h" @@ -154,21 +155,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; -- 1.9.1

1 0

[PATCH resend 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH] browseui: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/browseui/aclmulti.c | 1 + dlls/browseui/aclsource.c | 1 + dlls/browseui/browseui.h | 21 --------------------- dlls/browseui/browseui_main.c | 1 + dlls/browseui/compcatcachedaemon.c | 1 + dlls/browseui/progressdlg.c | 1 + 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3a6525fc7a..412a18d3ab 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 71e9d39a71..0ade9cce55 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 27691a1cce..73780f1ce2 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,25 +31,4 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_BROWSEUI_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 1b3cecc996..2e31b37fc8 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -34,6 +34,7 @@ #include "shlguid.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "browseui.h" #include "initguid.h" diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5c97e9507..1f62441727 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 24183bdc04..09c1996a59 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" -- 2.14.3

1 0

[PATCH] atl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 0e48a391d9..e753429327 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,6 +23,7 @@ #include "atlcom.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -33,16 +34,6 @@ HINSTANCE atl_instance; typedef unsigned char cpp_bool; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static ICatRegister *catreg; /*********************************************************************** -- 2.14.3

1 0

[PATCH] appwiz.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 1e60daf6c3..2165ce11b1 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" typedef enum { @@ -27,21 +28,6 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *str) { WCHAR *ret; -- 2.14.3

1 0

[PATCH] advpack: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack_private.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 252974f8ea..fc3b26f393 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,22 +21,14 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +#include "wine/heap.h" + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *heap_strdupWtoA(const WCHAR *str) { char *ret = NULL; -- 2.14.3

1 0

[PATCH] advapi32: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 7fc02a4a2e..4ced1e8a64 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -23,6 +23,7 @@ #include "ntsecapi.h" #include "winsvc.h" #include "winnls.h" +#include "wine/heap.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -38,26 +39,6 @@ const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src ) { WCHAR *dst = NULL; -- 2.14.3

1 0

[PATCH] comctl32/toolbar: Fix a TRACE
by Mark Jansen 29 Jan '18

29 Jan '18

Fix a TRACE that tries to print -1 as string.

1 0

[PATCH] user32/tests: Add more A/W message data conversion tests
by Nikolay Sivov 29 Jan '18

29 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 63 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b1d8..19f220d8b3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1237,8 +1237,17 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, } static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; + +enum defdlgproc_text +{ + DLGPROCTEXT_CONTEXT = 0, + DLGPROCTEXT_A, + DLGPROCTEXT_W, +}; + static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1251,12 +1260,28 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - todo_wine - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else - todo_wine + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(!IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + if (msg == WM_SETTEXT && !IsWindowUnicode(hdlg)) + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + else + todo_wine_if(IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; }; @@ -1265,6 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1277,10 +1303,22 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + todo_wine_if(!IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; } @@ -1291,11 +1329,20 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; + SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); } static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) -- 2.15.1

1 0

[PATCH 1/5] dxgi: Allow wrapping adapter objects.
by Józef Kucia 29 Jan '18

29 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- For RenderDoc in Wine. --- dlls/dxgi/adapter.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 9 +++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 5440f2a64517..2ebf24e9b48e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -33,7 +33,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter1 *ifac { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIAdapter1) + if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter1) || IsEqualGUID(iid, &IID_IDXGIAdapter) || IsEqualGUID(iid, &IID_IDXGIObject) || IsEqualGUID(iid, &IID_IUnknown)) @@ -260,10 +261,21 @@ static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) { + IWineDXGIAdapter *wine_adapter; + struct dxgi_adapter *adapter; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_adapter_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); + if (FAILED(hr = IDXGIAdapter1_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) + { + ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_adapter->lpVtbl == (void *)&dxgi_adapter_vtbl); + adapter = CONTAINING_RECORD(wine_adapter, struct dxgi_adapter, IDXGIAdapter1_iface); + IWineDXGIAdapter_Release(wine_adapter); + return adapter; } static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *factory, UINT ordinal) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a4f715b60766..983cdba68d14 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -50,3 +50,12 @@ interface IWineDXGIDeviceParent : IUnknown { struct wined3d_device_parent *get_wined3d_device_parent(); } + +[ + object, + local, + uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) +] +interface IWineDXGIAdapter : IDXGIAdapter1 +{ +} -- 2.13.6

4 8

[PATCH] crypt32: Added support for szOID_NIST_sha* OIDs.
by Jacek Caban 29 Jan '18

29 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/oid.c | 7 +++++++ dlls/crypt32/tests/oid.c | 25 ++++++++++++++++++++----- include/wincrypt.h | 3 +++ 3 files changed, 30 insertions(+), 5 deletions(-)

1 0

[PATCH 5/5] wined3d: Use the resource access flags in ffp_blit_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb28117..520f88c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2664,18 +2664,19 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ HeapFree(GetProcessHeap(), 0, blitter); } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination is in system memory.\n"); + TRACE("Source or destination resource is not GPU accessible.\n"); return FALSE; } @@ -2690,14 +2691,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (d3d_info->shader_color_key) + if (context->d3d_info->shader_color_key) { TRACE("Color keying requires converted textures.\n"); return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!context->gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return FALSE; if (TRACE_ON(d3d)) @@ -2722,7 +2723,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE; @@ -2821,9 +2822,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit dst_resource = &dst_texture->resource; device = dst_resource->device; - if (!ffp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - dst_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!ffp_blit_supported(op, context, src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use the resource access flags in fbo_blitter_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e5940a..fb28117 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -484,25 +484,28 @@ static void surface_blt_fbo(const struct wined3d_device *device, context_restore(context, restore_rt); } -static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; /* Source and/or destination need to be on the GL side */ - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) @@ -2229,11 +2232,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2252,9 +2253,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, - texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, src_location, &texture->resource, dst_location)) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); @@ -2470,9 +2470,8 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!fbo_blitter_supported(blit_op, context->gl_info, + src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in arbfp_blit_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 11141b6..a8c4abb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7695,15 +7695,16 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; enum complex_fixup src_fixup; BOOL decompress; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -7717,7 +7718,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (!d3d_info->shader_color_key) + if (!context->d3d_info->shader_color_key) { /* The conversion modifies the alpha channel so the color key might no longer match. */ TRACE("Color keying not supported with converted textures.\n"); @@ -7734,7 +7735,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup); @@ -7800,9 +7801,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; - if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, src_location, - dst_texture->resource.pool, dst_texture->resource.format, dst_location)) + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, + &dst_texture->resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

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-devel January 2018