October 2008 - Wine-commits

Jacek Caban : mshtml: Added support for conditional comments.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: a1a25c534a22c0d6a868f9fcd62176dda65250c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a25c534a22c0d6a868f9fcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 15:22:29 2008 -0500 mshtml: Added support for conditional comments. --- dlls/mshtml/nsevents.c | 191 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 24 ++++++ 2 files changed, 204 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index dc54322..806e9eb 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -1,5 +1,5 @@ /* - * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2007-2008 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -175,11 +175,149 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_OK; } +#define IE_MAJOR_VERSION 7 +#define IE_MINOR_VERSION 0 + +static BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment) +{ + DWORD len; + int majorv = 0, minorv = 0; + const PRUnichar *ptr, *end; + nsAString nsstr; + PRUnichar *buf; + nsresult nsres; + + enum { + CMP_EQ, + CMP_LT, + CMP_LTE, + CMP_GT, + CMP_GTE + } cmpt = CMP_EQ; + + static const PRUnichar endifW[] = {'<','!','[','e','n','d','i','f',']'}; + + if(comment[0] != '[' || comment[1] != 'i' || comment[2] != 'f') + return FALSE; + + ptr = comment+3; + while(isspaceW(*ptr)) + ptr++; + + if(ptr[0] == 'l' && ptr[1] == 't') { + ptr += 2; + if(*ptr == 'e') { + cmpt = CMP_LTE; + ptr++; + }else { + cmpt = CMP_LT; + } + }else if(ptr[0] == 'g' && ptr[1] == 't') { + ptr += 2; + if(*ptr == 'e') { + cmpt = CMP_GTE; + ptr++; + }else { + cmpt = CMP_GT; + } + } + + if(!isspaceW(*ptr++)) + return FALSE; + while(isspaceW(*ptr)) + ptr++; + + if(ptr[0] != 'I' || ptr[1] != 'E') + return FALSE; + + ptr +=2; + if(!isspaceW(*ptr++)) + return FALSE; + while(isspaceW(*ptr)) + ptr++; + + if(!isdigitW(*ptr)) + return FALSE; + while(isdigitW(*ptr)) + majorv = majorv*10 + (*ptr++ - '0'); + + if(*ptr == '.') { + if(!isdigitW(*ptr)) + return FALSE; + while(isdigitW(*ptr)) + minorv = minorv*10 + (*ptr++ - '0'); + } + + while(isspaceW(*ptr)) + ptr++; + if(ptr[0] != ']' || ptr[1] != '>') + return FALSE; + ptr += 2; + + len = strlenW(ptr); + if(len < sizeof(endifW)/sizeof(WCHAR)) + return FALSE; + + end = ptr + len-sizeof(endifW)/sizeof(WCHAR); + if(memcmp(end, endifW, sizeof(endifW))) + return FALSE; + + switch(cmpt) { + case CMP_EQ: + if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) + break; + return FALSE; + case CMP_LT: + if(majorv > IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) + break; + return FALSE; + case CMP_LTE: + if(majorv > IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) + break; + return FALSE; + case CMP_GT: + if(majorv < IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) + break; + return FALSE; + case CMP_GTE: + if(majorv < IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) + break; + return FALSE; + } + + buf = heap_alloc((end-ptr+1)*sizeof(WCHAR)); + if(!buf) + return FALSE; + + memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); + buf[end-ptr] = 0; + nsAString_Init(&nsstr, buf); + heap_free(buf); + + /* FIXME: Find better way to insert HTML to document. */ + nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("Write failed: %08x\n", nsres); + return FALSE; + } + + return TRUE; +} + static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface)->This; - nsIDOMHTMLScriptElement *script; nsIDOMEventTarget *target; + nsIDOMComment *nscomment; nsIDOMElement *elem; nsresult nsres; @@ -192,19 +330,50 @@ static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent } nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMElement, (void**)&elem); - nsIDOMEventTarget_Release(target); - if(NS_FAILED(nsres)) - return NS_OK; + if(NS_SUCCEEDED(nsres)) { + nsIDOMHTMLScriptElement *script; + + nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLScriptElement, (void**)&script); + if(NS_SUCCEEDED(nsres)) { + doc_insert_script(This->doc, script); + nsIDOMHTMLScriptElement_Release(script); + } - nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLScriptElement, (void**)&script); - if(SUCCEEDED(nsres)) { - doc_insert_script(This->doc, script); - nsIDOMHTMLScriptElement_Release(script); + check_event_attr(This->doc, elem); + + nsIDOMEventTarget_Release(target); + nsIDOMNode_Release(elem); + return NS_OK; } - check_event_attr(This->doc, elem); + nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMComment, (void**)&nscomment); + if(NS_SUCCEEDED(nsres)) { + nsAString comment_str; + BOOL remove_comment = FALSE; + + nsAString_Init(&comment_str, NULL); + nsres = nsIDOMComment_GetData(nscomment, &comment_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *comment; + + nsAString_GetData(&comment_str, &comment); + remove_comment = handle_insert_comment(This->doc, comment); + } + + nsAString_Finish(&comment_str); + + if(remove_comment) { + nsIDOMNode *nsparent, *tmp; + + nsIDOMComment_GetParentNode(nscomment, &nsparent); + nsIDOMNode_RemoveChild(nsparent, (nsIDOMNode*)nscomment, &tmp); + nsIDOMNode_Release(nsparent); + nsIDOMNode_Release(tmp); + } + + nsIDOMComment_Release(nscomment); + } - nsIDOMNode_Release(elem); return NS_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4388048..75538fe 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -53,6 +53,10 @@ static const char elem_test_str[] = "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; +static const char cond_comment_str[] = + "<html><head><title>test</title></head><body>" + "" + "</body></html>"; static const WCHAR noneW[] = {'N','o','n','e',0}; @@ -3373,6 +3377,25 @@ static void test_indent(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); } +static void test_cond_comment(IHTMLDocument2 *doc) +{ + IHTMLElementCollection *col; + HRESULT hres; + + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_BR + }; + + hres = IHTMLDocument2_get_all(doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + IHTMLElementCollection_Release(col); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -3556,6 +3579,7 @@ START_TEST(dom) run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent); + run_domtest(cond_comment_str, test_cond_comment); CoUninitialize(); gecko_installer_workaround(FALSE);

1 0

Juan Lang : crypt32: Fix remaining Win9x encoding test failures.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: ee2fc60c17f9fa72ad7041dc904f0d00486781b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2fc60c17f9fa72ad7041dc9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 15 13:24:44 2008 -0700 crypt32: Fix remaining Win9x encoding test failures. --- dlls/crypt32/tests/encode.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index c64386d..d568eb5 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -6481,8 +6481,14 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = pCryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no CMS_SIGNER_INFO encode support\n"); + return; + } + ok(GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* To be encoded, a signer must have a valid cert ID, where a valid ID may * be a key id or a issuer serial number with at least the issuer set, and * the encoding must include PKCS_7_ASN_ENCODING.

1 0

Jacek Caban : kernel32: Added GetLogicalDriveStrings tests.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: a849136d5e13a5d1a6783e795b381e744ed201e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a849136d5e13a5d1a6783e795… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 10:24:28 2008 -0500 kernel32: Added GetLogicalDriveStrings tests. --- dlls/kernel32/tests/volume.c | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 727f326..14fcade 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -27,6 +27,8 @@ static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD static HANDLE (WINAPI *pFindFirstVolumeA)(LPSTR,DWORD); static BOOL (WINAPI *pFindNextVolumeA)(HANDLE,LPSTR,DWORD); static BOOL (WINAPI *pFindVolumeClose)(HANDLE); +static UINT (WINAPI *pGetLogicalDriveStringsA)(UINT,LPSTR); +static UINT (WINAPI *pGetLogicalDriveStringsW)(UINT,LPWSTR); /* ############################### */ @@ -139,6 +141,74 @@ static void test_GetVolumeNameForVolumeMountPointW(void) ok(ret == TRUE, "GetVolumeNameForVolumeMountPointW failed\n"); } +static void test_GetLogicalDriveStringsA(void) +{ + UINT size, size2; + char *buf, *ptr; + + if(!pGetLogicalDriveStringsA) { + win_skip("GetLogicalDriveStringsA not available\n"); + return; + } + + size = pGetLogicalDriveStringsA(0, NULL); + ok(size%4 == 1, "size = %d\n", size); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + + *buf = 0; + size2 = pGetLogicalDriveStringsA(2, buf); + ok(size2 == size, "size2 = %d\n", size2); + ok(!*buf, "buf changed\n"); + + size2 = pGetLogicalDriveStringsA(size, buf); + ok(size2 == size-1, "size2 = %d\n", size2); + + for(ptr = buf; ptr < buf+size2; ptr += 4) { + ok('A' <= *ptr && *ptr <= 'Z', "device name '%c' is not uppercase\n", *ptr); + ok(ptr[1] == ':', "ptr[1] = %c, expected ':'\n", ptr[1]); + ok(ptr[2] == '\\', "ptr[2] = %c expected '\\'\n", ptr[2]); + ok(!ptr[3], "ptr[3] = %c expected nullbyte\n", ptr[3]); + } + ok(!*ptr, "buf[size2] is not nullbyte\n"); + + HeapFree(GetProcessHeap(), 0, buf); +} + +static void test_GetLogicalDriveStringsW(void) +{ + UINT size, size2; + WCHAR *buf, *ptr; + + if(!pGetLogicalDriveStringsW) { + win_skip("GetLogicalDriveStringsW not available\n"); + return; + } + + size = pGetLogicalDriveStringsW(0, NULL); + ok(size%4 == 1, "size = %d\n", size); + + buf = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + + *buf = 0; + size2 = pGetLogicalDriveStringsW(2, buf); + ok(size2 == size, "size2 = %d\n", size2); + ok(!*buf, "buf changed\n"); + + size2 = pGetLogicalDriveStringsW(size, buf); + ok(size2 == size-1, "size2 = %d\n", size2); + + for(ptr = buf; ptr < buf+size2; ptr += 4) { + ok('A' <= *ptr && *ptr <= 'Z', "device name '%c' is not uppercase\n", *ptr); + ok(ptr[1] == ':', "ptr[1] = %c, expected ':'\n", ptr[1]); + ok(ptr[2] == '\\', "ptr[2] = %c expected '\\'\n", ptr[2]); + ok(!ptr[3], "ptr[3] = %c expected nullbyte\n", ptr[3]); + } + ok(!*ptr, "buf[size2] is not nullbyte\n"); + + HeapFree(GetProcessHeap(), 0, buf); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -147,9 +217,13 @@ START_TEST(volume) pFindFirstVolumeA = (void *) GetProcAddress(hdll, "FindFirstVolumeA"); pFindNextVolumeA = (void *) GetProcAddress(hdll, "FindNextVolumeA"); pFindVolumeClose = (void *) GetProcAddress(hdll, "FindVolumeClose"); + pGetLogicalDriveStringsA = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsA"); + pGetLogicalDriveStringsW = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsW"); test_query_dos_deviceA(); test_FindFirstVolume(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW(); + test_GetLogicalDriveStringsA(); + test_GetLogicalDriveStringsW(); }

1 0

Maarten Lankhorst : includes: Fix CryptCATAdminAddCatalog definition.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 4b9fd9a2891fa942481f09e7a64791f7b6cf15c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fd9a2891fa942481f09e7a… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Tue Oct 14 19:56:17 2008 +0200 includes: Fix CryptCATAdminAddCatalog definition. --- dlls/wintrust/crypt.c | 6 +++--- include/mscat.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 544d1aa..136f795 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -69,12 +69,12 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, /*********************************************************************** * CryptCATAdminAddCatalog (WINTRUST.@) */ -BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, - PWSTR selectBaseName, DWORD flags) +HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, + PWSTR selectBaseName, DWORD flags) { FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), debugstr_w(selectBaseName), flags); - return TRUE; + return (HCATINFO) 0xdeeeaaadL; } /*********************************************************************** diff --git a/include/mscat.h b/include/mscat.h index f5e9f0f..e481207 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -49,7 +49,7 @@ typedef struct CRYPTCATMEMBER_ { BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); -BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); +HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);

1 0

Alexandre Julliard : mountmgr: Specify the drive type as a DWORD instead of a string.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: a28a387615256f7831249f55895290837f17d8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28a387615256f7831249f558… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 15 20:12:27 2008 +0200 mountmgr: Specify the drive type as a DWORD instead of a string. --- dlls/mountmgr.sys/device.c | 37 +++++++++++++++++++++++++++---------- dlls/mountmgr.sys/diskarb.c | 4 ++-- dlls/mountmgr.sys/hal.c | 6 +++++- dlls/mountmgr.sys/mountmgr.h | 2 +- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 0435f35..0260b5f 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -35,10 +35,22 @@ #include "wine/library.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); +static const WCHAR drive_types[][8] = +{ + { 0 }, /* DRIVE_UNKNOWN */ + { 0 }, /* DRIVE_NO_ROOT_DIR */ + {'f','l','o','p','p','y',0}, /* DRIVE_REMOVABLE */ + {'h','d',0}, /* DRIVE_FIXED */ + {'n','e','t','w','o','r','k',0}, /* DRIVE_REMOTE */ + {'c','d','r','o','m',0}, /* DRIVE_CDROM */ + {'r','a','m','d','i','s','k',0} /* DRIVE_RAMDISK */ +}; + struct dos_drive { struct list entry; @@ -87,7 +99,7 @@ static inline int is_valid_device( struct stat *st ) } /* find or create a DOS drive for the corresponding device */ -static int add_drive( const char *device, const char *type ) +static int add_drive( const char *device, DWORD type ) { char *path, *p; char in_use[26]; @@ -103,7 +115,7 @@ static int add_drive( const char *device, const char *type ) first = 2; last = 26; - if (type && !strcmp( type, "floppy" )) + if (type == DRIVE_REMOVABLE) { first = 0; last = 2; @@ -186,7 +198,7 @@ static BOOL set_mount_point( struct dos_drive *drive, const char *mount_point ) } BOOL add_dos_device( const char *udi, const char *device, - const char *mount_point, const char *type ) + const char *mount_point, DWORD type ) { struct dos_drive *drive; @@ -213,17 +225,22 @@ found: set_mount_point( drive, mount_point ); - TRACE( "added device %c: udi %s for %s on %s type %s\n", + TRACE( "added device %c: udi %s for %s on %s type %u\n", 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), - wine_dbgstr_a(mount_point), wine_dbgstr_a(type) ); + wine_dbgstr_a(mount_point), type ); /* hack: force the drive type in the registry */ if (!RegCreateKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) { - char name[3] = "a:"; + const WCHAR *type_name = drive_types[type]; + WCHAR name[3] = {'a',':',0}; + name[0] += drive->drive; - if (!type || strcmp( type, "cdrom" )) type = "floppy"; /* FIXME: default to floppy */ - RegSetValueExA( hkey, name, 0, REG_SZ, (const BYTE *)type, strlen(type) + 1 ); + if (type_name[0]) + RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)type_name, + (strlenW(type_name) + 1) * sizeof(WCHAR) ); + else + RegDeleteValueW( hkey, name ); RegCloseKey( hkey ); } @@ -248,9 +265,9 @@ BOOL remove_dos_device( const char *udi ) /* clear the registry key too */ if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) { - char name[3] = "a:"; + WCHAR name[3] = {'a',':',0}; name[0] += drive->drive; - RegDeleteValueA( hkey, name ); + RegDeleteValueW( hkey, name ); RegCloseKey( hkey ); } diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index d5f3d61..4f18d52 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -47,7 +47,7 @@ static void appeared_callback( DADiskRef disk, void *context ) const void *ref; char device[64]; char mount_point[PATH_MAX]; - const char *type = NULL; + DWORD type = DRIVE_UNKNOWN; if (!dict) return; @@ -69,7 +69,7 @@ static void appeared_callback( DADiskRef disk, void *context ) { if (!CFStringCompare( ref, CFSTR("cd9660"), 0 ) || !CFStringCompare( ref, CFSTR("udf"), 0 )) - type = "cdrom"; + type = DRIVE_CDROM; } TRACE( "got mount notification for '%s' on '%s'\n", device, mount_point ); diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 615edf0..c1d6e70 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -117,6 +117,7 @@ static void new_device( LibHalContext *ctx, const char *udi ) char *mount_point = NULL; char *device = NULL; char *type = NULL; + DWORD drive_type; p_dbus_error_init( &error ); @@ -135,7 +136,10 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (!(type = p_libhal_device_get_property_string( ctx, parent, "storage.drive_type", &error ))) p_dbus_error_free( &error ); /* ignore error */ - add_dos_device( udi, device, mount_point, type ); + if (type && !strcmp( type, "cdrom" )) drive_type = DRIVE_CDROM; + else drive_type = DRIVE_REMOVABLE; /* FIXME: default to removable */ + + add_dos_device( udi, device, mount_point, drive_type ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 1e1ce85..2d34624 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -21,5 +21,5 @@ 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, const char *type ); + const char *mount_point, DWORD type ); extern BOOL remove_dos_device( const char *udi );

1 0

Alexandre Julliard : mountmgr: Return the drive unique id in IOCTL_MOUNTMGR_QUERY_POINTS.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 7b51cf49fcb68458d8842a3295835aed46204969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b51cf49fcb68458d8842a329… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 15 20:12:49 2008 +0200 mountmgr: Return the drive unique id in IOCTL_MOUNTMGR_QUERY_POINTS. --- dlls/mountmgr.sys/mountmgr.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index b9e96dc..e24394a 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -291,6 +291,8 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, if (!matching_mount_point( &mount_points[i], input )) continue; size += get_device_name(mount_points[i].device)->Length; size += mount_points[i].link.Length; + size += strlen(mount_points[i].id) + 1; + size = (size + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); j++; } pos = FIELD_OFFSET( MOUNTMGR_MOUNT_POINTS, MountPoints[j] ); @@ -308,8 +310,6 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, { if (!mount_points[i].device) continue; if (!matching_mount_point( &mount_points[i], input )) continue; - info->MountPoints[j].UniqueIdOffset = 0; /* FIXME */ - info->MountPoints[j].UniqueIdLength = 0; dev_name = get_device_name( mount_points[i].device ); info->MountPoints[j].DeviceNameOffset = pos; @@ -321,6 +321,12 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, info->MountPoints[j].SymbolicLinkNameLength = mount_points[i].link.Length; memcpy( (char *)out_buff + pos, mount_points[i].link.Buffer, mount_points[i].link.Length ); pos += mount_points[i].link.Length; + + info->MountPoints[j].UniqueIdOffset = pos; + info->MountPoints[j].UniqueIdLength = strlen(mount_points[i].id) + 1; + memcpy( (char *)out_buff + pos, mount_points[i].id, strlen(mount_points[i].id) + 1 ); + pos += strlen(mount_points[i].id) + 1; + pos = (pos + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); j++; } info->Size = pos;

1 0

Dmitry Timoshkov : kernel32: Add support for foreign process handles in GetProcessVersion.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 228c52de57623de52c00142d3eb7765bf489365f URL: http://source.winehq.org/git/wine.git/?a=commit;h=228c52de57623de52c00142d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 15 23:44:54 2008 +0900 kernel32: Add support for foreign process handles in GetProcessVersion. --- dlls/kernel32/process.c | 52 ++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/process.c | 42 ++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1d68462..72d829b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2860,19 +2860,55 @@ BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, /*********************************************************************** * GetProcessVersion (KERNEL32.@) */ -DWORD WINAPI GetProcessVersion( DWORD processid ) +DWORD WINAPI GetProcessVersion( DWORD pid ) { - IMAGE_NT_HEADERS *nt; + HANDLE process; + NTSTATUS status; + PROCESS_BASIC_INFORMATION pbi; + SIZE_T count; + PEB peb; + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS nt; + DWORD ver = 0; - if (processid && processid != GetCurrentProcessId()) + if (!pid || pid == GetCurrentProcessId()) { - FIXME("should use ReadProcessMemory\n"); + IMAGE_NT_HEADERS *nt; + + if ((nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ))) + return ((nt->OptionalHeader.MajorSubsystemVersion << 16) | + nt->OptionalHeader.MinorSubsystemVersion); return 0; } - if ((nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ))) - return ((nt->OptionalHeader.MajorSubsystemVersion << 16) | - nt->OptionalHeader.MinorSubsystemVersion); - return 0; + + process = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, pid); + if (!process) return 0; + + status = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); + if (status) goto err; + + status = NtReadVirtualMemory(process, pbi.PebBaseAddress, &peb, sizeof(peb), &count); + if (status || count != sizeof(peb)) goto err; + + memset(&dos, 0, sizeof(dos)); + status = NtReadVirtualMemory(process, peb.ImageBaseAddress, &dos, sizeof(dos), &count); + if (status || count != sizeof(dos)) goto err; + if (dos.e_magic != IMAGE_DOS_SIGNATURE) goto err; + + memset(&nt, 0, sizeof(nt)); + status = NtReadVirtualMemory(process, (char *)peb.ImageBaseAddress + dos.e_lfanew, &nt, sizeof(nt), &count); + if (status || count != sizeof(nt)) goto err; + if (nt.Signature != IMAGE_NT_SIGNATURE) goto err; + + ver = MAKELONG(nt.OptionalHeader.MinorSubsystemVersion, nt.OptionalHeader.MajorSubsystemVersion); + +err: + CloseHandle(process); + + if (status != STATUS_SUCCESS) + SetLastError(RtlNtStatusToDosError(status)); + + return ver; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 321053f..f7ca2f8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -24,12 +24,16 @@ #include <stdio.h> #include <stdlib.h> -#include "wine/test.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "wincon.h" #include "winnls.h" +#include "winternl.h" + +#include "wine/test.h" static HINSTANCE hkernel32; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); @@ -1419,6 +1423,41 @@ static void test_OpenProcess(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } +static void test_GetProcessVersion(void) +{ + static char cmdline[] = "winver.exe"; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DWORD ret; + + SetLastError(0xdeadbeef); + ret = GetProcessVersion(0); + ok(ret, "GetProcessVersion error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetProcessVersion(GetCurrentProcessId()); + ok(ret, "GetProcessVersion error %u\n", GetLastError()); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + SetLastError(0xdeadbeef); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetProcessVersion(pi.dwProcessId); + ok(ret, "GetProcessVersion error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error %u\n", GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(process) { int b = init(); @@ -1439,6 +1478,7 @@ START_TEST(process) test_Console(); test_ExitCode(); test_OpenProcess(); + test_GetProcessVersion(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Jacek Caban : kernel32: Return uppercase drive letter in GetLogicalDriveStrings.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 2e9aa16da95ecc67a0fb0cf0f99e3dfe324d1ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9aa16da95ecc67a0fb0cf0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 10:24:13 2008 -0500 kernel32: Return uppercase drive letter in GetLogicalDriveStrings. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 74397a9..4214cca 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1155,7 +1155,7 @@ UINT WINAPI GetLogicalDriveStringsA( UINT len, LPSTR buffer ) { if (drives & (1 << drive)) { - *buffer++ = 'a' + drive; + *buffer++ = 'A' + drive; *buffer++ = ':'; *buffer++ = '\\'; *buffer++ = 0; @@ -1181,7 +1181,7 @@ UINT WINAPI GetLogicalDriveStringsW( UINT len, LPWSTR buffer ) { if (drives & (1 << drive)) { - *buffer++ = 'a' + drive; + *buffer++ = 'A' + drive; *buffer++ = ':'; *buffer++ = '\\'; *buffer++ = 0;

1 0

Ivan Sinitsin : winex11: Set copy mode when rendering OpenGL picture.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: 7ea27385171700f3dd7b3fbf84874d47edf64e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea27385171700f3dd7b3fbf8… Author: Ivan Sinitsin <ivan(a)etersoft.ru> Date: Tue Sep 30 11:02:54 2008 +0400 winex11: Set copy mode when rendering OpenGL picture. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3f6d131..bf1a9b6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2106,6 +2106,7 @@ void flush_gl_drawable(X11DRV_PDEVICE *physDev) * flush the display make sure we copy up-to-date data */ wine_tsx11_lock(); XFlush(gdi_display); + XSetFunction(gdi_display, physDev->gc, GXcopy); XCopyArea(gdi_display, src, physDev->drawable, physDev->gc, 0, 0, w, h, physDev->dc_rect.left, physDev->dc_rect.top); wine_tsx11_unlock();

1 0

Tobias Jakobi : winex11: Remove acute/ apostrophe from German keyboard layout tables.
by Alexandre Julliard 15 Oct '08

15 Oct '08

Module: wine Branch: master Commit: f151180330bf8a25931d08eda63e385359cec1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f151180330bf8a25931d08eda… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Oct 9 20:10:01 2008 +0200 winex11: Remove acute/apostrophe from German keyboard layout tables. --- dlls/winex11.drv/keyboard.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 99b16ed..f2366d2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -242,16 +242,6 @@ static const WORD main_key_vkey_dvorak[MAIN_LEN] = /* If Wine fails to match your new table, use WINEDEBUG=+key to find out why */ /* Remember to also add your new table to the layout index table far below! */ -/*** German Logitech Desktop Pro keyboard layout */ -static const char main_key_DE_logitech[MAIN_LEN][4] = -{ - "^\xb0","1!","2\"","3\xa7","4$","5%","6&","7/{","8([","9)]","0=}","\xdf?\\","'`", - "qQ@","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'", - "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", - "<>|" -}; - /*** United States keyboard layout (mostly contributed by Uwe Bonnes) */ static const char main_key_US[MAIN_LEN][4] = { @@ -311,10 +301,32 @@ static const char main_key_IS[MAIN_LEN][4] = "<>" }; +/* All german keyb layout tables have the acute/apostrophe symbol next to + * the BACKSPACE key removed (replaced with NULL which is ignored by the + * detection code). + * This was done because the mapping of the acute (and apostrophe) is done + * differently in various xkb-data/xkeyboard-config versions. Some replace + * the acute with a normal apostrophe, so that the apostrophe is found twice + * on the keyboard (one next to BACKSPACE and one next to ENTER). + * Others put the acute and grave accents on the key left of BACKSPACE. + * More information on the fd.o bugtracker: + * https://bugs.freedesktop.org/show_bug.cgi?id=11514 + */ + +/*** German Logitech Desktop Pro keyboard layout */ +static const char main_key_DE_logitech[MAIN_LEN][4] = +{ + "^\xb0","1!","2\"","3\xa7","4$","5%","6&","7/{","8([","9)]","0=}","\xdf?\\","\0`", + "qQ@","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*~", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'", + "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", + "<>|" +}; + /*** German keyboard layout (setxkbmap de) */ static const char main_key_DE[MAIN_LEN][4] = { - "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","�`", + "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","\0`", "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", @@ -324,7 +336,7 @@ static const char main_key_DE[MAIN_LEN][4] = /*** German keyboard layout without dead keys */ static const char main_key_DE_nodead[MAIN_LEN][4] = { - "^�","1!","2\"","3�","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","�", + "^�","1!","2\"","3�","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","", "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*~", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", @@ -334,7 +346,7 @@ static const char main_key_DE_nodead[MAIN_LEN][4] = /*** German keyboard layout without dead keys 105 Keys (contributed by Matthias Fechner)*/ static const char main_key_DE_nodead_105[MAIN_LEN][4] = { - "^�","1!","2\"�","3��","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","'`", + "^�","1!","2\"�","3��","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","\0`", "qQ@","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*~", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", "<>|","yY","xX","cC","vV","bB","nN","mM",",;",".:","-_",

1 0