winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
651 discussions
Start a n
N
ew thread
Paul Vriens : crypt32: Add documentation.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 75604e8681328e2b0203e700751d4d2aff726a19 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=75604e8681328e2b0203e70…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:19:14 2006 +0200 crypt32: Add documentation. --- dlls/crypt32/main.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 11e0efa..4c0166d 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -163,6 +163,24 @@ error_close_key: return r; } +/*********************************************************************** + * CryptSIPAddProvider (CRYPT32.@) + * + * Add a SIP provider and its functions to the registry. + * + * PARAMS + * psNewProv [I] Pointer to a structure with information about + * the functions this SIP provider can perform. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. (Look at GetLastError()). + * + * NOTES + * Registry errors are always reported via SetLastError(). If a + * registry error occurs the rest of the registry write operations + * will be skipped. + */ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) { static const WCHAR szCreate[] = {
1
0
0
0
Paul Vriens : crypt32: Change the order of writing to the registry.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 3891011e504dad59af9fa3855b712345d80f1aad URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=3891011e504dad59af9fa38…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:19:03 2006 +0200 crypt32: Change the order of writing to the registry. --- dlls/crypt32/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 6f26943..11e0efa 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -205,11 +205,11 @@ #define CRYPT_SIPADDPROV( key, field ) \ CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ psNewProv->pwszDLLFileName, psNewProv->field) - CRYPT_SIPADDPROV( szGetSigned, pwszGetFuncName ); CRYPT_SIPADDPROV( szPutSigned, pwszPutFuncName ); + CRYPT_SIPADDPROV( szGetSigned, pwszGetFuncName ); + CRYPT_SIPADDPROV( szRemoveSigned, pwszRemoveFuncName ); CRYPT_SIPADDPROV( szCreate, pwszCreateFuncName ); CRYPT_SIPADDPROV( szVerify, pwszVerifyFuncName ); - CRYPT_SIPADDPROV( szRemoveSigned, pwszRemoveFuncName ); CRYPT_SIPADDPROV( szIsMyFile, pwszIsFunctionNameFmt2 ); #undef CRYPT_SIPADDPROV
1
0
0
0
Paul Vriens : crypt32: Bail out on registry errors and return the error ( if any).
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 360954e46aac3d531848a2e67c791b965472c5cf URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=360954e46aac3d531848a2e…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:18:55 2006 +0200 crypt32: Bail out on registry errors and return the error (if any). --- dlls/crypt32/main.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 86b9cf4..6f26943 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -131,7 +131,7 @@ static LONG CRYPT_SIPWriteFunction( LPGU static const WCHAR szDllName[] = { 'D','l','l',0 }; static const WCHAR szFuncName[] = { 'F','u','n','c','N','a','m','e',0 }; WCHAR szFullKey[ 0x100 ]; - LONG r; + LONG r = ERROR_SUCCESS; HKEY hKey; if( !szFunction ) @@ -147,18 +147,20 @@ static LONG CRYPT_SIPWriteFunction( LPGU TRACE("key is %s\n", debugstr_w( szFullKey ) ); r = RegCreateKeyW( HKEY_LOCAL_MACHINE, szFullKey, &hKey ); - if( r != ERROR_SUCCESS ) - return r; + if( r != ERROR_SUCCESS ) goto error_close_key; /* write the values */ - RegSetValueExW( hKey, szFuncName, 0, REG_SZ, (const BYTE*) szFunction, - ( lstrlenW( szFunction ) + 1 ) * sizeof (WCHAR) ); - RegSetValueExW( hKey, szDllName, 0, REG_SZ, (const BYTE*) szDll, - ( lstrlenW( szDll ) + 1) * sizeof (WCHAR) ); + r = RegSetValueExW( hKey, szFuncName, 0, REG_SZ, (const BYTE*) szFunction, + ( lstrlenW( szFunction ) + 1 ) * sizeof (WCHAR) ); + if( r != ERROR_SUCCESS ) goto error_close_key; + r = RegSetValueExW( hKey, szDllName, 0, REG_SZ, (const BYTE*) szDll, + ( lstrlenW( szDll ) + 1) * sizeof (WCHAR) ); + +error_close_key: RegCloseKey( hKey ); - return ERROR_SUCCESS; + return r; } BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv)
1
0
0
0
Paul Vriens : crypt32: Added some input validation.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 8840ef3327f3bdb56bc5a1804095fda2fe6848ac URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=8840ef3327f3bdb56bc5a18…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:18:46 2006 +0200 crypt32: Added some input validation. --- dlls/crypt32/main.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 28f63c8..86b9cf4 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -181,8 +181,17 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ TRACE("%p\n", psNewProv); - if( !psNewProv ) + if (!psNewProv || + psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + !psNewProv->pwszGetFuncName || + !psNewProv->pwszPutFuncName || + !psNewProv->pwszCreateFuncName || + !psNewProv->pwszVerifyFuncName || + !psNewProv->pwszRemoveFuncName) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + } TRACE("%s %s %s %s\n", debugstr_guid( psNewProv->pgSubject ),
1
0
0
0
Konstantin Petrov : svrapi: Added a stub svrapi.dll.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: bb49763154a3f280a04be4a494e22ae68ee6709c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=bb49763154a3f280a04be4a…
Author: Konstantin Petrov <argentum(a)office.etersoft.ru> Date: Mon Sep 4 20:46:34 2006 +0400 svrapi: Added a stub svrapi.dll. --- configure | 3 ++- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/svrapi/Makefile.in | 13 ++++++++++++ dlls/svrapi/svrapi.spec | 20 ++++++++++++++++++ dlls/svrapi/svrapi_main.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/lmcons.h | 27 +++++++++++++----------- include/svrapi.h | 46 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 148 insertions(+), 14 deletions(-) create mode 100644 dlls/svrapi/Makefile.in create mode 100644 dlls/svrapi/svrapi.spec create mode 100644 dlls/svrapi/svrapi_main.c create mode 100644 include/svrapi.h Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bb49763154a3f280a04…
1
0
0
0
Detlef Riekenberg : winspool: Manage loaded monitors in a list.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: ec1c7cc0d347cf30824d4baa95036180333054ee URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=ec1c7cc0d347cf30824d4ba…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 2 22:55:25 2006 +0200 winspool: Manage loaded monitors in a list. --- dlls/winspool.drv/info.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c55a1d0..45f7054 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -66,6 +66,18 @@ #include "wspool.h" WINE_DEFAULT_DEBUG_CHANNEL(winspool); +/* ############################### */ + +static CRITICAL_SECTION monitor_handles_cs; +static CRITICAL_SECTION_DEBUG monitor_handles_cs_debug = +{ + 0, 0, &monitor_handles_cs, + { &monitor_handles_cs_debug.ProcessLocksList, &monitor_handles_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": monitor_handles_cs") } +}; +static CRITICAL_SECTION monitor_handles_cs = { &monitor_handles_cs_debug, -1, 0, 0, 0, 0 }; + + static CRITICAL_SECTION printer_handles_cs; static CRITICAL_SECTION_DEBUG printer_handles_cs_debug = { @@ -78,6 +90,7 @@ static CRITICAL_SECTION printer_handles_ /* ############################### */ typedef struct { + struct list entry; LPWSTR name; LPWSTR dllname; PMONITORUI monitorUI; @@ -121,6 +134,8 @@ typedef struct { /* ############################### */ +static struct list monitor_handles = LIST_INIT( monitor_handles ); + static opened_printer_t **printer_handles; static int nb_printer_handles; static LONG next_job_id = 1; @@ -833,10 +848,18 @@ static void monitor_unload(monitor_t * p { TRACE("%p (refcount: %ld) %s\n", pm, pm->refcount, debugstr_w(pm->name)); - FreeLibrary(pm->hdll); - HeapFree(GetProcessHeap(), 0, pm->name); - HeapFree(GetProcessHeap(), 0, pm->dllname); - HeapFree(GetProcessHeap(), 0, pm); + EnterCriticalSection(&monitor_handles_cs); + + if (pm->refcount) pm->refcount--; + + if (pm->refcount == 0) { + list_remove(&pm->entry); + FreeLibrary(pm->hdll); + HeapFree(GetProcessHeap(), 0, pm->name); + HeapFree(GetProcessHeap(), 0, pm->dllname); + HeapFree(GetProcessHeap(), 0, pm); + } + LeaveCriticalSection(&monitor_handles_cs); } /****************************************************************** @@ -857,15 +880,28 @@ static monitor_t * monitor_load(LPWSTR n DWORD (WINAPI *pInitializeMonitor) (LPWSTR); monitor_t * pm = NULL; + monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(cursor, &monitor_handles, monitor_t, entry) + { + if (lstrcmpW(name, cursor->name) == 0) { + pm = cursor; + break; + } + } + if (pm == NULL) { pm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(monitor_t)); if (pm == NULL) goto cleanup; + list_add_tail(&monitor_handles, &pm->entry); + } + pm->refcount++; if (pm->name == NULL) { /* Load the monitor */ @@ -961,6 +997,7 @@ static monitor_t * monitor_load(LPWSTR n } } cleanup: + LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) HeapFree(GetProcessHeap(), 0, driver); HeapFree(GetProcessHeap(), 0, regroot); TRACE("=> %p\n", pm);
1
0
0
0
Detlef Riekenberg : winspool: Minimal load/unload printmonitors; use it to get a test working.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 1e177382a34a71add1934c7ed7aa50325cfc276e URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=1e177382a34a71add1934c7…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 2 22:50:32 2006 +0200 winspool: Minimal load/unload printmonitors; use it to get a test working. --- dlls/winspool.drv/info.c | 164 +++++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/tests/info.c | 2 2 files changed, 161 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d00192c..c55a1d0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -61,6 +61,7 @@ #include "wine/list.h" #include "heap.h" #include "winnls.h" +#include "ddk/winsplp.h" #include "wspool.h" WINE_DEFAULT_DEBUG_CHANNEL(winspool); @@ -74,6 +75,18 @@ static CRITICAL_SECTION_DEBUG printer_ha }; static CRITICAL_SECTION printer_handles_cs = { &printer_handles_cs_debug, -1, 0, 0, 0, 0 }; +/* ############################### */ + +typedef struct { + LPWSTR name; + LPWSTR dllname; + PMONITORUI monitorUI; + LPMONITOR monitor; + HMODULE hdll; + DWORD refcount; + DWORD dwMonitorSize; +} monitor_t; + typedef struct { DWORD job_id; HANDLE hf; @@ -811,6 +824,150 @@ static DWORD get_local_monitors(DWORD le } /****************************************************************** + * monitor_unload [internal] + * + * release a printmonitor and unload it from memory, when needed + * + */ +static void monitor_unload(monitor_t * pm) +{ + TRACE("%p (refcount: %ld) %s\n", pm, pm->refcount, debugstr_w(pm->name)); + + FreeLibrary(pm->hdll); + HeapFree(GetProcessHeap(), 0, pm->name); + HeapFree(GetProcessHeap(), 0, pm->dllname); + HeapFree(GetProcessHeap(), 0, pm); +} + +/****************************************************************** + * monitor_load [internal] + * + * load a printmonitor, get the dllname from the registry, when needed + * initialize the monitor and dump found function-pointers + * + * On failure, SetLastError() is called and NULL is returned + */ + +static monitor_t * monitor_load(LPWSTR name, LPWSTR dllname) +{ + LPMONITOR2 (WINAPI *pInitializePrintMonitor2) (PMONITORINIT, LPHANDLE); + PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID); + LPMONITOREX (WINAPI *pInitializePrintMonitor) (LPWSTR); + DWORD (WINAPI *pInitializeMonitorEx)(LPWSTR, LPMONITOR); + DWORD (WINAPI *pInitializeMonitor) (LPWSTR); + + monitor_t * pm = NULL; + LPWSTR regroot = NULL; + LPWSTR driver = dllname; + + TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); + /* Is the Monitor already loaded? */ + + + pm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(monitor_t)); + if (pm == NULL) goto cleanup; + + if (pm->name == NULL) { + /* Load the monitor */ + LPMONITOREX pmonitorEx; + DWORD len; + + len = lstrlenW(MonitorsW) + lstrlenW(name) + 2; + regroot = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (regroot) { + lstrcpyW(regroot, MonitorsW); + lstrcatW(regroot, name); + /* Get the Driver from the Registry */ + } + + pm->name = strdupW(name); + pm->dllname = strdupW(driver); + + if (!regroot || !pm->name || !pm->dllname) { + monitor_unload(pm); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + pm = NULL; + goto cleanup; + } + + pm->hdll = LoadLibraryW(driver); + TRACE("%p: LoadLibrary(%s) => %ld\n", pm->hdll, debugstr_w(driver), GetLastError()); + + if (pm->hdll == NULL) { + monitor_unload(pm); + SetLastError(ERROR_MOD_NOT_FOUND); + pm = NULL; + goto cleanup; + } + + pInitializePrintMonitor2 = (void *)GetProcAddress(pm->hdll, "InitializePrintMonitor2"); + pInitializePrintMonitorUI = (void *)GetProcAddress(pm->hdll, "InitializePrintMonitorUI"); + pInitializePrintMonitor = (void *)GetProcAddress(pm->hdll, "InitializePrintMonitor"); + pInitializeMonitorEx = (void *)GetProcAddress(pm->hdll, "InitializeMonitorEx"); + pInitializeMonitor = (void *)GetProcAddress(pm->hdll, "InitializeMonitor"); + + + TRACE("%p: %s,pInitializePrintMonitor2\n", pInitializePrintMonitor2, debugstr_w(driver)); + TRACE("%p: %s,pInitializePrintMonitorUI\n", pInitializePrintMonitorUI, debugstr_w(driver)); + TRACE("%p: %s,pInitializePrintMonitor\n", pInitializePrintMonitor, debugstr_w(driver)); + TRACE("%p: %s,pInitializeMonitorEx\n", pInitializeMonitorEx, debugstr_w(driver)); + TRACE("%p: %s,pInitializeMonitor\n", pInitializeMonitor, debugstr_w(driver)); + + if (pInitializePrintMonitorUI != NULL) { + pm->monitorUI = pInitializePrintMonitorUI(); + TRACE("%p: MONITORUI from %s,InitializePrintMonitorUI()\n", pm->monitorUI, debugstr_w(driver)); + if (pm->monitorUI) { + TRACE( "0x%08lx: dwMonitorSize (%ld) => %ld Functions\n", + pm->monitorUI->dwMonitorUISize, pm->monitorUI->dwMonitorUISize, + (pm->monitorUI->dwMonitorUISize - sizeof(DWORD) ) / sizeof(VOID *)); + + } + } + + if (pInitializePrintMonitor != NULL) { + pmonitorEx = pInitializePrintMonitor(regroot); + TRACE( "%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", + pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); + + if (pmonitorEx) { + pm->dwMonitorSize = pmonitorEx->dwMonitorSize; + pm->monitor = &(pmonitorEx->Monitor); + } + } + + if (pm->monitor) { + TRACE( "0x%08lx: dwMonitorSize (%ld) => %ld Functions\n", + pm->dwMonitorSize, pm->dwMonitorSize, + (pm->dwMonitorSize) / sizeof(VOID *) ); + + } + + if (!pm->monitor) { + if (pInitializePrintMonitor2 != NULL) { + FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); + } + if (pInitializeMonitorEx != NULL) { + FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); + } + if (pInitializeMonitor != NULL) { + FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); + } + } + if (!pm->monitor && !pm->monitorUI) { + monitor_unload(pm); + SetLastError(ERROR_PROC_NOT_FOUND); + pm = NULL; + } + } +cleanup: + if (driver != dllname) HeapFree(GetProcessHeap(), 0, driver); + HeapFree(GetProcessHeap(), 0, regroot); + TRACE("=> %p\n", pm); + return pm; +} + +/****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table * @@ -1448,10 +1605,10 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWO */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { + monitor_t * pm = NULL; LPMONITOR_INFO_2W mi2w; HKEY hroot = NULL; HKEY hentry = NULL; - HMODULE hdll = NULL; DWORD disposition; BOOL res = FALSE; @@ -1496,10 +1653,11 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW return FALSE; } - if ((hdll = LoadLibraryW(mi2w->pDLLName)) == NULL) { + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { return FALSE; } - FreeLibrary(hdll); + monitor_unload(pm); if(RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(MonitorsW)); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 495b06e..3d6ae78 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -284,14 +284,12 @@ #endif SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); /* NT: ERROR_PROC_NOT_FOUND, 9x: ERROR_INVALID_PARAMETER */ - todo_wine { ok( !res && ((GetLastError() == ERROR_PROC_NOT_FOUND) || (GetLastError() == ERROR_INVALID_PARAMETER)), "returned %ld with %ld (expected '0' with: ERROR_PROC_NOT_FOUND or " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeleteMonitorA(NULL, entry->env, winetest_monitor); - } /* Test AddMonitor with real options */ mi2a.pDLLName = entry->dllname;
1
0
0
0
Jesse Allen : user: ChangeDisplaySettings virtual desktop mode handling fix .
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: bf69af26be8752c4058ac27463972248496c96db URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=bf69af26be8752c4058ac27…
Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Sat Sep 2 10:02:42 2006 -0700 user: ChangeDisplaySettings virtual desktop mode handling fix. --- dlls/user/sysparams.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 8bb2114..9e476d5 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2964,6 +2964,9 @@ LONG WINAPI ChangeDisplaySettingsExA( LP LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { + /* make sure the desktop window is created before mode changing */ + GetDesktopWindow(); + return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam ); }
1
0
0
0
Alexandre Julliard : wine.inf: Register msiexec.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: 0980561d5dc0f85046cc7372bc5bdc446310afe0 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=0980561d5dc0f85046cc737…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 13:41:02 2006 +0200 wine.inf: Register msiexec. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 24bf5c4..9a73af5 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2112,6 +2112,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,mlang.dll,1 11,,mshtml.dll,1 11,,msi.dll,1 +11,,msiexec.exe,1 11,,msxml3.dll,1 11,,ole32.dll,1 11,,oleaut32.dll,1
1
0
0
0
Benjamin Arai : oleaut32: Conformance test for function variant:VarPow.
by Alexandre Julliard
08 Sep '06
08 Sep '06
Module: wine Branch: master Commit: aee8a62136f51b1784f271cb0aaecfc9fa806f6f URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=aee8a62136f51b1784f271c…
Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Sep 7 19:04:56 2006 -0700 oleaut32: Conformance test for function variant:VarPow. --- dlls/oleaut32/tests/vartest.c | 458 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 458 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aee8a62136f51b1784f…
1
0
0
0
← Newer
1
...
46
47
48
49
50
51
52
...
66
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Results per page:
10
25
50
100
200