wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Vijay Kiran Kamuju : shcore: Add stub for GetScaleFactorForMonitor.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: bbdc670931e5473b8c11895489636ae1ab8b6ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdc670931e5473b8c118954… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Nov 25 09:00:26 2019 +0100 shcore: Add stub for GetScaleFactorForMonitor. Based on a patch by Esdras Tarsis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 ++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 3 +++ include/shtypes.idl | 21 +++++++++++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9d..9ebda5164c 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..3f95c1ffd8 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..82a1daaa62 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -36,6 +38,7 @@ typedef enum PROCESS_DPI_AWARENESS HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */ diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c80381..c83562a24b 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR;

1 0

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

25 Nov '19

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

Chip Davis : ntdll: Implement SystemBatteryState for Mac OS.
by Alexandre Julliard 25 Nov '19

25 Nov '19

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 : wbemprox: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 7026b59b48abecfe51444df491ff40b33f53d3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7026b59b48abecfe51444df4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:54 2019 +0100 wbemprox: 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/wbemprox/wql.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 12f4cb5104..0fae44da2e 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -216,7 +216,7 @@ static int wql_lex( void *val, struct parser *parser ); %lex-param { struct parser *ctx } %parse-param { struct parser *ctx } %define parse.error verbose -%pure-parser +%define api.pure %union {

1 0

Alexandre Julliard : vbscript: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 003a5f7c981fafe31c1b218df50259ba4131804b URL: https://source.winehq.org/git/wine.git/?a=commit;h=003a5f7c981fafe31c1b218d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:47 2019 +0100 vbscript: 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/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a28717ff76..df2c72da95 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -85,7 +85,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {

1 0

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

25 Nov '19

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

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

25 Nov '19

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 : opcservices: Build with msvcrt.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: 8631960745396109ec450eafb9fe76684388f84a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631960745396109ec450eaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:44 2019 +0100 opcservices: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 ++ dlls/opcservices/compress.c | 2 -- dlls/opcservices/package.c | 11 +++++------ dlls/opcservices/uri.c | 11 +++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 2b6c1ce57a..b55c79826d 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,6 +1,8 @@ MODULE = opcservices.dll IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ compress.c \ deflate.c \ diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 19a4f0399f..0ee876512c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -18,8 +18,6 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 9bdd4b1f15..6ed7f6bcd7 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -26,7 +26,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "opc_private.h" @@ -732,7 +731,7 @@ static WCHAR *opc_strdupW(const WCHAR *str) { size_t size; - size = (strlenW(str) + 1) * sizeof(WCHAR); + size = (lstrlenW(str) + 1) * sizeof(WCHAR); ret = CoTaskMemAlloc(size); if (ret) memcpy(ret, str, size); @@ -1169,7 +1168,7 @@ static struct opc_relationship *opc_relationshipset_get_rel(struct opc_relations for (i = 0; i < relationship_set->count; i++) { - if (!strcmpW(id, relationship_set->relationships[i]->id)) + if (!wcscmp(id, relationship_set->relationships[i]->id)) return relationship_set->relationships[i]; } @@ -1207,7 +1206,7 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); - sprintfW(relationship->id, fmtW, generated); + swprintf(relationship->id, 10, fmtW, generated); if (opc_relationshipset_get_rel(set, relationship->id)) { @@ -1635,11 +1634,11 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar if (cur->element == CONTENT_TYPE_OVERRIDE) continue; - if (!strcmpiW(cur->u.def.ext, ext)) + if (!wcsicmp(cur->u.def.ext, ext)) { added = TRUE; - if (!strcmpW(cur->u.def.type, content_type)) + if (!wcscmp(cur->u.def.type, content_type)) break; hr = opc_package_add_override_content_type(types, part); diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 800ae34571..db889f7144 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "opc_private.h" @@ -467,7 +466,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) return NULL; } - end = strrchrW(path, '/'); + end = wcsrchr(path, '/'); if (end && end >= path + ARRAY_SIZE(relsdirW) - 1) start = end - ARRAY_SIZE(relsdirW) + 1; if (!start) @@ -476,7 +475,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) /* Test if it's already relationships uri. */ if (len > ARRAY_SIZE(relsextW)) { - if (!strcmpW(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) + if (!wcscmp(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) { if (start && !memcmp(start, relsdirW, ARRAY_SIZE(relsdirW) - sizeof(WCHAR))) { @@ -500,9 +499,9 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) ret[start - path] = 0; } - strcatW(ret, relsdirW); - strcatW(ret, end); - strcatW(ret, relsextW); + lstrcatW(ret, relsdirW); + lstrcatW(ret, end); + lstrcatW(ret, relsextW); if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#x.\n", hr);

1 0

Alexandre Julliard : opcservices: Import zlib deflate code.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: master Commit: c6aeabdd2c9cfeae1f0274514196dd9ac040b177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6aeabdd2c9cfeae1f027451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:30:39 2019 +0100 opcservices: Import zlib deflate code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 3 +- dlls/opcservices/compress.c | 33 +- dlls/opcservices/deflate.c | 2974 ++++++++++++++++++++++++++++++++++++++++++ dlls/opcservices/zlib.h | 162 +++ 4 files changed, 3138 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6aeabdd2c9cfeae1f02…

1 0

Alexandre Julliard : cabinet: Build with msvcrt.
by Alexandre Julliard 25 Nov '19

25 Nov '19

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

← Newer
1
...
13
14
15
16
17
18
19
...
90
Older →

Jump to page:

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-commits November 2019