September 2006 - Wine-commits

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: 4388bdac70debcf600e52c70abdd3de6274759c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4388bdac70debcf600e52c7… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 13:19:26 2006 +0200 crypt32: Bail out on registry errors and return the error (if any). --- dlls/crypt32/main.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 4c0166d..3c9c050 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -198,6 +198,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ static const WCHAR szVerify[] = { 'V','e','r','i','f','y', 'I','n','d','i','r','e','c','t','D','a','t','a',0}; + LONG r = ERROR_SUCCESS; TRACE("%p\n", psNewProv); @@ -220,8 +221,9 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ debugstr_w( psNewProv->pwszIsFunctionName ) ); #define CRYPT_SIPADDPROV( key, field ) \ - CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ - psNewProv->pwszDLLFileName, psNewProv->field) + r = CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ + psNewProv->pwszDLLFileName, psNewProv->field); \ + if (r != ERROR_SUCCESS) goto end_function CRYPT_SIPADDPROV( szPutSigned, pwszPutFuncName ); CRYPT_SIPADDPROV( szGetSigned, pwszGetFuncName ); @@ -232,6 +234,14 @@ #define CRYPT_SIPADDPROV( key, field ) \ #undef CRYPT_SIPADDPROV +end_function: + + if (r != ERROR_SUCCESS) + { + SetLastError(r); + return FALSE; + } + return TRUE; }

1 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

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

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

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

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

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

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

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

Benjamin Arai : oleaut32: Fixes for function variant:VarPow.
by Alexandre Julliard 08 Sep '06

08 Sep '06

Module: wine Branch: master Commit: fbf9cba6833701ddcd201138dec1ad0d6c1ee756 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbf9cba6833701ddcd20113… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Sep 7 19:04:17 2006 -0700 oleaut32: Fixes for function variant:VarPow. --- dlls/oleaut32/variant.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b800770..30161e0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5049,21 +5049,70 @@ HRESULT WINAPI VarPow(LPVARIANT left, LP { HRESULT hr; VARIANT dl,dr; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - hr = VariantChangeType(&dl,left,0,VT_R8); + VariantInit(&dl); + VariantInit(&dr); + + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; + + /* Native VarPow always returns a error when using any extra flags */ + if (ExtraFlags != 0) + return DISP_E_BADVARTYPE; + + /* Determine return type */ + else if (leftvt == VT_NULL || rightvt == VT_NULL) { + V_VT(result) = VT_NULL; + return S_OK; + } + else if ((leftvt == VT_EMPTY || leftvt == VT_I2 || + leftvt == VT_I4 || leftvt == VT_R4 || + leftvt == VT_R8 || leftvt == VT_CY || + leftvt == VT_DATE || leftvt == VT_BSTR || + leftvt == VT_BOOL || leftvt == VT_DECIMAL || + (leftvt >= VT_I1 && leftvt <= VT_UINT)) && + (rightvt == VT_EMPTY || rightvt == VT_I2 || + rightvt == VT_I4 || rightvt == VT_R4 || + rightvt == VT_R8 || rightvt == VT_CY || + rightvt == VT_DATE || rightvt == VT_BSTR || + rightvt == VT_BOOL || rightvt == VT_DECIMAL || + (rightvt >= VT_I1 && rightvt <= VT_UINT))) + resvt = VT_R8; + else + return DISP_E_BADVARTYPE; + + hr = VariantChangeType(&dl,left,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed left argument to VT_R8, handle it differently.\n"); + VariantClear(&dl); return E_FAIL; } - hr = VariantChangeType(&dr,right,0,VT_R8); + + hr = VariantChangeType(&dr,right,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed right argument to VT_R8, handle it differently.\n"); + VariantClear(&dl); + VariantClear(&dr); return E_FAIL; } + V_VT(result) = VT_R8; V_R8(result) = pow(V_R8(&dl),V_R8(&dr)); + + VariantClear(&dl); + VariantClear(&dr); + return S_OK; }

1 0