November 2019 - Wine-Commits

Chip Davis : mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi on Mac OS.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: d61e293924b076392bcf14bfa04e8b00fd305f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61e293924b076392bcf14bf… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Nov 25 11:40:35 2019 -0600 mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi on Mac OS. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 77 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 91d2f851e8..8bbf43579c 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,9 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif @@ -46,14 +49,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) + static void appeared_callback( DADiskRef disk, void *context ) { CFDictionaryRef dict = DADiskCopyDescription( disk ); const void *ref; char device[64]; char mount_point[PATH_MAX]; + char model[64]; + size_t model_len = 0; GUID guid, *guid_ptr = NULL; enum device_type type = DEVICE_UNKNOWN; + UINT pdtype = 0; + SCSI_ADDRESS scsi_addr; + UNICODE_STRING devname; + int fd; if (!dict) return; @@ -77,22 +96,78 @@ static void appeared_callback( DADiskRef disk, void *context ) if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaKind") ))) { if (!CFStringCompare( ref, CFSTR("IOCDMedia"), 0 )) + { type = DEVICE_CDROM; + pdtype = 5; + } if (!CFStringCompare( ref, CFSTR("IODVDMedia"), 0 ) || !CFStringCompare( ref, CFSTR("IOBDMedia"), 0 )) + { type = DEVICE_DVD; + pdtype = 5; + } if (!CFStringCompare( ref, CFSTR("IOMedia"), 0 )) type = DEVICE_HARDDISK; } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceVendor") ))) + { + CFIndex i; + + CFStringGetCString( ref, model, sizeof(model), kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 8 characters */ + for (i = 0; i < (CFIndex)8 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceModel") ))) + { + CFIndex i; + + CFStringGetCString( ref, model+model_len, sizeof(model)-model_len, kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 16 characters */ + for (i = 0; i < (CFIndex)16 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DADeviceRevision") ))) + { + CFIndex i; + + CFStringGetCString( ref, model+model_len, sizeof(model)-model_len, kCFStringEncodingASCII ); + model_len += CFStringGetLength( ref ); + /* Pad to 4 characters */ + for (i = 0; i < (CFIndex)4 - CFStringGetLength( ref ); ++i) + model[model_len++] = ' '; + } + TRACE( "got mount notification for '%s' on '%s' uuid %s\n", device, mount_point, wine_dbgstr_guid(guid_ptr) ); + devname.Buffer = NULL; if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - add_dos_device( -1, device, device, mount_point, type, guid_ptr, NULL ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr, &devname ); else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + if ((fd = open( device, O_RDONLY )) >= 0) + { + dk_scsi_identify_t dsi; + + if (ioctl( fd, DKIOCSCSIIDENTIFY, &dsi ) >= 0) + { + scsi_addr.PortNumber = dsi.bus; + scsi_addr.PathId = dsi.port; + scsi_addr.TargetId = dsi.target; + scsi_addr.Lun = dsi.lun; + + /* FIXME: get real controller Id for SCSI */ + /* FIXME: get real driver name */ + create_scsi_entry( &scsi_addr, 255, "WINE SCSI", pdtype, model, &devname ); + } + close( fd ); + } + done: CFRelease( dict ); }

1 0

Chip Davis : winegcc: Pass through -fuse-ld= to the linker.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 6c50dbd14ec1c652faecc5ca84d78dab74d89b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c50dbd14ec1c652faecc5ca… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:13:31 2019 -0600 winegcc: Pass through -fuse-ld= to the linker. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 140ca07822..939c1e5c91 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -73,7 +73,7 @@ * object-file-name -llibrary -nostartfiles -nodefaultlibs * -nostdlib -s -static -static-libgcc -static-libstdc++ * -shared -shared-libgcc -symbolic -Wl,option - * -Xlinker option -u symbol --image-base + * -Xlinker option -u symbol --image-base -fuse-ld * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1329,6 +1329,9 @@ static int is_linker_arg(const char* arg) case 'a': if (strcmp("-arch", arg) == 0) return 1; break; + case 'f': + if (strncmp("-fuse-ld=", arg, 9) == 0) return 1; + break; } for (j = 0; j < ARRAY_SIZE(link_switches); j++)

1 0

Chip Davis : ntdll: Implement SystemBatteryState for Mac OS.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: eea87600d21adcd910f72f1cdaf698451884f582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea87600d21adcd910f72f1c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:09:31 2019 -0600 ntdll: Implement SystemBatteryState for Mac OS. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c9b278d3fc..f59aba0358 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -38,6 +38,9 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <IOKit/IOKitLib.h> +# include <IOKit/pwr_mgt/IOPM.h> +# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPowerSources.h> #endif #include <ctype.h> @@ -3291,6 +3294,73 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) return STATUS_SUCCESS; } +#elif defined(HAVE_IOKIT_IOKITLIB_H) + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + CFArrayRef batteries; + CFDictionaryRef battery; + CFNumberRef prop; + uint32_t value, voltage; + CFTimeInterval remain; + + if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + return STATUS_ACCESS_DENIED; + + if (CFArrayGetCount( batteries ) == 0) + { + /* Just assume we're on AC with no battery. */ + bs->AcOnLine = TRUE; + return STATUS_SUCCESS; + } + /* Just use the first battery. */ + battery = CFArrayGetValueAtIndex( batteries, 0 ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + + if (value & kIOBatteryInstalled) + bs->BatteryPresent = TRUE; + else + /* Since we are executing code, we must have AC power. */ + bs->AcOnLine = TRUE; + if (value & kIOBatteryChargerConnect) + { + bs->AcOnLine = TRUE; + if (value & kIOBatteryCharge) + bs->Charging = TRUE; + } + else + bs->Discharging = TRUE; + + /* We'll need the voltage to be able to interpret the other values. */ + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->MaxCapacity = value * voltage; + /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow + * Windows for now (5% and 33%). */ + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = bs->MaxCapacity / 3; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->RemainingCapacity = value * voltage; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->Rate = value * voltage; + + remain = IOPSGetTimeRemainingEstimate(); + if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) + bs->EstimatedTime = (ULONG)remain; + + CFRelease( batteries ); + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs)

1 0

Alexandre Julliard : msxml3: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 096eda01cce80fe3338aa26b00dacade504c7c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=096eda01cce80fe3338aa26b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:39 2019 +0100 msxml3: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/xslpattern.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 0cefe59168..4a2aad215c 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -70,7 +70,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons %start XSLPattern -%pure-parser +%define api.pure %parse-param {parser_param* p} %parse-param {void* scanner} %lex-param {yyscan_t* scanner}

1 0

Jeff Smith : msvcrt: Call invalid parameter handler for out-of-range integer.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 8fe3d7c9134eaac35def84ed4ead50c571469529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fe3d7c9134eaac35def84ed… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 25 08:10:05 2019 -0600 msvcrt: Call invalid parameter handler for out-of-range integer. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 3 +-- dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 84e725747f..0d5b64a4aa 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -996,9 +996,8 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_s #endif MSVCRT_size_t len; - if(src<l || src>h) { + if(!MSVCRT_CHECK_PMT(src>=l && src<=h)) { *str = 0; - *MSVCRT__errno() = MSVCRT_EINVAL; return FALSE; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 93a78a5de7..6314662eac 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -937,10 +937,10 @@ static void test_strftime(void) {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, @@ -948,10 +948,10 @@ static void test_strftime(void) {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},

1 0

Zebediah Figura : ddraw: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: ddec23013e39b563a3a50c0fe42c2ae8b518d538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddec23013e39b563a3a50c0f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 20 10:30:11 2019 -0600 ddraw: Track the viewport and scissor rect in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ad1fdb7f5..ffa029321c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6961,6 +6961,17 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device return WINED3D_ZB_TRUE; } +static void ddraw_reset_viewport_state(struct ddraw *ddraw) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(ddraw->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(ddraw->state, &vp); + wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); +} + static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { @@ -7039,6 +7050,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); } + ddraw_reset_viewport_state(ddraw); return D3D_OK; }

1 0

Alexandre Julliard : msi: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: d977c55bb4b9c564f376c22b43c60c9be7dc782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d977c55bb4b9c564f376c22b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:05 2019 +0100 msi: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/sql.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 2183d1edf4..1a79de31bf 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -114,7 +114,7 @@ static void value_free( struct value val ) %lex-param { COND_input *info } %parse-param { COND_input *info } -%pure-parser +%define api.pure %union { diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 50092abacf..8ffbcd4de5 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -58,7 +58,7 @@ static struct expr * EXPR_wildcard( void *info ); %lex-param { SQL_input *info } %parse-param { SQL_input *info } -%pure-parser +%define api.pure %union {

1 0

Alexandre Julliard : cabinet: Build with msvcrt.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: df2521bff234acb049e2fb534e6ad1dfe6cf5d45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2521bff234acb049e2fb53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:33 2019 +0100 cabinet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/Makefile.in | 2 ++ dlls/cabinet/cabinet.h | 21 --------------------- dlls/cabinet/cabinet_main.c | 3 +-- dlls/cabinet/fci.c | 6 ++---- dlls/cabinet/fdi.c | 4 ++-- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index 1d5b549bb5..6b7211aac8 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -1,6 +1,8 @@ MODULE = cabinet.dll IMPORTLIB = cabinet +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cabinet_main.c \ deflate.c \ diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index b84c3a7c5d..6193622cb1 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -29,27 +29,6 @@ #include "fdi.h" #include "fci.h" -/* from msvcrt/sys/stat.h */ -#define _S_IWRITE 0x0080 -#define _S_IREAD 0x0100 - -/* from msvcrt/fcntl.h */ -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 - #define CAB_SPLITMAX (10) #define CAB_SEARCH_SIZE (32*1024) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 8af0fb1e6d..f95eca93c5 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -18,11 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <string.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index d746ac9cbc..1b72d7c77c 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -30,14 +30,12 @@ There is still some work to be done: */ - - -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <sys/stat.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 777174b4d1..1f442917d5 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -58,10 +58,10 @@ * -gmt */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> +#include <sys/stat.h> +#include <fcntl.h> #include "windef.h" #include "winbase.h"

1 0

Zebediah Figura : quartz/acmwrapper: Call IMemInputPin::Receive() directly.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 5cfdf950222e7b601a9ea99ad0497b0c4de42080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cfdf950222e7b601a9ea99a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 21:14:02 2019 -0600 quartz/acmwrapper: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d1e4803fac..9e818579df 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -203,7 +203,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {

1 0

Alexandre Julliard : wininet: Build with msvcrt.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 3c31cc5836026b45a40818ec874bbbcc4d6ad982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c31cc5836026b45a40818ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:14 2019 +0100 wininet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 2 + dlls/wininet/cookie.c | 43 +++--- dlls/wininet/dialogs.c | 21 ++- dlls/wininet/ftp.c | 12 +- dlls/wininet/gopher.c | 2 - dlls/wininet/http.c | 320 +++++++++++++++++++++---------------------- dlls/wininet/internet.c | 96 ++++++------- dlls/wininet/internet.h | 5 +- dlls/wininet/netconnection.c | 1 - dlls/wininet/urlcache.c | 34 +++-- dlls/wininet/utility.c | 14 +- 11 files changed, 268 insertions(+), 282 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c31cc5836026b45a408…

1 0