wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Alex Henrie : ntdll: Implement NtPowerInformation(SystemBatteryState) on Linux.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 63ddf0343b352d5709a587b9a1efc52bf111ab6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ddf0343b352d5709a587b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 29 20:22:23 2019 -0600 ntdll: Implement NtPowerInformation(SystemBatteryState) on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5afdf77986..81bac70b0f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3137,6 +3137,73 @@ static ULONG mhz_from_cpuinfo(void) } #endif +#ifdef linux + +static const char * get_sys_str(const char *path) +{ + static char s[16]; + FILE *f = fopen(path, "r"); + const char *ret = NULL; + if (f) + { + if (fgets(s, sizeof(s), f)) + ret = s; + fclose(f); + } + return ret; +} + +static int get_sys_int(const char *path, int def) +{ + const char *s = get_sys_str(path); + return s ? atoi(s) : def; +} + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + char path[64]; + const char *s; + unsigned int i = 0; + LONG64 voltage; /* microvolts */ + + bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); + + for (;;) + { + sprintf(path, "/sys/class/power_supply/BAT%u/status", i); + s = get_sys_str(path); + if (!s) break; + bs->Charging |= (strcmp(s, "Charging\n") == 0); + bs->Discharging |= (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + i++; + } + + if (bs->BatteryPresent) + { + voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); + bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; + bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; + bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; + if (!bs->Charging && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; + else + bs->EstimatedTime = ~0u; + } + + return STATUS_SUCCESS; +} + +#else + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) +{ + FIXME("SystemBatteryState not implemented on this platform\n"); + return STATUS_NOT_IMPLEMENTED; +} + +#endif + /****************************************************************************** * NtPowerInformation [NTDLL.@] * @@ -3190,6 +3257,12 @@ NTSTATUS WINAPI NtPowerInformation( PowerCaps->DefaultLowLatencyWake = PowerSystemUnspecified; return STATUS_SUCCESS; } + case SystemBatteryState: { + if (nOutputBufferSize < sizeof(SYSTEM_BATTERY_STATE)) + return STATUS_BUFFER_TOO_SMALL; + memset(lpOutputBuffer, 0, sizeof(SYSTEM_BATTERY_STATE)); + return fill_battery_state(lpOutputBuffer); + } case SystemExecutionState: { PULONG ExecutionState = lpOutputBuffer; WARN("semi-stub: SystemExecutionState\n"); /* Needed for .NET Framework, but using a FIXME is really noisy. */

1 0

Fabian Maurer : find: First implementation.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: e1bcf2d88a09348ea67596fd12cdca14918c8d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bcf2d88a09348ea67596fd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Oct 25 18:55:42 2019 +0200 find: First implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44975 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/Makefile.in | 3 + programs/find/find.c | 170 +++++++++++++++++++++++++++++++++++++++++++-- programs/find/find.rc | 25 +++++++ programs/find/resources.h | 27 +++++++ programs/find/tests/find.c | 6 +- 5 files changed, 225 insertions(+), 6 deletions(-) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index 0c6b334f29..ae2105be82 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,5 +1,8 @@ MODULE = find.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c + +RC_SRCS = find.rc diff --git a/programs/find/find.c b/programs/find/find.c index 0c8ba1fcd7..3794a8190f 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,180 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; + static UINT buffer_max = 0; + static UINT buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) + { + BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); + if (!success) + return FALSE; + buffer_pos = 0; + } + + *char_out = buffer[buffer_pos++]; + return TRUE; +} + +/* Read a line from a handle, returns NULL if the end is reached */ +static WCHAR* read_line_from_handle(HANDLE handle) +{ + int line_max = 4096; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(line_max); + + for (;;) + { + char c; + success = read_char_from_handle(handle, &c); + + /* Check for EOF */ + if (!success) + { + if (length == 0) + return NULL; + else + break; + } + + if (c == '\n') + break; + + /* Make sure buffer is large enough */ + if (length + 1 >= line_max) + { + line_max *= 2; + line = heap_realloc(line, line_max); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') /* Strip \r of windows line endings */ + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + return line_converted; +} + +static void write_to_stdout(const WCHAR *str) +{ + char *str_converted; + UINT str_converted_length; + DWORD bytes_written; + UINT str_length = lstrlenW(str); + int codepage = CP_ACP; + + str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); + if (bytes_written < str_converted_length) + ERR("Failed to write output\n"); + + heap_free(str_converted); +} + +static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) + return FALSE; + + found = wcsstr(line, tofind); + + if (found) + { + write_to_stdout(line); + write_to_stdout(lineending); + return TRUE; + } + + return FALSE; +} + +static void output_resource_message(int id) +{ + WCHAR buffer[64]; + LoadStringW(GetModuleHandleW(NULL), id, buffer, ARRAY_SIZE(buffer)); + write_to_stdout(buffer); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + output_resource_message(IDS_INVALID_SWITCH); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + else + { + FIXME("Searching files not supported yet\n"); + return 1000; + } + } + + if (tofind == NULL) + { + output_resource_message(IDS_INVALID_PARAMETER); + return 2; + } + + exitcode = 1; + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc new file mode 100644 index 0000000000..8c358c8677 --- /dev/null +++ b/programs/find/find.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2019 Fabian Maurer + * + * 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 "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..2ebe197b7d --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2019 Fabian Maurer + * + * 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 __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 8af21a53fa..147b59c8ce 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -90,7 +90,6 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } - todo_wine_if(out_expected_len != 0) ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" "%s\n" "#################### But got:\n" @@ -176,7 +175,6 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - todo_wine_if(exitcode_expected != 0) ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); heap_free(child_output); @@ -227,7 +225,9 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); } @@ -238,6 +238,7 @@ static void test_singleline_without_switches(void) run_find_stdin_str("\"test\"", "", "", 1); run_find_stdin_str("\"test\"", "test", "test\r\n", 0); run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test\"", "test\r2", "test\r2\r\n", 0); run_find_stdin_str("\"test2\"", "test", "", 1); } @@ -297,6 +298,7 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */ + todo_wine run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); }

1 0

Zhiyi Zhang : winex11.drv: Use underscore style for struct x11drv_display_device_handler.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: de94cfa775f9f41d1d65cbd8e7bf861cd7f9a871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de94cfa775f9f41d1d65cbd8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 25 21:40:09 2019 +0800 winex11.drv: Use underscore style for struct x11drv_display_device_handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 16 ++++++++-------- dlls/winex11.drv/x11drv.h | 26 +++++++++++++------------- dlls/winex11.drv/xinerama.c | 12 ++++++------ dlls/winex11.drv/xrandr.c | 12 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 107719a26f..6c4097a790 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -470,7 +470,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.pGetGpus(&gpus, &gpu_count)) + if (!handler.get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -480,13 +480,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler.get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler.get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -502,12 +502,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); monitors = NULL; video_index++; } - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); adapters = NULL; } @@ -522,9 +522,9 @@ done: ReleaseMutex(mutex); CloseHandle(mutex); if (gpus) - handler.pFreeGpus(gpus); + handler.free_gpus(gpus); if (adapters) - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); if (monitors) - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5e9dfc9f7..a06cf3ffd8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -715,34 +715,34 @@ struct x11drv_display_device_handler /* A name to tell what host driver is used */ const char *name; - /* Higher priority can override handlers with lower proprity */ + /* Higher priority can override handlers with lower priority */ INT priority; - /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count); - /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + BOOL (*get_adapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); - /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + /* get_monitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. * The first monitor has to be primary if adapter is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + BOOL (*get_monitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); - /* pFreeGpus will be called to free a GPU list from pGetGpus */ - void (*pFreeGpus)(struct x11drv_gpu *gpus); + /* free_gpus will be called to free a GPU list from get_gpus */ + void (*free_gpus)(struct x11drv_gpu *gpus); - /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ - void (*pFreeAdapters)(struct x11drv_adapter *adapters); + /* free_adapters will be called to free an adapter list from get_adapters */ + void (*free_adapters)(struct x11drv_adapter *adapters); - /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ - void (*pFreeMonitors)(struct x11drv_monitor *monitors); + /* free_monitors will be called to free a monitor list from get_monitors */ + void (*free_monitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 61c422e835..b5620d3403 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -338,11 +338,11 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.name = desktop_mode ? "Desktop" : "Xinerama"; handler.priority = desktop_mode ? 1000 : 100; - handler.pGetGpus = xinerama_get_gpus; - handler.pGetAdapters = xinerama_get_adapters; - handler.pGetMonitors = xinerama_get_monitors; - handler.pFreeGpus = xinerama_free_gpus; - handler.pFreeAdapters = xinerama_free_adapters; - handler.pFreeMonitors = xinerama_free_monitors; + handler.get_gpus = xinerama_get_gpus; + handler.get_adapters = xinerama_get_adapters; + handler.get_monitors = xinerama_get_monitors; + handler.free_gpus = xinerama_free_gpus; + handler.free_adapters = xinerama_free_adapters; + handler.free_monitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 85da5efea3..412400e3f6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1109,12 +1109,12 @@ void X11DRV_XRandR_Init(void) { handler.name = "XRandR 1.4"; handler.priority = 200; - handler.pGetGpus = xrandr14_get_gpus; - handler.pFreeGpus = xrandr14_free_gpus; - handler.pGetAdapters = xrandr14_get_adapters; - handler.pFreeAdapters = xrandr14_free_adapters; - handler.pGetMonitors = xrandr14_get_monitors; - handler.pFreeMonitors = xrandr14_free_monitors; + handler.get_gpus = xrandr14_get_gpus; + handler.get_adapters = xrandr14_get_adapters; + handler.get_monitors = xrandr14_get_monitors; + handler.free_gpus = xrandr14_free_gpus; + handler.free_adapters = xrandr14_free_adapters; + handler.free_monitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); pXRRSelectInput( thread_init_display(), root_window,

1 0

Zhiyi Zhang : winex11.drv: Call XFlush() right after XUngrabServer().
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 6dbb153ede48e77a87dddf37e5276276a701c5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbb153ede48e77a87dddf37… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 25 21:39:54 2019 +0800 winex11.drv: Call XFlush() right after XUngrabServer(). XGrabServer() stops the processing of other display connections until a XUngrabServer() call is actually processed by the X server. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bba2253264..073761a5ee 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -480,6 +480,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template palette_size = c_min + NB_RESERVED_COLORS; XUngrabServer(gdi_display); + XFlush(gdi_display); TRACE("adjusted size %i colorcells\n", palette_size); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7..85da5efea3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -419,6 +419,7 @@ static LONG xrandr12_set_current_mode( int mode ) if (status != RRSetConfigSuccess) { XUngrabServer( gdi_display ); + XFlush( gdi_display ); ERR("Failed to disable CRTC.\n"); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); @@ -440,6 +441,7 @@ static LONG xrandr12_set_current_mode( int mode ) crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); XUngrabServer( gdi_display ); + XFlush( gdi_display ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources );

1 0

Jacek Caban : vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: fa0c84ae0b3f3597cd98a9d3d3d999f86e6992b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0c84ae0b3f3597cd98a9d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:29 2019 +0100 vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/error.vbs | 16 ++++++++++++++++ dlls/vbscript/tests/run.c | 11 ++++++++++- dlls/vbscript/vbdisp.c | 19 +++++++++++++++---- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 13f9a2072e..1853f6c4bf 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -457,4 +457,20 @@ end sub call testVBErrorCodes +on error resume next + +throwWithDesc +ok err.number = &hdeadbeef&, "err.number = " & hex(err.number) +ok err.description = "test", "err.description = " & err.description +ok err.helpcontext = 10, "err.helpcontext = " & err.helpcontext +ok err.helpfile = "test.chm", "err.helpfile = " & err.helpfile + +throwWithDesc = 1 +ok err.number = &hdeadbeef&, "err.number = " & hex(err.number) +ok err.description = "test", "err.description = " & err.description +ok err.helpcontext = 10, "err.helpcontext = " & err.helpcontext +ok err.helpfile = "test.chm", "err.helpfile = " & err.helpfile + +on error goto 0 + call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index b7a204f919..9354cae309 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_WEEKSTARTDAY 1021 #define DISPID_GLOBAL_GLOBALCALLBACK 1022 #define DISPID_GLOBAL_TESTERROROBJECT 1023 +#define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1105,7 +1106,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"testArray", DISPID_GLOBAL_TESTARRAY }, { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, - { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT } + { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, + { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC } }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1463,6 +1465,13 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return hres; + + case DISPID_GLOBAL_THROWWITHDESC: + pei->scode = 0xdeadbeef; + pei->bstrDescription = SysAllocString(L"test"); + pei->bstrHelpFile = SysAllocString(L"test.chm"); + pei->dwHelpContext = 10; + return DISP_E_EXCEPTION; } case DISPID_GLOBAL_TESTOPTIONALARG: { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1dd6d4ed05..25a80fc89d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -952,15 +952,21 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, return invoke_vbdisp(vbdisp, id, flags, FALSE, dp, retv); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); + IDispatchEx_Release(dispex); + }else { UINT err = 0; TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); - IDispatchEx_Release(dispex); + if(hres == DISP_E_EXCEPTION) { + clear_ei(&ctx->ei); + ctx->ei = ei; + hres = SCRIPT_E_RECORDED; + } return hres; } @@ -994,5 +1000,10 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err); } + if(hres == DISP_E_EXCEPTION) { + clear_ei(&ctx->ei); + ctx->ei = ei; + hres = SCRIPT_E_RECORDED; + } return hres; }

1 0

Jacek Caban : vbscript/tests: Introduce get_dispid helper.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 9115c37b467c013326061f97aded0cbb266436ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=9115c37b467c013326061f97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:17 2019 +0100 vbscript/tests: Introduce get_dispid helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 320 ++++++++++++++++------------------------------ 1 file changed, 113 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9115c37b467c01332606…

1 0

Jacek Caban : vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: ce6c9f6d338a40c4f39b6758dae6d600823da767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6c9f6d338a40c4f39b6758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:07 2019 +0100 vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6e0dfc6938..4171df3915 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -72,7 +72,8 @@ static HRESULT WINAPI Builtin_QueryInterface(IDispatch *iface, REFIID riid, void TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + if(!IsEqualGUID(riid, &IID_IDispatchEx)) + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : vbscript: Support VT_EMPTY in stack_pop_bool.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 18117ccbab3232cf0d81219a37d52837e898ab7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=18117ccbab3232cf0d81219a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:01 2019 +0100 vbscript: Support VT_EMPTY in stack_pop_bool. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2b681a0677..ad6454aa57 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -374,6 +374,7 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) *b = V_BOOL(val.v); break; case VT_NULL: + case VT_EMPTY: *b = FALSE; break; case VT_I2: diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f7cdc92ec4..0520038a02 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -329,6 +329,14 @@ end if while false wend +if empty then + ok false, "if empty executed" +end if + +while empty + ok false, "while empty executed" +wend + x = 0 WHILE x < 3 : x = x + 1 Wend

1 0

Jacek Caban : jscript: Use _ltow_s instead of int_to_string.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: a20555ea5f29d998f39ea35c12e052cd2a1634ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20555ea5f29d998f39ea35c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:00:07 2019 +0100 jscript: Use _ltow_s instead of int_to_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 79971f7f07..bb35ed7df5 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -690,36 +690,6 @@ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) return hres; } -static jsstr_t *int_to_string(int i) -{ - WCHAR buf[12], *p; - BOOL neg = FALSE; - - if(!i) { - static const WCHAR zeroW[] = {'0',0}; - return jsstr_alloc(zeroW); - } - - if(i < 0) { - neg = TRUE; - i = -i; - } - - p = buf + ARRAY_SIZE(buf)-1; - *p-- = 0; - while(i) { - *p-- = i%10 + '0'; - i /= 10; - } - - if(neg) - *p = '-'; - else - p++; - - return jsstr_alloc(p); -} - HRESULT double_to_string(double n, jsstr_t **str) { static const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; @@ -729,7 +699,9 @@ HRESULT double_to_string(double n, jsstr_t **str) }else if(isinf(n)) { *str = jsstr_alloc(n<0 ? InfinityW : InfinityW+1); }else if(is_int32(n)) { - *str = int_to_string(n); + WCHAR buf[12]; + _ltow_s(n, buf, ARRAY_SIZE(buf), 10); + *str = jsstr_alloc(buf); }else { VARIANT strv, v; HRESULT hres;

1 0

Piotr Caban : regedit: Fix double free error in GetValueName.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: f11a740266cf5504693c8cd32e000d1a3ab77098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f11a740266cf5504693c8cd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 11:22:07 2019 +0100 regedit: Fix double free error in GetValueName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index cdcaa8e067..0132cfb8db 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -38,7 +38,6 @@ DWORD g_columnToSort = ~0U; BOOL g_invertSort = FALSE; WCHAR *g_currentPath; HKEY g_currentRootKey; -static WCHAR *g_valueName; static WCHAR g_szValueNotSet[64]; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) @@ -66,16 +65,10 @@ WCHAR *GetValueName(HWND hwndLV) { INT item; - if (g_valueName != LPSTR_TEXTCALLBACKW) - heap_free(g_valueName); - g_valueName = NULL; - item = SendMessageW(hwndLV, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); if (item == -1) return NULL; - g_valueName = GetItemText(hwndLV, item); - - return g_valueName; + return GetItemText(hwndLV, item); } BOOL update_listview_path(const WCHAR *path)

1 0

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 October 2019