August 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : winmm: Free device format when closing a device (Valgrind) .
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 57612cdefce0a779a8db1f869b2cd8c9df575c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57612cdefce0a779a8db1f869… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 12:43:03 2016 +0300 winmm: Free device format when closing a device (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1915c21..7308519 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1418,6 +1418,8 @@ static HRESULT WINMM_CloseDevice(WINMM_Device *device) IAudioClock_Release(device->clock); device->clock = NULL; + HeapFree(GetProcessHeap(), 0, device->orig_fmt); + return S_OK; }

1 0

Daniel Lehman : msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 57c60d9c431c65d6a1b4c3a5b04b7f58fa011231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c60d9c431c65d6a1b4c3a5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 15:28:49 2016 -0700 msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 2a3e5a9..22c302e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3621,17 +3621,17 @@ @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod @ stub _Close_dir -@ cdecl _Cnd_broadcast(ptr) msvcp110._Cnd_broadcast -@ cdecl _Cnd_destroy(ptr) msvcp110._Cnd_destroy +@ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast +@ cdecl _Cnd_destroy(ptr) _Cnd_destroy @ stub _Cnd_destroy_in_situ @ stub _Cnd_do_broadcast_at_thread_exit -@ cdecl _Cnd_init(ptr) msvcp110._Cnd_init +@ cdecl _Cnd_init(ptr) _Cnd_init @ stub _Cnd_init_in_situ @ stub _Cnd_register_at_thread_exit -@ cdecl _Cnd_signal(ptr) msvcp110._Cnd_signal -@ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp110._Cnd_timedwait +@ cdecl _Cnd_signal(ptr) _Cnd_signal +@ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait @ stub _Cnd_unregister_at_thread_exit -@ cdecl _Cnd_wait(ptr ptr) msvcp110._Cnd_wait +@ cdecl _Cnd_wait(ptr ptr) _Cnd_wait @ stub _Copy_file @ stub _Cosh @ stub _Current_get @@ -3673,7 +3673,7 @@ @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @ stub _Mtx_clear_owner -@ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) _Mtx_current_owns @ cdecl _Mtx_destroy(ptr) _Mtx_destroy @ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs

1 0

Nikolay Sivov : msvcp140: Added __crtGetTickCount64().
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 7e485ea87b5b5d7cbb3704a2a0ec707eb52bcd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e485ea87b5b5d7cbb3704a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 12:22:16 2016 +0300 msvcp140: Added __crtGetTickCount64(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f4fdc8a..588551b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3768,7 +3768,7 @@ @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx @ stub __crtGetSystemTimePreciseAsFileTime -@ stub __crtGetTickCount64 +@ cdecl -ret64 __crtGetTickCount64() MSVCP__crtGetTickCount64 @ stub __crtInitOnceExecuteOnce @ cdecl __crtInitializeCriticalSectionEx(ptr long long) MSVCP__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 71a664e..758e449 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1132,6 +1132,14 @@ HANDLE CDECL MSVCP__crtCreateEventExW( return CreateEventExW(attribs, name, flags, access); } +/********************************************************************* + * __crtGetTickCount64 (MSVCP140.@) + */ +ULONGLONG CDECL MSVCP__crtGetTickCount64(void) +{ + return GetTickCount64(); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Nikolay Sivov : msvcp140: Added __crtCreateEventExW().
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 1b8eb25ff293660b46a10b431256d745aa9e710a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8eb25ff293660b46a10b431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 12:22:15 2016 +0300 msvcp140: Added __crtCreateEventExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index fedb05f..f4fdc8a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3757,7 +3757,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW -@ stub __crtCreateEventExW +@ cdecl __crtCreateEventExW(ptr wstr long long) MSVCP__crtCreateEventExW @ stub __crtCreateSemaphoreExW @ stub __crtCreateSymbolicLinkW @ stub __crtCreateThreadpoolTimer diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 322e937..71a664e 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1122,6 +1122,16 @@ BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +/********************************************************************* + * __crtCreateEventExW (MSVCP140.@) + */ +HANDLE CDECL MSVCP__crtCreateEventExW( + SECURITY_ATTRIBUTES *attribs, LPCWSTR name, DWORD flags, DWORD access) +{ + TRACE("(%p %s 0x%08x 0x%08x)\n", attribs, debugstr_w(name), flags, access); + return CreateEventExW(attribs, name, flags, access); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Sebastian Lackner : vcomp100: Prefer builtin version.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: f21b58318acbf86a1b2aeb7910b266abdddf2419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21b58318acbf86a1b2aeb791… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:41 2016 +0200 vcomp100: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp100/Makefile.in | 3 --- dlls/vcomp100/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index f7a7f96..57cefac 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp100.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp100/main.c b/dlls/vcomp100/main.c deleted file mode 100644 index 7ba18d1..0000000 --- a/dlls/vcomp100/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp100 implementation - * - * Copyright 2012 André Hentschel - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp100); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Nikolay Sivov : oledb32: Support quoted values in initialisation strings.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 85c6afe4cec71a26dbfce7c6ac8d66205a2deb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c6afe4cec71a26dbfce7c6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 10:36:22 2016 +0300 oledb32: Support quoted values in initialisation strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 24 ++++++++++++++++++++---- dlls/oledb32/tests/database.c | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 1ba0cb1..42d5dae 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -401,17 +401,33 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; - WCHAR *scol = strchrW(eq+1, ';'); BSTR value, name; + WCHAR *delim; name = SysAllocStringLen(start, eq - start); /* skip equal sign to get value */ eq++; - value = SysAllocStringLen(eq, scol ? scol - eq : -1); + + if (*eq == '"') + { + /* for quoted value string, skip opening mark, look for terminating one */ + eq++; + delim = strchrW(eq, '"'); + } + else + delim = strchrW(eq, ';'); + + value = SysAllocStringLen(eq, delim ? delim - eq : -1); /* skip semicolon if present */ - if (scol) scol++; - start = scol; + if (delim) + { + if (*delim == '"') + delim++; + if (*delim == ';') + delim++; + } + start = delim; if (!strcmpiW(name, providerW)) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 442e57e..217fb4a 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -292,6 +292,9 @@ static void test_database(void) static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; + static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', + 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', + ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -308,6 +311,7 @@ static void test_database(void) test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); + test_GetDataSource2(extended_prop); } static void test_errorinfo(void)

1 0

Aric Stewart : winedevice: Remove static driver_obj variable.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 92ce6e6bab595c710c465792083f92e4bea3ff67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ce6e6bab595c710c4657920… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 8 15:35:49 2016 +0200 winedevice: Remove static driver_obj variable. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e31318c..771a0c1 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -42,7 +42,6 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -static DRIVER_OBJECT *driver_obj; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) @@ -225,7 +224,6 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING if (!module) return STATUS_DLL_INIT_FAILED; - driver_obj = driver_object; driver_object->DriverSection = find_ldr_module( module ); nt = RtlImageNtHeader( module ); @@ -272,9 +270,10 @@ static void unload_driver( DRIVER_OBJECT *driver_obj ) FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); + ObDereferenceObject( driver_obj ); } -static NTSTATUS create_driver(const WCHAR *driver_name) +static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_obj) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; UNICODE_STRING drv_name; @@ -288,6 +287,16 @@ static NTSTATUS create_driver(const WCHAR *driver_name) status = IoCreateDriver( &drv_name, init_driver ); + if (status == STATUS_SUCCESS) + { + status = ObReferenceObjectByName( &drv_name, OBJ_CASE_INSENSITIVE, NULL, + 0, NULL, KernelMode, NULL, (void **)driver_obj ); + if (status != STATUS_SUCCESS) + { + ERR("Failed to locate loaded driver (%s)\n", wine_dbgstr_w(driver_name)); + } + } + RtlFreeUnicodeString( &drv_name ); return status; } @@ -326,6 +335,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; const WCHAR *driver_name = argv[0]; + DRIVER_OBJECT *driver_obj; WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); @@ -344,7 +354,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) status.dwWaitHint = 10000; SetServiceStatus( service_handle, &status ); - if (create_driver( driver_name ) == STATUS_SUCCESS) + if (create_driver( driver_name, &driver_obj ) == STATUS_SUCCESS) { status.dwCurrentState = SERVICE_RUNNING; status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;

1 0

Aric Stewart : include: Add declaration for ObReferenceObjectByName.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: c75751ed54e3aeb5f986e417749bf74f71314a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75751ed54e3aeb5f986e4177… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 8 15:34:53 2016 +0200 include: Add declaration for ObReferenceObjectByName. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6ad4bb3..242eb70 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1252,6 +1252,7 @@ void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); +NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID);

1 0

Hugh McMaster : wineconsole: Replace hard-coded WCUSER_ColorMap with registry color_map.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: b1e6d4c1751fe0a69be87ba2cf9c167b3b1d7ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e6d4c1751fe0a69be87ba2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:08:39 2016 +0000 wineconsole: Replace hard-coded WCUSER_ColorMap with registry color_map. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/dialog.c | 25 ++++++++++++++++++------- programs/wineconsole/user.c | 15 +++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 04edfd1..9a14184 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -147,6 +147,14 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L return TRUE; } +static COLORREF get_color(struct dialog_info *di, unsigned int idc) +{ + LONG_PTR index; + + index = GetWindowLongPtrW(GetDlgItem(di->hDlg, idc), 0); + return di->config.color_map[index]; +} + /****************************************************************** * WCUSER_FontPreviewProc * @@ -196,10 +204,10 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, int len; hOldFont = SelectObject(ps.hdc, hFont); - bkcolor = WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]; + bkcolor = get_color(di, IDC_FNT_COLOR_BK); FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); SetBkColor(ps.hdc, bkcolor); - SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]); + SetTextColor(ps.hdc, get_color(di, IDC_FNT_COLOR_FG)); len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, sizeof(buf) / sizeof(buf[0])); if (len) @@ -228,22 +236,25 @@ static LRESULT WINAPI WCUSER_ColorPreviewProc(HWND hWnd, UINT msg, WPARAM wParam { case WM_PAINT: { - PAINTSTRUCT ps; - int i, step; - RECT client, r; - HBRUSH hbr; + PAINTSTRUCT ps; + int i, step; + RECT client, r; + struct dialog_info *di; + HBRUSH hbr; BeginPaint(hWnd, &ps); GetClientRect(hWnd, &client); step = client.right / 8; + di = (struct dialog_info *)GetWindowLongPtrW(GetParent(hWnd), DWLP_USER); + for (i = 0; i < 16; i++) { r.top = (i / 8) * (client.bottom / 2); r.bottom = r.top + client.bottom / 2; r.left = (i & 7) * step; r.right = r.left + step; - hbr = CreateSolidBrush(WCUSER_ColorMap[i]); + hbr = CreateSolidBrush(di->config.color_map[i]); FillRect(ps.hdc, &r, hbr); DeleteObject(hbr); if (GetWindowLongW(hWnd, 0) == i) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 40a0757..eb68373 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -30,15 +30,6 @@ WINE_DECLARE_DEBUG_CHANNEL(wc_font); UINT g_uiDefaultCharset; -/* mapping console colors to RGB values */ -const COLORREF WCUSER_ColorMap[16] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), - RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), - RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), -}; - static BOOL WCUSER_SetFont(struct inner_data* data, const LOGFONTW* font); /****************************************************************** @@ -76,8 +67,8 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ for (i = 0; i < data->curcfg.sb_width; i++) { attr = cell[i].Attributes; - SetBkColor(PRIVATE(data)->hMemDC, WCUSER_ColorMap[(attr>>4)&0x0F]); - SetTextColor(PRIVATE(data)->hMemDC, WCUSER_ColorMap[attr&0x0F]); + SetBkColor(PRIVATE(data)->hMemDC, data->curcfg.color_map[(attr >> 4) & 0x0F]); + SetTextColor(PRIVATE(data)->hMemDC, data->curcfg.color_map[attr & 0x0F]); for (k = i; k < data->curcfg.sb_width && cell[k].Attributes == attr; k++) { line[k - i] = cell[k].Char.UnicodeChar; @@ -86,7 +77,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ ExtTextOutW( PRIVATE(data)->hMemDC, i * data->curcfg.cell_width, j * data->curcfg.cell_height, 0, NULL, line, k - i, dx ); if (PRIVATE(data)->ext_leading && - (hbr = CreateSolidBrush(WCUSER_ColorMap[(attr>>4)&0x0F]))) + (hbr = CreateSolidBrush(data->curcfg.color_map[(attr >> 4) & 0x0F]))) { r.left = i * data->curcfg.cell_width; r.top = (j + 1) * data->curcfg.cell_height - PRIVATE(data)->ext_leading;

1 0

Hugh McMaster : wineconsole: Add 'ColorTable' support to the registry.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 1602eff3b8c5f4d3550ee8628d48ff6632c7e343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1602eff3b8c5f4d3550ee8628… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:08:29 2016 +0000 wineconsole: Add 'ColorTable' support to the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 46 ++++++++++++++++++++++++++++++---- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/wineconsole.c | 1 + 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index c1d04c1..f5fa433 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -26,10 +26,12 @@ #include "winreg.h" #include "winecon_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wineconsole); +static const WCHAR wszColorTable[] = {'C','o','l','o','r','T','a','b','l','e',0}; static const WCHAR wszConsole[] = {'C','o','n','s','o','l','e',0}; static const WCHAR wszCursorSize[] = {'C','u','r','s','o','r','S','i','z','e',0}; static const WCHAR wszCursorVisible[] = {'C','u','r','s','o','r','V','i','s','i','b','l','e',0}; @@ -47,6 +49,10 @@ static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f' static const WCHAR wszScreenColors[] = {'S','c','r','e','e','n','C','o','l','o','r','s',0}; static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z','e',0}; +static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; + +#define NUM_COLORS 16 + void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", @@ -84,9 +90,17 @@ static LPWSTR WINECON_CreateKeyName(LPCWSTR kn) */ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) { - DWORD type; - DWORD count; - DWORD val; + int i; + DWORD type, count, val; + WCHAR color_name[13]; + + for (i = 0; i < NUM_COLORS; i++) + { + sprintfW(color_name, color_name_fmt, wszColorTable, i); + count = sizeof(val); + if (!RegQueryValueExW(hConKey, color_name, 0, &type, (LPBYTE)&val, &count)) + cfg->color_map[i] = val; + } count = sizeof(val); if (!RegQueryValueExW(hConKey, wszCursorSize, 0, &type, (LPBYTE)&val, &count)) @@ -166,11 +180,24 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) */ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) { - HKEY hConKey; + static const COLORREF color_map[NUM_COLORS] = + { + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), + RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), + RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), + }; + + int i; + HKEY hConKey; WINE_TRACE("loading %s registry settings.\n", appname ? wine_dbgstr_w(appname) : "default"); /* first set default values */ + for (i = 0; i < NUM_COLORS; i++) + { + cfg->color_map[i] = color_map[i]; + } cfg->cursor_size = 25; cfg->cursor_visible = 1; cfg->exit_on_die = 1; @@ -221,10 +248,19 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) */ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) { - DWORD val; + int i; + DWORD val; + WCHAR color_name[13]; WINECON_DumpConfig("save", cfg); + for (i = 0; i < NUM_COLORS; i++) + { + sprintfW(color_name, color_name_fmt, wszColorTable, i); + val = cfg->color_map[i]; + RegSetValueExW(hConKey, color_name, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + } + val = cfg->cursor_size; RegSetValueExW(hConKey, wszCursorSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 5608f99..7236879 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -27,6 +27,7 @@ /* this is the configuration stored & loaded into the registry */ struct config_data { + DWORD color_map[16]; /* console color table */ unsigned cell_width; /* width in pixels of a character */ unsigned cell_height; /* height in pixels of a character */ int cursor_size; /* in % of cell height */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index f9027a4..e5e2823 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -703,6 +703,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* fall through */ case init_success: WINECON_GetServerConfig(data); + memcpy(data->curcfg.color_map, cfg.color_map, sizeof(data->curcfg.color_map)); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n");

1 0