October 2008 - Wine-Commits

Alexandre Julliard : mountmgr: Convert the registry calls to Unicode.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 6dcfc95671c4adc574b80a50f9b90cbae5364cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcfc95671c4adc574b80a50f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:28:23 2008 +0200 mountmgr: Convert the registry calls to Unicode. --- dlls/mountmgr.sys/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 2c2b6c1..4328de4 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -52,6 +52,9 @@ static const WCHAR drive_types[][8] = {'r','a','m','d','i','s','k',0} /* DRIVE_RAMDISK */ }; +static const WCHAR drives_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','s',0}; + struct dos_drive { struct list entry; /* entry in drives list */ @@ -421,7 +424,7 @@ found: wine_dbgstr_a(mount_point), type ); /* hack: force the drive type in the registry */ - if (!RegCreateKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) + if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) { const WCHAR *type_name = drive_types[type]; WCHAR name[3] = {'a',':',0}; @@ -454,7 +457,7 @@ BOOL remove_dos_device( const char *udi ) BOOL modified = set_unix_mount_point( drive, NULL ); /* clear the registry key too */ - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) { WCHAR name[3] = {'a',':',0}; name[0] += drive->drive;

1 0

Alexandre Julliard : mountmgr: Query the drive type from the registry for the initial creation.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 73229f05c259f194f12b81d92adc1b5f169699a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73229f05c259f194f12b81d92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:42:21 2008 +0200 mountmgr: Query the drive type from the registry for the initial creation. --- dlls/mountmgr.sys/device.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 4328de4..8b68608 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -373,21 +373,46 @@ static void create_drive_devices(void) char *path, *p, *link; struct dos_drive *drive; unsigned int i; + HKEY drives_key; + DWORD drive_type; + WCHAR driveW[] = {'a',':',0}; if (!(path = get_dosdevices_path( &p ))) return; + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &drives_key )) drives_key = 0; for (i = 0; i < MAX_DOS_DRIVES; i++) { p[0] = 'a' + i; p[2] = 0; if (!(link = read_symlink( path ))) continue; - if (!create_disk_device( NULL, i < 2 ? DRIVE_REMOVABLE : DRIVE_FIXED, &drive )) + + drive_type = i < 2 ? DRIVE_REMOVABLE : DRIVE_FIXED; + if (drives_key) + { + WCHAR buffer[32]; + DWORD j, type, size = sizeof(buffer); + + driveW[0] = 'a' + i; + if (!RegQueryValueExW( drives_key, driveW, NULL, &type, (BYTE *)buffer, &size ) && + type == REG_SZ) + { + for (j = 0; j < sizeof(drive_types)/sizeof(drive_types[0]); j++) + if (drive_types[j][0] && !strcmpiW( buffer, drive_types[j] )) + { + drive_type = j; + break; + } + } + } + + if (!create_disk_device( NULL, drive_type, &drive )) { drive->unix_mount = link; set_drive_letter( drive, i ); } else RtlFreeHeap( GetProcessHeap(), 0, link ); } + RegCloseKey( drives_key ); RtlFreeHeap( GetProcessHeap(), 0, path ); }

1 0

Alexandre Julliard : mountmgr: Create devices and symlinks for dynamic drives too.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: f36690d44a8c6e916b909a6d231fb76a3e04e46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36690d44a8c6e916b909a6d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:20:09 2008 +0200 mountmgr: Create devices and symlinks for dynamic drives too. --- dlls/mountmgr.sys/device.c | 237 ++++++++++++++++++++++++++---------------- dlls/mountmgr.sys/mountmgr.c | 11 ++ dlls/mountmgr.sys/mountmgr.h | 1 + 3 files changed, 159 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f36690d44a8c6e916b909…

1 0

Alexandre Julliard : mountmgr: Moved the harddisk device driver to device.c .
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 7033120f83895939f54eef73527f59cf8660b2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7033120f83895939f54eef735… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:02:10 2008 +0200 mountmgr: Moved the harddisk device driver to device.c. --- dlls/mountmgr.sys/device.c | 221 ++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.c | 243 ++---------------------------------------- dlls/mountmgr.sys/mountmgr.h | 14 +++ 3 files changed, 246 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7033120f83895939f54ee…

1 0

Alexandre Julliard : mountmgr: Include some system headers in mountmgr.h.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: c5e7657d0c1d29f224fea37eab1af0571ed20365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e7657d0c1d29f224fea37ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 21 15:01:52 2008 +0200 mountmgr: Include some system headers in mountmgr.h. --- dlls/mountmgr.sys/device.c | 3 +-- dlls/mountmgr.sys/diskarb.c | 7 +------ dlls/mountmgr.sys/hal.c | 6 +----- dlls/mountmgr.sys/mountmgr.c | 14 ++------------ dlls/mountmgr.sys/mountmgr.h | 19 +++++++++++++++++-- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 0260b5f..c351409 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -27,8 +27,7 @@ #include <stdio.h> #include <sys/time.h> -#include "windef.h" -#include "winbase.h" +#include "mountmgr.h" #include "winreg.h" #include "winuser.h" #include "dbt.h" diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 4f18d52..90ced5e 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -27,13 +27,8 @@ #include <stdio.h> #include <sys/time.h> -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" - -#include "wine/debug.h" #include "mountmgr.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index c1d6e70..0f21e99 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -27,16 +27,12 @@ #include <stdio.h> #include <sys/time.h> -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" +#include "mountmgr.h" #include "excpt.h" #include "wine/library.h" #include "wine/exception.h" #include "wine/debug.h" -#include "mountmgr.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 569f131..fee1def 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -24,22 +24,12 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "winioctl.h" +#include "mountmgr.h" #include "winreg.h" -#include "ntddstor.h" -#include "ntddcdrm.h" -#include "ddk/wdm.h" -#include "ddk/mountmgr.h" #include "wine/library.h" -#include "wine/unicode.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" -#include "mountmgr.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 2d34624..22eaeec 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -18,8 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ntddstor.h" +#include "ntddcdrm.h" +#include "ddk/wdm.h" +#include "ddk/mountmgr.h" + extern void initialize_hal(void); extern void initialize_diskarbitration(void); -extern BOOL add_dos_device( const char *udi, const char *device, - const char *mount_point, DWORD type ); +extern BOOL add_dos_device( const char *udi, const char *device, const char *mount_point, DWORD type ); extern BOOL remove_dos_device( const char *udi );

1 0

Chris Wilson : winex11: Ignore source clipping in BitBlt.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 822e4cba1e9112bebaa8b5ab6850a22213f9f25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=822e4cba1e9112bebaa8b5ab6… Author: Chris Wilson <chris(a)chris-wilson.co.uk> Date: Fri Oct 17 15:15:15 2008 -0500 winex11: Ignore source clipping in BitBlt. --- dlls/winex11.drv/bitblt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index dcde11b..c740b10 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1541,8 +1541,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT if (ySrc + height > srcDib.dsBm.bmHeight) height = srcDib.dsBm.bmHeight - ySrc; - if (GetRgnBox(physDevSrc->region, &unusedRect) == COMPLEXREGION || - GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) + if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) { /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ FIXME("potential optimization: client-side complex region clipping\n");

1 0

Mounir IDRASSI : winscard: Added SCardAccessStartedEvent implementation.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: b3e80afa216d2ab3ee036109426e26e0257c2cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e80afa216d2ab3ee0361094… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon Oct 20 23:03:39 2008 +0200 winscard: Added SCardAccessStartedEvent implementation. --- dlls/winscard/winscard.c | 11 +++++++++++ dlls/winscard/winscard.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 51d0adf..f390b70 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winscard); static HMODULE WINSCARD_hModule; +static HANDLE g_startedEvent = NULL; const SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; const SCARD_IO_REQUEST g_rgSCardT1Pci = { SCARD_PROTOCOL_T1, 8 }; @@ -43,15 +44,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { DisableThreadLibraryCalls(hinstDLL); WINSCARD_hModule = hinstDLL; + /* FIXME: for now, we act as if the pcsc daemon is always started */ + g_startedEvent = CreateEventA(NULL,TRUE,TRUE,NULL); break; } case DLL_PROCESS_DETACH: + { + CloseHandle(g_startedEvent); break; + } } return TRUE; } +HANDLE WINAPI SCardAccessStartedEvent(void) +{ + return g_startedEvent; +} + LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT context, LPCSTR reader, LPCSTR group) { LONG retval; diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 1610de4..44d43ab 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -2,7 +2,7 @@ @ stub SCardAccessNewReaderEvent @ stub SCardReleaseAllEvents @ stub SCardReleaseNewReaderEvent -@ stub SCardAccessStartedEvent +@ stdcall SCardAccessStartedEvent() @ stdcall SCardAddReaderToGroupA(long str str) @ stdcall SCardAddReaderToGroupW(long wstr wstr) @ stub SCardBeginTransaction

1 0

Hans Leidekker : wldap32: Use a test query that is more likely to succeed within 20 seconds.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 6d901a173dea8912b7016e7d7c31b106ed028bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d901a173dea8912b7016e7d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 13:53:37 2008 +0200 wldap32: Use a test query that is more likely to succeed within 20 seconds. --- dlls/wldap32/tests/parse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index f54f15b..ade3061 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -34,7 +34,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) LDAPMessage *res = NULL; struct l_timeval timeout; - key.sk_attrtype = (char *)"cn"; + key.sk_attrtype = (char *)"ou"; key.sk_matchruleoid = NULL; key.sk_reverseorder = FALSE; @@ -47,7 +47,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ctrls[1] = NULL; timeout.tv_sec = 20; timeout.tv_usec = 0; - ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_SUBTREE, (char *)"(cn=Verisign*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); + ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); if (ret) { @@ -84,7 +84,7 @@ START_TEST (parse) { LDAP *ld; - ld = ldap_initA((char *)"directory.verisign.com", 389 ); + ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); ok( ld != NULL, "ldap_init failed\n" ); test_ldap_parse_sort_control( ld );

1 0

Dmitry Timoshkov : winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: d40e003303d4ae2a2239ddfd5ef8b0be61959ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40e003303d4ae2a2239ddfd5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 21 19:27:16 2008 +0900 winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer. Existing tests show that MMIO_ALLOCBUF flag is dropped if a valid buffer is being passed to mmioOpen, that means the buffer is valid in that case. --- dlls/winmm/mmio.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 60b6d0f..a750bf2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,10 +667,11 @@ HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, refmminfo->wErrorRet = MMIO_SetBuffer(wm, refmminfo->pchBuffer, refmminfo->cchBuffer, 0); if (refmminfo->wErrorRet != MMSYSERR_NOERROR) goto error1; - if (wm->info.fccIOProc == FOURCC_MEM) - wm->bBufferLoaded = TRUE; } + if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF)) + wm->bBufferLoaded = TRUE; + /* see mmioDosIOProc for that one */ wm->info.adwInfo[0] = refmminfo->adwInfo[0];

1 0

Huw Davies : ole32: Call the object's IPersistStorage_HandsOffStorage() if the object is running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 3a0ed83fb00ae595e51d72b8b4d0e22ae0f8a98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0ed83fb00ae595e51d72b8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:46:23 2008 +0100 ole32: Call the object's IPersistStorage_HandsOffStorage() if the object is running. --- dlls/ole32/defaulthandler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 41a5e92..1af0797 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1616,9 +1616,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( static HRESULT WINAPI DefaultHandler_IPersistStorage_HandsOffStorage( IPersistStorage* iface) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)\n", iface); - return IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + hr = IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_HandsOffStorage(This->pPSDelegate); + + return hr; }

1 0