wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Sebastian Lackner : vcomp90: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0c824225ad19b1647959dafefc4515440d3cce04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c824225ad19b1647959dafef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:56 2016 +0200 vcomp90: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp90/Makefile.in | 3 --- dlls/vcomp90/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp90/Makefile.in b/dlls/vcomp90/Makefile.in index 457e452..b19e53d 100644 --- a/dlls/vcomp90/Makefile.in +++ b/dlls/vcomp90/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp90.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp90/main.c b/dlls/vcomp90/main.c deleted file mode 100644 index 55b5cf8..0000000 --- a/dlls/vcomp90/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp90 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(vcomp90); - -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

Sebastian Lackner : vcomp100: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

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

Sebastian Lackner : vcomp110: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 389ddf3bc1036df9f3ac2b32d82b348b517f0721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389ddf3bc1036df9f3ac2b32d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:26 2016 +0200 vcomp110: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp110/Makefile.in | 3 --- dlls/vcomp110/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in index b33bbaa..755de4f 100644 --- a/dlls/vcomp110/Makefile.in +++ b/dlls/vcomp110/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp110.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp110/main.c b/dlls/vcomp110/main.c deleted file mode 100644 index 6771c12..0000000 --- a/dlls/vcomp110/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp110 implementation - * - * Copyright 2015 Austin English - * - * 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(vcomp110); - -BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) -{ - TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(dll); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : vcomp120: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: a62bd2039043df1cd9fb15ea3f41c523f025c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62bd2039043df1cd9fb15ea3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:11 2016 +0200 vcomp120: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp120/Makefile.in | 3 --- dlls/vcomp120/main.c | 47 ----------------------------------------------- 2 files changed, 50 deletions(-) diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index 833cd67..e3a2c8d 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp120.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp120/main.c b/dlls/vcomp120/main.c deleted file mode 100644 index f2f8b31..0000000 --- a/dlls/vcomp120/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * - * vcomp120 implementation - * - * Copyright 2012 André Hentschel - * Copyright 2015 Daniel Lehman - * - * 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(vcomp120); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : vcomp: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: de1ba602eff0a83a2b51ade0deafded0c73d5e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1ba602eff0a83a2b51ade0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:31:53 2016 +0200 vcomp: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8612c9f..61f84be 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1427,9 +1427,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: { SYSTEM_INFO sysinfo;

1 0

Nikolay Sivov : oledb32: Support quoted values in initialisation strings.
by Alexandre Julliard 09 Aug '16

09 Aug '16

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 09 Aug '16

09 Aug '16

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

Alexander Morozov : ntoskrnl.exe: Add stub for ObDereferenceObject.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 2898df50e64ec73be954cba0c0b06d35af01de6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2898df50e64ec73be954cba0c… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 8 15:35:18 2016 +0200 ntoskrnl.exe: Add stub for ObDereferenceObject. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d812692..d9ebc40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2141,6 +2141,15 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, /*********************************************************************** + * ObDereferenceObject (NTOSKRNL.EXE.@) + */ +void WINAPI ObDereferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + +/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT @@ -2164,7 +2173,7 @@ void WINAPI __regs_ObfDereferenceObject( void *obj ) void WINAPI ObfDereferenceObject( void *obj ) #endif { - FIXME( "(%p): stub\n", obj ); + ObDereferenceObject( obj ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40fff1b..fd820a7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -798,7 +798,7 @@ @ stub ObCloseHandle @ stub ObCreateObject @ stub ObCreateObjectType -@ stub ObDereferenceObject +@ stdcall ObDereferenceObject(ptr) @ stub ObDereferenceSecurityDescriptor @ stub ObFindHandleForObject @ stub ObGetObjectSecurity diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 242eb70..5eda82d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1251,6 +1251,7 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +void WINAPI ObDereferenceObject(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**);

1 0

Aric Stewart : include: Add declaration for ObReferenceObjectByName.
by Alexandre Julliard 09 Aug '16

09 Aug '16

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 09 Aug '16

09 Aug '16

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

← Newer
1
...
53
54
55
56
57
58
59
...
78
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 August 2016