July 2009 - Wine-commits - list.winehq.org

Piotr Caban : jscript: Add Error object stub.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: f33f5c92869df019be84149a3b260b6cf59c4fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33f5c92869df019be84149a3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:51 2009 +0200 jscript: Add Error object stub. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/error.c | 310 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 74 +++++++++++ dlls/jscript/jscript.h | 8 + dlls/jscript/tests/api.js | 27 ++++ 5 files changed, 420 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f33f5c92869df019be841…

1 0

Ismael Barros : dplayx/tests: Host migration when session host leaves.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: ebcb243c33ae15ff81fb14d9e1e2521c8d1d4d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcb243c33ae15ff81fb14d9e… Author: Ismael Barros <razielmine(a)gmail.com> Date: Mon Jul 20 17:52:49 2009 +0200 dplayx/tests: Host migration when session host leaves. --- dlls/dplayx/tests/dplayx.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 2d14584..3eba147 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6132,6 +6132,138 @@ static void test_remote_data_replication(void) } +/* Host migration */ + +static void test_host_migration(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2], idFrom, idTo; + HRESULT hr; + UINT i; + DWORD dwCount; + + DWORD dwDataSize = 1024; + LPDPMSG_DESTROYPLAYERORGROUP lpData = HeapAlloc( GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwDataSize ); + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + init_TCPIP_provider( pDP[i], "127.0.0.1", 0 ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.dwMaxPlayers = 10; + dpsd.dwFlags = DPSESSION_MIGRATEHOST; + + /* Host */ + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + if ( hr != DP_OK ) + { + todo_wine win_skip( "dplay not implemented enough for this test yet\n" ); + return; + } + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[0], NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + /* Peer */ + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + pDP[1], 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid[1], NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + + /* Host: One message in queue */ + IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + check( 1, dwCount ); + dwDataSize = 1024; + hr = IDirectPlayX_Receive( pDP[0], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + checkConv( DPSYS_CREATEPLAYERORGROUP, lpData->dwType, dpMsgType2str ); + + /* Peer: No messages */ + IDirectPlayX_GetMessageCount( pDP[1], dpid[1], &dwCount ); + check( 0, dwCount ); + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + + /* Closing host */ + IDirectPlayX_Close( pDP[0] ); + + + /* Host: Queue is cleaned */ + IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + check( 0, dwCount ); + hr = IDirectPlayX_Receive( pDP[0], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + /* Peer: gets message of player destruction */ + IDirectPlayX_GetMessageCount( pDP[1], dpid[1], &dwCount ); + check( 2, dwCount ); + dwDataSize = 1024; + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, DPRECEIVE_PEEK, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + checkConv( DPSYS_DESTROYPLAYERORGROUP, lpData->dwType, dpMsgType2str ); + + + /* Message analysis */ + for (i=0; i<2; i++) + { + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, 0, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( DPID_SYSMSG, idFrom ); + check( dpid[1], idTo ); /* Peer player id */ + switch(i) + { + case 0: + checkConv( DPSYS_DESTROYPLAYERORGROUP, lpData->dwType, + dpMsgType2str ); + check( DPPLAYERTYPE_PLAYER, lpData->dwPlayerType ); + check( dpid[0], lpData->dpId ); /* Host player id */ + checkLP( NULL, lpData->lpLocalData ); + check( 0, lpData->dwLocalDataSize ); + checkLP( NULL, lpData->lpRemoteData ); + check( 0, lpData->dwRemoteDataSize ); + checkLP( NULL, lpData->dpnName.lpszShortNameA ); + check( 0, lpData->dpIdParent ); + checkFlags( 0, lpData->dwFlags, + FLAGS_DPPLAYER | FLAGS_DPGROUP ); + break; + case 1: + checkConv( DPSYS_HOST, lpData->dwType, dpMsgType2str ); + break; + default: + break; + } + dwDataSize = 1024; + } + hr = IDirectPlayX_Receive( pDP[1], &idFrom, &idTo, 0, lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -6183,6 +6315,7 @@ START_TEST(dplayx) test_GetMessageQueue(); test_remote_data_replication(); + test_host_migration(); CoUninitialize(); }

1 0

Owen Rudge : shell32: Execute control panel applets in separate process.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 1eca313f47db884bc4cb6f9097aa7740e3a2786c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eca313f47db884bc4cb6f909… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 20 17:03:58 2009 -0300 shell32: Execute control panel applets in separate process. --- dlls/shell32/control.c | 38 ++++++++++++++++++++++++-------------- dlls/shell32/cpanel.h | 1 + 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 8337265..e2f8b89 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -59,6 +59,7 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet) if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); next = applet->next; + HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); return next; } @@ -95,6 +96,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { + WARN("Cannot allocate memory for applet path"); + goto theError; + } + + lstrcpyW(applet->cmd, cmd); + for (i = 0; i < applet->count; i++) { ZeroMemory(&newinfo, sizeof(newinfo)); newinfo.dwSize = sizeof(NEWCPLINFOA); @@ -426,6 +434,20 @@ static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel) return NULL; } +static void Control_StartApplet(HWND hWnd, CPlItem *item) +{ + WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; + WCHAR format[] = {'@','%','d',0}; + WCHAR param[MAX_PATH]; + + /* execute the applet if item is valid */ + if (item) + { + wsprintfW(param, format, item->id); + ShellExecuteW(hWnd, verbOpen, item->applet->cmd, param, NULL, SW_SHOW); + } +} + static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { @@ -484,13 +506,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) { - CPlItem *item = Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)); - - /* execute the applet if item is valid */ - if (item) - item->applet->proc(item->applet->hWnd, CPL_DBLCLK, item->id, - item->applet->info[item->id].lData); - + Control_StartApplet(hWnd, Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1))); return 0; } @@ -511,13 +527,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case NM_RETURN: case NM_DBLCLK: { - CPlItem *item = Control_GetCPlItem_From_ListView(panel); - - /* execute the applet if item is valid */ - if (item) - item->applet->proc(item->applet->hWnd, CPL_DBLCLK, - item->id, item->applet->info[item->id].lData); - + Control_StartApplet(hWnd, Control_GetCPlItem_From_ListView(panel)); return 0; } case LVN_ITEMCHANGED: diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 23ec5e5..6a1fa57 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -26,6 +26,7 @@ typedef struct CPlApplet { struct CPlApplet* next; /* linked list */ HWND hWnd; + LPWSTR cmd; /* path to applet */ unsigned count; /* number of subprograms */ HMODULE hModule; /* module of loaded applet */ APPLET_PROC proc; /* entry point address */

1 0

Dylan Smith : richedit: Added missing return to ME_EnsureVisible.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: e364a4406a7d06c1ca3056d9c059c38f70bbffa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e364a4406a7d06c1ca3056d9c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 21 00:22:12 2009 -0400 richedit: Added missing return to ME_EnsureVisible. The missing return was to prevent automatic vertically scrolling when style for it is not set, but is set for the horizontal scrollbar. I initially missed this by testing with no autoscrolling on either scrollbar. --- dlls/riched20/paint.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2c1c9b9..4b5fed1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1263,7 +1263,10 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) x = editor->horz_si.nPos; if (~editor->styleFlags & ES_AUTOVSCROLL) + { ME_HScrollAbs(editor, x); + return; + } } else { if (~editor->styleFlags & ES_AUTOVSCROLL) return;

1 0

Owen Rudge : shell32: Check if a numerical value has been passed inside quotes in Control_DoLaunch .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: bd926bde3830e13398e761e588ec3be0544f52a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd926bde3830e13398e761e58… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 20 17:03:47 2009 -0300 shell32: Check if a numerical value has been passed inside quotes in Control_DoLaunch. --- dlls/shell32/control.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 88d6ead..8337265 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -772,6 +772,11 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) extraPmts = extraPmtsBuf; } + /* Now check if there had been a numerical value in the extra params */ + if ((*extraPmts == '@') && (sp == -1)) { + sp = atoiW(extraPmts + 1); + } + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel);

1 0

Stefan Leichter : advapi32: Test a combination of CreateServiceA and GetSecurityInfo.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 08e7a1bfe7dc02d4f20e321db52eb7b35c6c6150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e7a1bfe7dc02d4f20e321db… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jul 20 21:21:16 2009 +0200 advapi32: Test a combination of CreateServiceA and GetSecurityInfo. --- dlls/advapi32/tests/service.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b924c69..0851384 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -28,6 +28,7 @@ #include "winsvc.h" #include "winnls.h" #include "lmcons.h" +#include "aclapi.h" #include "wine/test.h" @@ -37,6 +38,8 @@ static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); +static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, @@ -48,6 +51,7 @@ static void init_function_pointers(void) pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); + pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); @@ -1743,7 +1747,17 @@ static void test_sequence(void) return; } else + { ok(svc_handle != NULL, "Could not create the service : %d\n", GetLastError()); + if ((svc_handle != NULL) && (pGetSecurityInfo != NULL)) + { + PSID sidOwner, sidGroup; + PACL dacl, sacl; + PSECURITY_DESCRIPTOR pSD; + HRESULT retval = pGetSecurityInfo(svc_handle,SE_SERVICE,DACL_SECURITY_INFORMATION,&sidOwner,&sidGroup,&dacl,&sacl,&pSD); + todo_wine ok(ERROR_SUCCESS == retval, "Expected GetSecurityInfo to succeed: result %d\n",retval); + } + } if (!svc_handle) return;

1 0

Austin English : shell32: Fix English folder names.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: f81784bbdb318e1e0487bdce89c874d03e6132a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f81784bbdb318e1e0487bdce8… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 20 13:19:26 2009 -0500 shell32: Fix English folder names. --- dlls/shell32/shell32_En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index b4dddc2..6d68083 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -274,9 +274,9 @@ STRINGTABLE IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" - IDS_COMMON_MUSIC "Documents\\My Music" - IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Videos" + IDS_COMMON_MUSIC "Music" + IDS_COMMON_PICTURES "Pictures" + IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NEWFOLDER "New Folder"

1 0

David Adam : d3dx9: Add forgotten copyrights.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 9ec5d4388d8c65a46f154ed18ed33bfd96d90b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec5d4388d8c65a46f154ed18… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Jul 20 16:20:03 2009 +0200 d3dx9: Add forgotten copyrights. --- dlls/d3dx9_36/tests/math.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 610aa23..60d7193 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1,6 +1,8 @@ /* * Copyright 2008 David Adam + * Copyright 2008 Luis Busquets * Copyright 2008 Philip Nilsson + * Copyright 2008 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : mountmgr: Always set the mount point id as a separate step from the mount point creation .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 053eccf910736473c90c623d7ad98b8e513cbcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053eccf910736473c90c623d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 21:00:33 2009 +0200 mountmgr: Always set the mount point id as a separate step from the mount point creation. --- dlls/mountmgr.sys/device.c | 7 ++++--- dlls/mountmgr.sys/mountmgr.c | 12 +++++------- dlls/mountmgr.sys/mountmgr.h | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 1b23d97..56c6446 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -360,14 +360,15 @@ static void set_drive_letter( struct dos_drive *drive, int letter ) if (drive->dosdev) delete_mount_point( drive->dosdev ); if (volume->mount) delete_mount_point( volume->mount ); drive->drive = letter; - if (letter == -1) return; + drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter ); + volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid ); if (device->unix_mount) { id = device->unix_mount; id_len = strlen( device->unix_mount ) + 1; } - drive->dosdev = add_dosdev_mount_point( device->dev_obj, &device->name, letter, id, id_len ); - volume->mount = add_volume_mount_point( device->dev_obj, &device->name, &volume->guid, id, id_len ); + if (drive->dosdev) set_mount_point_id( drive->dosdev, id, id_len ); + if (volume->mount) set_mount_point_id( volume->mount, id, id_len ); } static inline int is_valid_device( struct stat *st ) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 4554de6..bbf5d64 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -61,7 +61,7 @@ void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int } static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const WCHAR *link, const void *id, unsigned int id_len ) + const WCHAR *link ) { struct mount_point *mount; WCHAR *str; @@ -83,7 +83,6 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN list_add_tail( &mount_points_list, &mount->entry ); IoCreateSymbolicLink( &mount->link, device_name ); - set_mount_point_id( mount, id, id_len ); TRACE( "created %s id %s for %s\n", debugstr_w(mount->link.Buffer), debugstr_a(mount->id), debugstr_w(mount->name.Buffer) ); @@ -91,19 +90,18 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN } /* create the DosDevices mount point symlink for a new device */ -struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ) +struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, int drive ) { static const WCHAR driveW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','%','c',':',0}; WCHAR link[sizeof(driveW)]; sprintfW( link, driveW, 'A' + drive ); - return add_mount_point( device, device_name, link, id, id_len ); + return add_mount_point( device, device_name, link ); } /* create the Volume mount point symlink for a new device */ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid, const void *id, unsigned int id_len ) + const GUID *guid ) { static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{', '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', @@ -114,7 +112,7 @@ struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN sprintfW( link, volumeW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return add_mount_point( device, device_name, link, id, id_len ); + return add_mount_point( device, device_name, link ); } /* delete the mount point symlinks when a device goes away */ diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 5ce5886..d61bb7d 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -63,8 +63,8 @@ extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive, const void *id, unsigned int id_len ); + int drive ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid, const void *id, unsigned int id_len ); + const GUID *guid ); extern void delete_mount_point( struct mount_point *mount ); extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );

1 0

Alexandre Julliard : mountmgr: Retrieve the volume uuid through HAL/ DiskArbitration when creating a device.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 81cfeaf531ad5842c5d0ad40d486571605f73a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cfeaf531ad5842c5d0ad40d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 16:11:17 2009 +0200 mountmgr: Retrieve the volume uuid through HAL/DiskArbitration when creating a device. --- dlls/mountmgr.sys/diskarb.c | 13 +++++++++++-- dlls/mountmgr.sys/hal.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 1597e34..2e5c121 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -42,6 +42,7 @@ static void appeared_callback( DADiskRef disk, void *context ) const void *ref; char device[64]; char mount_point[PATH_MAX]; + GUID guid, *guid_ptr = NULL; enum device_type type = DEVICE_UNKNOWN; if (!dict) return; @@ -50,6 +51,13 @@ static void appeared_callback( DADiskRef disk, void *context ) if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || !CFBooleanGetValue( ref )) goto done; + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumeUUID") ))) + { + CFUUIDBytes bytes = CFUUIDGetUUIDBytes( ref ); + memcpy( &guid, &bytes, sizeof(guid) ); + guid_ptr = &guid; + } + /* get device name */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); @@ -67,9 +75,10 @@ static void appeared_callback( DADiskRef disk, void *context ) type = DEVICE_CDROM; } - TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); + TRACE( "got mount notification for '%s' on '%s' uuid %s\n", + device, mount_point, wine_dbgstr_guid(guid_ptr) ); - add_dos_device( -1, device, device, mount_point, type, NULL ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr ); done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 6e09c2c..5ccb95d 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -28,6 +28,7 @@ #include <sys/time.h> #include "mountmgr.h" +#include "winnls.h" #include "excpt.h" #include "wine/library.h" @@ -105,6 +106,33 @@ static LONG WINAPI assert_fault(EXCEPTION_POINTERS *eptr) return EXCEPTION_CONTINUE_SEARCH; } +static GUID *parse_uuid( GUID *guid, const char *str ) +{ + /* standard uuid format */ + if (strlen(str) == 36) + { + UNICODE_STRING strW; + WCHAR buffer[39]; + + if (MultiByteToWideChar( CP_UNIXCP, 0, str, 36, buffer + 1, 36 )) + { + buffer[0] = '{'; + buffer[37] = '}'; + buffer[38] = 0; + RtlInitUnicodeString( &strW, buffer ); + if (!RtlGUIDFromString( &strW, guid )) return guid; + } + } + + /* check for xxxx-xxxx format (FAT serial number) */ + if (strlen(str) == 9 && str[4] == '-') + { + memset( guid, 0, sizeof(*guid) ); + if (sscanf( str, "%hx-%hx", &guid->Data2, &guid->Data3 ) == 2) return guid; + } + return NULL; +} + /* HAL callback for new device */ static void new_device( LibHalContext *ctx, const char *udi ) { @@ -113,6 +141,8 @@ static void new_device( LibHalContext *ctx, const char *udi ) char *mount_point = NULL; char *device = NULL; char *type = NULL; + char *uuid_str = NULL; + GUID guid, *guid_ptr = NULL; enum device_type drive_type; p_dbus_error_init( &error ); @@ -129,6 +159,11 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (!p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) goto done; + if (!(uuid_str = p_libhal_device_get_property_string( ctx, udi, "volume.uuid", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + else + guid_ptr = parse_uuid( &guid, uuid_str ); + if (!(type = p_libhal_device_get_property_string( ctx, parent, "storage.drive_type", &error ))) p_dbus_error_free( &error ); /* ignore error */ @@ -136,7 +171,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type, NULL ); + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); @@ -145,6 +180,7 @@ done: if (type) p_libhal_free_string( type ); if (parent) p_libhal_free_string( parent ); if (device) p_libhal_free_string( device ); + if (uuid_str) p_libhal_free_string( uuid_str ); if (mount_point) p_libhal_free_string( mount_point ); p_dbus_error_free( &error ); }

1 0