November 2008 - Wine-commits

Alexandre Julliard : ntdll: Add support for root directory in NtCreateFile for Win32 file objects.
by Alexandre Julliard 11 Nov '08

11 Nov '08

Module: wine Branch: master Commit: f96670cb5f8ba1eb22b9d0cc210cbd154e4667e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96670cb5f8ba1eb22b9d0cc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 11:40:08 2008 +0100 ntdll: Add support for root directory in NtCreateFile for Win32 file objects. --- dlls/ntdll/file.c | 13 +++---------- dlls/ntdll/tests/om.c | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 50fa651..d04125f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -158,16 +158,9 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB if (alloc_size) FIXME( "alloc_size not supported\n" ); - if (attr->RootDirectory) - { - FIXME( "RootDirectory %p not supported\n", attr->RootDirectory ); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - io->u.Status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, disposition, - !(attr->Attributes & OBJ_CASE_INSENSITIVE) ); - - if (io->u.Status == STATUS_BAD_DEVICE_TYPE) + if (attr->RootDirectory || + (io->u.Status = wine_nt_to_unix_file_name( attr->ObjectName, &unix_name, disposition, + !(attr->Attributes & OBJ_CASE_INSENSITIVE) )) == STATUS_BAD_DEVICE_TYPE) { SERVER_START_REQ( open_file_object ) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1e4cf17..fa2642a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -553,7 +553,7 @@ static void test_symboliclink(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\PIPE"); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - todo_wine ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08x)\n", status); + ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08x)\n", status); pRtlFreeUnicodeString(&str); pNtClose(h);

1 0

Alexandre Julliard : mountmgr: Return the drive type even when the buffer is too small.
by Alexandre Julliard 11 Nov '08

11 Nov '08

Module: wine Branch: master Commit: 8227c030732f8e27283b495a0f310400e19c132e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8227c030732f8e27283b495a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 16:11:05 2008 +0100 mountmgr: Return the drive type even when the buffer is too small. --- dlls/mountmgr.sys/mountmgr.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3c1aa88..987040e 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -287,9 +287,17 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, if (size > outsize) { + iosb->Information = 0; if (size >= FIELD_OFFSET( struct mountmgr_unix_drive, size ) + sizeof(output->size)) + { output->size = size; - iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, size ) + sizeof(output->size); + iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, size ) + sizeof(output->size); + } + if (size >= FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type)) + { + output->type = type; + iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type); + } return STATUS_MORE_ENTRIES; } output->size = size;

1 0

Alexandre Julliard : kernel32: Get the drive type from the mount manager instead of the registry.
by Alexandre Julliard 11 Nov '08

11 Nov '08

Module: wine Branch: master Commit: 18ee259274a58577c221d67c02be096f9aeeb87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ee259274a58577c221d67c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 10 16:28:37 2008 +0100 kernel32: Get the drive type from the mount manager instead of the registry. --- dlls/kernel32/volume.c | 96 +++++++++++++++-------------------------------- 1 files changed, 31 insertions(+), 65 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7dc046f..6baf8c5 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -37,6 +37,7 @@ #include "winternl.h" #include "winioctl.h" #include "ntddcdrm.h" +#define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h" #include "kernel_private.h" #include "wine/library.h" @@ -65,17 +66,6 @@ enum fs_type FS_ISO9660 }; -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 */ -}; - /* read a Unix symlink; returned buffer must be freed by caller */ static char *read_symlink( const char *path ) { @@ -190,6 +180,34 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) return TRUE; } +/* query the type of a drive from the mount manager */ +static DWORD get_mountmgr_drive_type( LPCWSTR root ) +{ + HANDLE mgr; + struct mountmgr_unix_drive data; + + memset( &data, 0, sizeof(data) ); + if (root) data.letter = root[0]; + else + { + WCHAR curdir[MAX_PATH]; + GetCurrentDirectoryW( MAX_PATH, curdir ); + if (curdir[1] != ':' || curdir[2] != '\\') return DRIVE_UNKNOWN; + data.letter = curdir[0]; + } + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return DRIVE_UNKNOWN; + + if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, &data, sizeof(data), &data, + sizeof(data), NULL, NULL ) && GetLastError() != ERROR_MORE_DATA) + data.type = DRIVE_UNKNOWN; + + CloseHandle( mgr ); + return data.type; +} + /* get the label by reading it from a file at the root of the filesystem */ static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) { @@ -237,58 +255,6 @@ static DWORD get_filesystem_serial( const WCHAR *device ) else return 0; } -/* fetch the type of a drive from the registry */ -static UINT get_registry_drive_type( const WCHAR *root ) -{ - static const WCHAR drive_types_keyW[] = {'M','a','c','h','i','n','e','\\', - 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','r','i','v','e','s',0 }; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE hkey; - DWORD dummy; - UINT ret = DRIVE_UNKNOWN; - char tmp[32 + sizeof(KEY_VALUE_PARTIAL_INFORMATION)]; - WCHAR driveW[] = {'A',':',0}; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, drive_types_keyW ); - /* @@ Wine registry key: HKLM\Software\Wine\Drives */ - if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) != STATUS_SUCCESS) return DRIVE_UNKNOWN; - - if (root) driveW[0] = root[0]; - else - { - WCHAR path[MAX_PATH]; - GetCurrentDirectoryW( MAX_PATH, path ); - driveW[0] = path[0]; - } - - RtlInitUnicodeString( &nameW, driveW ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) - { - unsigned int i; - WCHAR *data = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; - - for (i = 0; i < sizeof(drive_types)/sizeof(drive_types[0]); i++) - { - if (!strcmpiW( data, drive_types[i] )) - { - ret = i; - break; - } - } - } - NtClose( hkey ); - return ret; -} - /****************************************************************** * VOLUME_FindCdRomDataBestVoldesc @@ -1278,7 +1244,7 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */ SetLastError( RtlNtStatusToDosError(status) ); ret = DRIVE_UNKNOWN; } - else if ((ret = get_registry_drive_type( root )) == DRIVE_UNKNOWN) + else { switch (info.DeviceType) { @@ -1288,7 +1254,7 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */ case FILE_DEVICE_DISK_FILE_SYSTEM: if (info.Characteristics & FILE_REMOTE_DEVICE) ret = DRIVE_REMOTE; else if (info.Characteristics & FILE_REMOVABLE_MEDIA) ret = DRIVE_REMOVABLE; - else ret = DRIVE_FIXED; + else if ((ret = get_mountmgr_drive_type( root )) == DRIVE_UNKNOWN) ret = DRIVE_FIXED; break; default: ret = DRIVE_UNKNOWN;

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of test failures on Vista.
by Alexandre Julliard 11 Nov '08

11 Nov '08

Module: wine Branch: master Commit: 66d893b0f9c21aba22c8fc0e03b7c2d1f99e619e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d893b0f9c21aba22c8fc0e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 11:39:31 2008 +0100 ntdll/tests: Fix a couple of test failures on Vista. --- dlls/ntdll/tests/om.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2e5f355..1e4cf17 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -138,13 +138,16 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || + status == STATUS_PIPE_NOT_AVAILABLE || + status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, + ok(status == STATUS_OBJECT_NAME_NOT_FOUND || + status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); pNtClose(pipe); @@ -289,10 +292,10 @@ static void test_directory(void) /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); @@ -474,7 +477,7 @@ static void test_symboliclink(void) IO_STATUS_BLOCK iosb; /* No name and/or no attributes */ - SYMLNK_TEST_CREATE_OPEN_FAILURE(NULL, "", "", STATUS_ACCESS_VIOLATION) + SYMLNK_TEST_CREATE_OPEN_FAILURE2(NULL, "", "", STATUS_ACCESS_VIOLATION, STATUS_INVALID_PARAMETER) status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION,

1 0

Alistair Leslie-Hughes : advapi32: Correct off by one in LookupPrivilegeValueW.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: d0ccdfbd4ff5c7febef926a2516bb4871d43694a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ccdfbd4ff5c7febef926a25… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 10 19:47:29 2008 +1100 advapi32: Correct off by one in LookupPrivilegeValueW. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 67c410f..8229377 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1679,7 +1679,7 @@ LookupPrivilegeValueW( LPCWSTR lpSystemName, LPCWSTR lpName, PLUID lpLuid ) SetLastError(ERROR_NO_SUCH_PRIVILEGE); return FALSE; } - for( i=SE_MIN_WELL_KNOWN_PRIVILEGE; i<SE_MAX_WELL_KNOWN_PRIVILEGE; i++ ) + for( i=SE_MIN_WELL_KNOWN_PRIVILEGE; i<=SE_MAX_WELL_KNOWN_PRIVILEGE; i++ ) { if( !WellKnownPrivNames[i] ) continue; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2d58946..3d02777 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -579,7 +579,7 @@ static void test_lookupPrivilegeName(void) "SeCreateTokenPrivilege (got %d, expected %d)\n", cchName, (int)strlen("SeCreateTokenPrivilege")); /* check known values */ - for (i = SE_MIN_WELL_KNOWN_PRIVILEGE; i < SE_MAX_WELL_KNOWN_PRIVILEGE; i++) + for (i = SE_MIN_WELL_KNOWN_PRIVILEGE; i <= SE_MAX_WELL_KNOWN_PRIVILEGE; i++) { luid.LowPart = i; cchName = sizeof(buf);

1 0

Christian Costa : d3dxof: Fix buffer overflow.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: be0afe956981b06c0478b84c313816d296906363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0afe956981b06c0478b84c3… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Nov 10 13:20:03 2008 +0100 d3dxof: Fix buffer overflow. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 20993f5..a953573 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -817,7 +817,7 @@ static WORD parse_TOKEN(parse_buffer * buf) break; case TOKEN_GUID: { - char strguid[38]; + char strguid[39]; GUID class_id; if (!read_bytes(buf, &class_id, 16))

1 0

Huw Davies : kernel32: Fix a few Welsh translations.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: 90ff82930a0501b99f0676e093ae5713e6e223a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ff82930a0501b99f0676e09… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 10 12:32:07 2008 +0000 kernel32: Fix a few Welsh translations. --- dlls/kernel32/nls/cym.nls | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls index ff5dbde..b661b5f 100644 --- a/dlls/kernel32/nls/cym.nls +++ b/dlls/kernel32/nls/cym.nls @@ -61,8 +61,8 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_ITIME "1" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "AM" - LOCALE_S2359 "PM" + LOCALE_S1159 "yb" + LOCALE_S2359 "yp" LOCALE_SABBREVCTRYNAME "GBR" LOCALE_SABBREVDAYNAME1 "Lln" LOCALE_SABBREVDAYNAME2 "Maw" @@ -88,16 +88,16 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_SCOUNTRY "Cymru" LOCALE_SCURRENCY "�" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "Dyds Llun" + LOCALE_SDAYNAME1 "Dydd Llun" LOCALE_SDAYNAME2 "Dydd Mawrth" - LOCALE_SDAYNAME3 "Dyds Mercher" + LOCALE_SDAYNAME3 "Dydd Mercher" LOCALE_SDAYNAME4 "Dydd Iau" LOCALE_SDAYNAME5 "Dydd Gwener" - LOCALE_SDAYNAME6 "Dyds Sadwrn" + LOCALE_SDAYNAME6 "Dydd Sadwrn" LOCALE_SDAYNAME7 "Dydd Sul" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Wales" - LOCALE_SENGCURRNAME "" + LOCALE_SENGCURRNAME "UK Pound Sterling" LOCALE_SENGLANGUAGE "Welsh" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" @@ -124,7 +124,7 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "cy-GB" LOCALE_SNATIVECTRYNAME "Cymru" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECURRNAME "punt" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "Cymraeg" LOCALE_SNEGATIVESIGN "-"

1 0

Tony Wasserka : d3dx9: Implement ID3DXSprite_Flush.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: 67dadeb7c8ad95bec85e65b17fce1052453999bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=67dadeb7c8ad95bec85e65b17… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Nov 7 17:01:27 2008 +0100 d3dx9: Implement ID3DXSprite_Flush. --- dlls/d3dx9_36/sprite.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 95ceb5f..fb68c9b 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -302,10 +302,60 @@ static HRESULT WINAPI ID3DXSpriteImpl_Draw(LPD3DXSPRITE iface, LPDIRECT3DTEXTURE static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; + SPRITEVERTEX *vertices; int i; - FIXME("(%p): stub\n", This); + TRACE("(%p): relay\n", This); if(!This->ready) return D3DERR_INVALIDCALL; + if(!This->sprite_count) return D3D_OK; + +/* TODO: use of a vertex buffer here */ + vertices=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SPRITEVERTEX)*4*This->sprite_count); + + for(i=0;i<This->sprite_count;i++) { + float spritewidth=(float)This->sprites[i].rect.right-(float)This->sprites[i].rect.left; + float spriteheight=(float)This->sprites[i].rect.bottom-(float)This->sprites[i].rect.top; + + vertices[4*i ].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[4*i ].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[4*i ].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[4*i+1].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[4*i+1].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[4*i+1].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[4*i+2].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[4*i+2].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[4*i+2].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[4*i+3].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[4*i+3].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[4*i+3].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[4*i ].col = This->sprites[i].color; + vertices[4*i+1].col = This->sprites[i].color; + vertices[4*i+2].col = This->sprites[i].color; + vertices[4*i+3].col = This->sprites[i].color; + vertices[4*i ].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; + vertices[4*i ].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; + vertices[4*i+1].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; + vertices[4*i+1].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; + vertices[4*i+2].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; + vertices[4*i+2].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; + vertices[4*i+3].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; + vertices[4*i+3].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; + } + + D3DXVec3TransformCoordArray(&vertices[0].pos, sizeof(SPRITEVERTEX), &vertices[0].pos, sizeof(SPRITEVERTEX), &This->transform, 4*This->sprite_count); + D3DXVec3TransformCoordArray(&vertices[0].pos, sizeof(SPRITEVERTEX), &vertices[0].pos, sizeof(SPRITEVERTEX), &This->view, 4*This->sprite_count); + + IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); + + for(i=0;i<This->sprite_count;i++) { + if(!i) + IDirect3DDevice9_SetTexture(This->device, 0, (LPDIRECT3DBASETEXTURE9)(This->sprites[i].texture)); + else if(This->sprites[i].texture!=This->sprites[i-1].texture) + IDirect3DDevice9_SetTexture(This->device, 0, (LPDIRECT3DBASETEXTURE9)(This->sprites[i].texture)); + + IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLEFAN, 2, vertices+4*i, sizeof(SPRITEVERTEX)); + } + HeapFree(GetProcessHeap(), 0, vertices); for(i=0;i<This->sprite_count;i++) if(This->sprites[i].texture) @@ -315,7 +365,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) /* Flush may be called more than once, so we don't reset This->ready here */ - return E_NOTIMPL; + return D3D_OK; } static HRESULT WINAPI ID3DXSpriteImpl_End(LPD3DXSPRITE iface)

1 0

Tony Wasserka : d3dx9: Implement ID3DXSprite_GetDevice.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: 5d4e0810267ca60451cd641aca6ac15ab3465d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4e0810267ca60451cd641ac… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Nov 7 17:37:23 2008 +0100 d3dx9: Implement ID3DXSprite_GetDevice. --- dlls/d3dx9_36/sprite.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index fb68c9b..8c6c664 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -79,8 +79,13 @@ static ULONG WINAPI ID3DXSpriteImpl_Release(LPD3DXSPRITE iface) static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(LPD3DXSPRITE iface, LPDIRECT3DDEVICE9 *device) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p): relay\n", This); + + if(device==NULL) return D3DERR_INVALIDCALL; + *device=This->device; + IDirect3DDevice9_AddRef(This->device); + + return D3D_OK; } static HRESULT WINAPI ID3DXSpriteImpl_GetTransform(LPD3DXSPRITE iface, D3DXMATRIX *transform)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put posLeft.
by Alexandre Julliard 10 Nov '08

10 Nov '08

Module: wine Branch: master Commit: af0aa2832f6aa45ffbff1dd3d0c2120060d79683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0aa2832f6aa45ffbff1dd3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 5 22:06:45 2008 +1100 mshtml: Implement IHTMLStyle get/put posLeft. --- dlls/mshtml/htmlstyle.c | 67 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 30 +++++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e90d723..b11c8c2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -353,6 +354,57 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex return S_OK; } +static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) +{ + WCHAR szValue[25]; + WCHAR szFormat[] = {'%','.','0','f','p','x',0}; + + value = floor(value); + + sprintfW(szValue, szFormat, value); + + return set_style_attr(This, sid, szValue, 0); +} + +HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) +{ + nsAString str_value; + HRESULT hres; + WCHAR pxW[] = {'p','x',0}; + + TRACE("%p %d %p\n", This, sid, p); + + *p = 0.0f; + + nsAString_Init(&str_value, NULL); + + hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); + if(hres == S_OK) + { + WCHAR *ptr; + const PRUnichar *value; + + nsAString_GetData(&str_value, &value); + if(value) + { + *p = strtolW(value, &ptr, 10); + + if(*ptr && strcmpW(ptr, pxW)) + { + nsAString_Finish(&str_value); + FIXME("only px values are currently supported\n"); + return E_FAIL; + } + } + } + + TRACE("ret %f\n", *p); + + nsAString_Finish(&str_value); + + return hres; +} + #define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle, iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) @@ -1807,15 +1859,22 @@ static HRESULT WINAPI HTMLStyle_get_posTop(IHTMLStyle *iface, float *p) static HRESULT WINAPI HTMLStyle_put_posLeft(IHTMLStyle *iface, float v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%f)\n", This, v); + + return set_style_pos(This, STYLEID_LEFT, v); } static HRESULT WINAPI HTMLStyle_get_posLeft(IHTMLStyle *iface, float *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + return get_nsstyle_pos(This, STYLEID_LEFT, p); } static HRESULT WINAPI HTMLStyle_put_posWidth(IHTMLStyle *iface, float v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7a14c29..e9d138f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2281,6 +2281,7 @@ static void test_default_style(IHTMLStyle *style) VARIANT v; BSTR str; HRESULT hres; + float f; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2382,12 +2383,41 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); + /* Test posLeft */ + hres = IHTMLStyle_get_posLeft(style, NULL); + ok(hres == E_POINTER, "get_left failed: %08x\n", hres); + + f = 1.0f; + hres = IHTMLStyle_get_posLeft(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 0.0, "expected 0.0 got %f\n", f); + + hres = IHTMLStyle_put_posLeft(style, 4.9f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + + hres = IHTMLStyle_get_posLeft(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 4.0, "expected 4.0 got %f\n", f); + + /* Ensure left is updated correctly. */ + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_left(style, &v); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "4px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + /* Test left */ V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("3px"); hres = IHTMLStyle_put_left(style, v); ok(hres == S_OK, "put_left failed: %08x\n", hres); VariantClear(&v); + hres = IHTMLStyle_get_posLeft(style, &f); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(f == 3.0, "expected 3.0 got %f\n", f); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); ok(hres == S_OK, "get_left failed: %08x\n", hres);

1 0