November 2008 - Wine-Commits

Ricardo Filipe : hhctrl.ocx: Added Portuguese translation.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 9c6ce1386cf476657b2ad3aa52aab25b11da92e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6ce1386cf476657b2ad3aa5… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 11:33:19 2008 +0000 hhctrl.ocx: Added Portuguese translation. --- dlls/hhctrl.ocx/Pt.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Pt.rc b/dlls/hhctrl.ocx/Pt.rc new file mode 100644 index 0000000..d196ff4 --- /dev/null +++ b/dlls/hhctrl.ocx/Pt.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Portuguese Language Support + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Conte�dos" + IDS_INDEX "&�ndice" + IDS_SEARCH "&Pesquisar" + IDS_FAVORITES "&Favoritos" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Mostrar" + IDTB_CONTRACT "Esconder" + IDTB_STOP "Parar" + IDTB_REFRESH "Actualizar" + IDTB_BACK "Retroceder" + IDTB_HOME "In�cio" + IDTB_SYNC "Sincronizar" + IDTB_PRINT "Imprimir" + IDTB_OPTIONS "Op��es" + IDTB_FORWARD "Avan�ar" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Personalizar" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 1a5950c..e6dc112 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -41,6 +41,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0

Ricardo Filipe : wldap32: Added Portuguese translation.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 993b6d7f4729c9c7af2365058a7e1d2c3dff3073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993b6d7f4729c9c7af2365058… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 11:27:05 2008 +0000 wldap32: Added Portuguese translation. --- dlls/wldap32/wldap32.rc | 1 + dlls/wldap32/wldap32_Pt.rc | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/wldap32.rc b/dlls/wldap32/wldap32.rc index 4d44da7..50f9562 100644 --- a/dlls/wldap32/wldap32.rc +++ b/dlls/wldap32/wldap32.rc @@ -31,6 +31,7 @@ #include "wldap32_Nl.rc" #include "wldap32_No.rc" #include "wldap32_Pl.rc" +#include "wldap32_Pt.rc" #include "wldap32_Ru.rc" #include "wldap32_Sv.rc" #include "wldap32_Tr.rc" diff --git a/dlls/wldap32/wldap32_Pt.rc b/dlls/wldap32/wldap32_Pt.rc new file mode 100644 index 0000000..172234c --- /dev/null +++ b/dlls/wldap32/wldap32_Pt.rc @@ -0,0 +1,123 @@ +/* + * Portuguese resources for WLDAP32 + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "Sucesso" + 1 "Erro de opera��es" + 2 "Erro de protocolo" + 3 "Tempo limite excedido" + 4 "Tamanho limite excedido" + 5 "Comparar Falso" + 6 "Comparar Verdadeiro" + 7 "M�todo de autentica��o n�o suportado" + 8 "Autentica��o forte necess�ria" + 9 "Refer�ncia (v2)" + 10 "Refer�ncia" + 11 "Limite de administra��o excedido" + 12 "Extens�o Cr�tica indispon�vel" + 13 "Confidencialidade necess�ria" + 14 "" + 15 "" + 16 "Atributo n�o encontrado" + 17 "Tipo indefinido" + 18 "Atribui��o impr�pria" + 19 "Viola��o de restri��es" + 20 "Valor ou atributo existente" + 21 "Sintaxe Inv�lida" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Objecto n�o encontrado" + 33 "Problema de abreviatura" + 34 "Sintaxe DN inv�lida" + 35 "� folha" + 36 "Problema na refer�ncia da abreviatura" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Autentica��o impr�pria" + 49 "Credenciais Inv�lidas" + 50 "Direitos insuficientes" + 51 "Ocupado" + 52 "Indispon�vel" + 53 "Indisposto a realizar" + 54 "Ciclo detectado" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Falta de controlo de ordena��o" + 61 "Erro de limite de �ndice" + 62 "" + 63 "" + 64 "Viola��o de Nome" + 65 "Viola��o da Classe de Objecto" + 66 "N�o permitido em n�o-folha" + 67 "N�o permitido em RDN" + 68 "J� existe" + 69 "Sem modifica��es de Classe de Objecto" + 70 "Resultados muito grandes" + 71 "Afecta m�ltiplos DSAs" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Outro" + 81 "Servidor em baixo" + 82 "Erro Local" + 83 "Erro de Codifica��o" + 84 "Erro de Descodifica��o" + 85 "Tempo excedido" + 86 "Autentica��o desconhecida" + 87 "Erro de filtro" + 88 "Cancelado pelo utilizador" + 89 "Erro de par�metro" + 90 "Sem mem�ria" + 91 "N�o consegue ligar ao servidor LDAP" + 92 "Opera��o n�o suportada por esta vers�o do protocolo LDAP" + 93 "O controlo especificado n�o foi encontrado na mensagem" + 94 "Nenhum resultado presente na mensagem" + 95 "Mais resultados devolvidos" + 96 "Ciclo enquanto resolve refer�ncias" + 97 "Limite de salto de refer�ncias excedido" +}

1 0

Alexandre Julliard : ntdll: Add private function to manage system virtual views instead of abusing NtAllocateVirtualMemory .
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: a0c4bfef9dc1c2598fa10742d5d3aa3822833224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c4bfef9dc1c2598fa10742d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 17:40:54 2008 +0100 ntdll: Add private function to manage system virtual views instead of abusing NtAllocateVirtualMemory. --- dlls/ntdll/loader.c | 10 ++++------ dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 10 ++-------- dlls/ntdll/virtual.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index eab7516..097f61a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1316,12 +1316,10 @@ static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) static void load_builtin_callback( void *module, const char *filename ) { static const WCHAR emptyW[1]; - void *addr; IMAGE_NT_HEADERS *nt; WINE_MODREF *wm; WCHAR *fullname; const WCHAR *load_path; - SIZE_T size; if (!module) { @@ -1334,10 +1332,10 @@ static void load_builtin_callback( void *module, const char *filename ) builtin_load_info->status = STATUS_INVALID_IMAGE_FORMAT; return; } - addr = module; - size = nt->OptionalHeader.SizeOfImage; - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, - MEM_SYSTEM | MEM_IMAGE, PAGE_EXECUTE_WRITECOPY ); + virtual_create_system_view( module, nt->OptionalHeader.SizeOfImage, + VPROT_SYSTEM | VPROT_IMAGE | VPROT_NOEXEC | VPROT_COMMITTED | + VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); + /* create the MODREF */ if (!(fullname = get_builtin_fullname( builtin_load_info->filename, filename ))) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index beffd77..a42fd11 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -136,6 +136,8 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); +extern NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ); +extern SIZE_T virtual_free_system_view( PVOID *addr_ptr ); extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 62ccc2c..64d9a8b 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -142,7 +142,6 @@ static void fatal_perror( const char *err, ... ) void server_exit_thread( int status ) { struct wine_pthread_thread_info info; - SIZE_T size; int fds[4]; RtlAcquirePebLock(); @@ -162,13 +161,8 @@ void server_exit_thread( int status ) fds[3] = ntdll_get_thread_data()->request_fd; pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); - info.stack_size = size; - - size = 0; - NtFreeVirtualMemory( GetCurrentProcess(), &info.teb_base, &size, MEM_RELEASE | MEM_SYSTEM ); - info.teb_size = size; + info.stack_size = virtual_free_system_view( &info.stack_base ); + info.teb_size = virtual_free_system_view( &info.teb_base ); close( fds[0] ); close( fds[1] ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7a12da2..a4fc82d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -134,7 +134,7 @@ static void *working_set_limit; ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) #define ROUND_SIZE(addr,size) \ - (((UINT)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) + (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) @@ -1286,6 +1286,51 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** + * virtual_create_system_view + */ +NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ) +{ + FILE_VIEW *view; + NTSTATUS status; + sigset_t sigset; + + size = ROUND_SIZE( base, size ); + base = ROUND_ADDR( base, page_mask ); + server_enter_uninterrupted_section( &csVirtual, &sigset ); + status = create_view( &view, base, size, vprot ); + if (!status) TRACE( "created %p-%p\n", base, (char *)base + size ); + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return status; +} + + +/*********************************************************************** + * virtual_free_system_view + */ +SIZE_T virtual_free_system_view( PVOID *addr_ptr ) +{ + FILE_VIEW *view; + sigset_t sigset; + SIZE_T size = 0; + char *base = ROUND_ADDR( *addr_ptr, page_mask ); + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if ((view = VIRTUAL_FindView( base ))) + { + TRACE( "freeing %p-%p\n", view->base, (char *)view->base + view->size ); + /* return the values that the caller should use to unmap the area */ + *addr_ptr = view->base; + /* make sure we don't munmap anything from a reserved area */ + if (!wine_mmap_is_in_reserved_area( view->base, view->size )) size = view->size; + view->protect |= VPROT_SYSTEM; + delete_view( view ); + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return size; +} + + +/*********************************************************************** * virtual_alloc_thread_stack */ NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size )

1 0

Alexandre Julliard : kernel32/tests: Fix the write watch tests on Win98 and Win2000.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: e4d7d902d53029bbd1697b3561e46c86722fa4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d7d902d53029bbd1697b356… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 20:36:20 2008 +0100 kernel32/tests: Fix the write watch tests on Win98 and Win2000. --- dlls/kernel32/tests/virtual.c | 131 ++++++++++++++++++++++++++++------------- 1 files changed, 91 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b6a545b..a18f2d6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -754,7 +754,8 @@ static void test_write_watch(void) size = 0x10000; base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); - if (!base && GetLastError() == ERROR_INVALID_PARAMETER) + if (!base && + (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED)) { todo_wine win_skip( "MEM_WRITE_WATCH not supported\n" ); return; @@ -770,13 +771,24 @@ static void test_write_watch(void) ok( info.Type == MEM_PRIVATE, "wrong Type 0x%x\n", info.Type ); count = 64; + SetLastError( 0xdeadbeef ); ret = pGetWriteWatch( 0, NULL, size, results, &count, &pagesize ); ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken( GetLastError() == 0xdeadbeef ), /* win98 */ + "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); ret = pGetWriteWatch( 0, GetModuleHandle(0), size, results, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + if (ret) + { + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else /* win98 */ + { + ok( count == 0, "wrong count %lu\n", count ); + } ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); @@ -882,47 +894,85 @@ static void test_write_watch(void) /* some invalid parameter tests */ + SetLastError( 0xdeadbeef ); count = 0; ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); - - ret = pGetWriteWatch( 0, base, size, results, NULL, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - - count = 64; - ret = pGetWriteWatch( 0, base, size, results, &count, NULL ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - - count = 64; - ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + if (ret) + { + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pGetWriteWatch( 0, base, size, results, NULL, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base, size, results, &count, NULL ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 0; + ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize ); + ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pResetWriteWatch( base, 0 ); + ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pResetWriteWatch( GetModuleHandle(0), size ); + ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + else /* win98 is completely different */ + { + SetLastError( 0xdeadbeef ); + count = 64; + ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); + ok( ret == ERROR_INVALID_PARAMETER, "GetWriteWatch succeeded %u\n", ret ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); - count = 0; - ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + count = 0; + ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", ret ); - count = 64; - ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + count = 64; + ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", ret ); - count = 64; - ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize ); - ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + count = 64; + ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", ret ); - ret = pResetWriteWatch( base, 0 ); - ok( ret == ~0u, "ResetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pResetWriteWatch( base, 0 ); + ok( !ret, "ResetWriteWatch failed %u\n", ret ); - ret = pResetWriteWatch( GetModuleHandle(0), size ); - ok( ret == ~0u, "ResetWriteWatch failed %u\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pResetWriteWatch( GetModuleHandle(0), size ); + ok( !ret, "ResetWriteWatch failed %u\n", ret ); + } VirtualFree( base, 0, MEM_FREE ); @@ -968,8 +1018,9 @@ static void test_write_watch(void) count = 64; ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); - ok( count == 1, "wrong count %lu\n", count ); - ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); + ok( count == 1 || broken(count == 0), /* win98 */ + "wrong count %lu\n", count ); + if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); VirtualFree( base, 0, MEM_FREE ); }

1 0

Alexandre Julliard : user32/tests: Fix the resource tests for various Windows versions.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 1877ff01f9f6447b7d59a9a814ce56f7f5ddd6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1877ff01f9f6447b7d59a9a81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 21:17:48 2008 +0100 user32/tests: Fix the resource tests for various Windows versions. --- dlls/user32/tests/resource.c | 56 ++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 30b3e1f..b8e0493 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -180,41 +180,43 @@ static void test_accel1(void) ok( hAccel != NULL, "create accelerator table\n"); r = CopyAcceleratorTable( hAccel, NULL, 0 ); - ok( r == n, "two entries in table\n"); + ok( r == n || broken(r == 2), /* win9x */ + "two entries in table %u/%u\n", r, n); - r = CopyAcceleratorTable( hAccel, &ac[0], r ); - ok( r == n, "still should be two entries in table\n"); + r = CopyAcceleratorTable( hAccel, &ac[0], n ); + ok( r == n || broken(r == 2), /* win9x */ + "still should be two entries in table %u/%u\n", r, n); n=0; ok( ac[n].cmd == 1000, "cmd 0 not preserved\n"); ok( ac[n].key == 'A', "key 0 not preserved\n"); ok( ac[n].fVirt == (FVIRTKEY | FNOINVERT), "fVirt 0 not preserved\n"); - n++; + if (++n == r) goto done; ok( ac[n].cmd == 0xffff, "cmd 1 not preserved\n"); ok( ac[n].key == 0xffff, "key 1 not preserved\n"); ok( ac[n].fVirt == 0x007f, "fVirt 1 not changed\n"); - n++; + if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved\n"); ok( ac[n].key == 0x00ff, "key 2 not preserved\n"); ok( ac[n].fVirt == 0x0070, "fVirt 2 not changed\n"); - n++; + if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved\n"); ok( ac[n].key == 0x00ff, "key 3 not preserved\n"); ok( ac[n].fVirt == 0x0000, "fVirt 3 not changed\n"); - n++; + if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 4 not preserved\n"); ok( ac[n].key == 0xffff, "key 4 not preserved\n"); ok( ac[n].fVirt == 0x0001, "fVirt 4 not changed\n"); - +done: r = DestroyAcceleratorTable( hAccel ); ok( r, "destroy accelerator table\n"); hAccel = CreateAcceleratorTable( &ac[0], 0 ); - ok( !hAccel, "zero elements should fail\n"); + ok( !hAccel || broken(hAccel != NULL), /* nt4 */ "zero elements should fail\n"); /* these will on crash win2k hAccel = CreateAcceleratorTable( NULL, 1 ); @@ -230,6 +232,7 @@ static void test_accel2(void) { ACCEL ac[2], out[2]; HACCEL hac; + int res; ac[0].cmd = 0; ac[0].fVirt = 0; @@ -246,8 +249,8 @@ static void test_accel2(void) /* try a zero count */ hac = CreateAcceleratorTable( &ac[0], 0 ); - ok( !hac , "fail\n"); - ok( !DestroyAcceleratorTable( hac ), "destroy failed\n"); + ok( !hac || broken(hac != NULL), /* nt4 */ "fail\n"); + if (!hac) ok( !DestroyAcceleratorTable( hac ), "destroy failed\n"); /* creating one accelerator should work */ hac = CreateAcceleratorTable( &ac[0], 1 ); @@ -258,9 +261,12 @@ static void test_accel2(void) /* how about two of the same type? */ hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, NULL, 100 ), "copy null failed\n"); - ok( 2 == CopyAcceleratorTable( hac, NULL, 0 ), "copy null failed\n"); - ok( 2 == CopyAcceleratorTable( hac, NULL, 1 ), "copy null failed\n"); + res = CopyAcceleratorTable( hac, NULL, 100 ); + ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + res = CopyAcceleratorTable( hac, NULL, 0 ); + ok( res == 2, "copy null failed %d\n", res); + res = CopyAcceleratorTable( hac, NULL, 1 ); + ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -311,14 +317,18 @@ static void test_accel2(void) memset( ac, 0xff, sizeof ac ); hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); - ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); + res = CopyAcceleratorTable( hac, out, 2 ); + ok( res == 2 || broken(res == 1), /* win9x */ "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); ok( out[0].key == ac[0].key, "key modified\n"); - ok( out[1].cmd == ac[1].cmd, "cmd modified\n"); - ok( out[1].fVirt == (ac[1].fVirt&0x7f), "fVirt not modified\n"); - ok( out[1].key == ac[1].key, "key modified\n"); + if (res == 2) + { + ok( out[1].cmd == ac[1].cmd, "cmd modified\n"); + ok( out[1].fVirt == (ac[1].fVirt&0x7f), "fVirt not modified\n"); + ok( out[1].key == ac[1].key, "key modified\n"); + } ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); } @@ -343,9 +353,13 @@ static void test_PrivateExtractIcons(void) { cIcons = pPrivateExtractIconsA(szShell32Dll, 0, 16, 16, ahIcon, aIconId, 3, 0); ok(cIcons == 3, "Three icons requested got cIcons=%d\n", cIcons); - cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(32,16), MAKELONG(32,16), - ahIcon, aIconId, 3, 0); - ok(cIcons == 4, "Three icons requested, four expected, got cIcons=%d\n", cIcons); + /* count must be a multiple of two when getting two sizes */ + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), + ahIcon, aIconId, 3, 0); + ok(cIcons == 0 /* vista */ || cIcons == 4, "Three icons requested got cIcons=%d\n", cIcons); + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), + ahIcon, aIconId, 4, 0); + ok(cIcons == 4, "Four icons requested got cIcons=%d\n", cIcons); } static void test_LoadImage(void)

1 0

Henri Verbeet : d3d10: Implement D3D10CreateDevice() on top of D3D10CoreCreateDevice().
by Alexandre Julliard Nov. 14, 2008

Nov. 14, 2008

Module: wine Branch: master Commit: 81e92fc81cc52989d374ffb07dbd58ae68a887c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e92fc81cc52989d374ffb07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 14 13:57:06 2008 +0100 d3d10: Implement D3D10CreateDevice() on top of D3D10CoreCreateDevice(). --- dlls/Makefile.in | 5 ++ dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 93 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3d10/d3d10_private.h | 4 ++ dlls/d3d10core/Makefile.in | 1 + 5 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 56e0506..a5fcd6f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -199,6 +199,7 @@ IMPORT_LIBS = \ cryptui/libcryptui.$(IMPLIBEXT) \ ctl3d32/libctl3d32.$(IMPLIBEXT) \ d3d10/libd3d10.$(IMPLIBEXT) \ + d3d10core/libd3d10core.$(IMPLIBEXT) \ d3d8/libd3d8.$(IMPLIBEXT) \ d3d9/libd3d9.$(IMPLIBEXT) \ d3dim/libd3dim.$(IMPLIBEXT) \ @@ -341,6 +342,7 @@ CROSS_IMPLIBS = \ cryptui/libcryptui.a \ ctl3d32/libctl3d32.a \ d3d10/libd3d10.a \ + d3d10core/libd3d10core.a \ d3d8/libd3d8.a \ d3d9/libd3d9.a \ d3dim/libd3dim.a \ @@ -527,6 +529,9 @@ ctl3d32/libctl3d32.def ctl3d32/libctl3d32.a: ctl3d32/ctl3d32.spec $(WINEBUILD) d3d10/libd3d10.def d3d10/libd3d10.a: d3d10/d3d10.spec $(WINEBUILD) @cd d3d10 && $(MAKE) `basename $@` +d3d10core/libd3d10core.def d3d10core/libd3d10core.a: d3d10core/d3d10core.spec $(WINEBUILD) + @cd d3d10core && $(MAKE) `basename $@` + d3d8/libd3d8.def d3d8/libd3d8.a: d3d8/d3d8.spec $(WINEBUILD) @cd d3d8 && $(MAKE) `basename $@` diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 48d6f1e..3aef27d 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10.dll IMPORTLIB = d3d10 -IMPORTS = dxguid uuid dxgi kernel32 +IMPORTS = dxguid uuid d3d10core dxgi kernel32 C_SRCS = \ d3d10_main.c \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 053abd0..188d354 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -42,10 +42,99 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { - FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p stub!\n", + IDXGIFactory *factory; + HRESULT hr; + + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, device); - return E_NOTIMPL; + if (adapter) + { + IDXGIAdapter_AddRef(adapter); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to get dxgi factory, returning %#x\n", hr); + return hr; + } + } + else + { + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + if (FAILED(hr)) + { + WARN("Failed to create dxgi factory, returning %#x\n", hr); + return hr; + } + + switch(driver_type) + { + case D3D10_DRIVER_TYPE_HARDWARE: + { + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (FAILED(hr)) + { + WARN("No adapters found, returning %#x\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D10_DRIVER_TYPE_NULL: + FIXME("NULL device not implemented, falling back to refrast\n"); + case D3D10_DRIVER_TYPE_REFERENCE: + { + HMODULE refrast = LoadLibraryA("d3d10ref.dll"); + if (!refrast) + { + WARN("Failed to load refrast, returning E_FAIL\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, refrast, &adapter); + FreeLibrary(refrast); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + + case D3D10_DRIVER_TYPE_SOFTWARE: + { + if (!swrast) + { + WARN("Software device requested, but NULL swrast passed, returning E_FAIL\n"); + IDXGIFactory_Release(factory); + return E_FAIL; + } + hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); + if (FAILED(hr)) + { + WARN("Failed to create a software adapter, returning %#x\n", hr); + IDXGIFactory_Release(factory); + return hr; + } + break; + } + } + } + + hr = D3D10CoreCreateDevice(factory, adapter, flags, 0, device); + IDXGIAdapter_Release(adapter); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a device, returning %#x\n", hr); + return hr; + } + + TRACE("Created ID3D10Device %p\n", *device); + + return hr; } HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c3057af..46a4576 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -31,4 +31,8 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); +/* D3D10Core */ +HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, + UINT flags, DWORD unknown0, ID3D10Device **device); + #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index a55b591..c45ff3c 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10core.dll +IMPORTLIB = d3d10core IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \

1 0

Henri Verbeet : d3d10core: Implement D3D10CoreCreateDevice().
by Alexandre Julliard Nov. 14, 2008

Nov. 14, 2008

Module: wine Branch: master Commit: 3505b5cf17c402dc8e6f9c2455f287c53ccfce81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3505b5cf17c402dc8e6f9c245… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 14 13:57:06 2008 +0100 d3d10core: Implement D3D10CoreCreateDevice(). --- dlls/d3d10core/d3d10core.spec | 1 + dlls/d3d10core/d3d10core_main.c | 21 +++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec index 26c4ab3..9bf25b5 100644 --- a/dlls/d3d10core/d3d10core.spec +++ b/dlls/d3d10core/d3d10core.spec @@ -1 +1,2 @@ +@ stdcall D3D10CoreCreateDevice(ptr ptr long long ptr) @ stdcall D3D10CoreRegisterLayers() diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index e0b1eb6..6bc14c6 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -104,3 +104,24 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) return S_OK; } + +HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, + UINT flags, DWORD unknown0, ID3D10Device **device) +{ + IUnknown *dxgi_device; + HMODULE d3d10core; + HRESULT hr; + + d3d10core = GetModuleHandleA("d3d10core.dll"); + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, flags, unknown0, (void **)&dxgi_device); + if (FAILED(hr)) + { + WARN("Failed to create device, returning %#x\n", hr); + return hr; + } + + hr = IUnknown_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)device); + IUnknown_Release(dxgi_device); + + return hr; +} diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 16a4e71..b33845c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -75,6 +75,8 @@ struct dxgi_device_layer void *device_object, REFIID riid, void **device_layer); }; +HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, + UINT flags, DWORD unknown0, void **device); HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count); #endif /* __WINE_D3D10CORE_PRIVATE_H */

1 0

Henri Verbeet : d3d10: Use the factory that created the adapter to create a swapchain.
by Alexandre Julliard Nov. 14, 2008

Nov. 14, 2008

Module: wine Branch: master Commit: 70088c4ef323e41386c54c4ef4d9f4c5166564fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70088c4ef323e41386c54c4ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 14 13:57:07 2008 +0100 d3d10: Use the factory that created the adapter to create a swapchain. --- dlls/d3d10/d3d10_main.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 188d354..ad9651e 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -141,6 +141,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device) { + IDXGIDevice *dxgi_device; IDXGIFactory *factory; HRESULT hr; @@ -153,22 +154,40 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER if (FAILED(hr)) { WARN("Failed to create a device, returning %#x\n", hr); + *device = NULL; return hr; } TRACE("Created ID3D10Device %p\n", *device); - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device); if (FAILED(hr)) { + ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr); ID3D10Device_Release(*device); *device = NULL; + return hr; + } - WARN("Failed to create a DXGI factory, returning %#x\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + IDXGIDevice_Release(dxgi_device); + if (FAILED(hr)) + { + ERR("Failed to get the device adapter, returning %#x\n", hr); + ID3D10Device_Release(*device); + *device = NULL; return hr; } - TRACE("Created IDXGIFactory %p\n", factory); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + { + ERR("Failed to get the adapter factory, returning %#x\n", hr); + ID3D10Device_Release(*device); + *device = NULL; + return hr; + } hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)*device, swapchain_desc, swapchain); IDXGIFactory_Release(factory);

1 0

Henri Verbeet : dxgi: Implement DXGID3D10CreateDevice().
by Alexandre Julliard Nov. 14, 2008

Nov. 14, 2008

Module: wine Branch: master Commit: ddbd4ab3b83cd836e424969a8df87a48fce228c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbd4ab3b83cd836e424969a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 14 13:57:06 2008 +0100 dxgi: Implement DXGID3D10CreateDevice(). --- dlls/dxgi/device.c | 9 +++ dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 1 + 4 files changed, 144 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 195c502..fddc535 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice *iface, REFIID riid, void **object) { + struct dxgi_device *This = (struct dxgi_device *)iface; + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) @@ -39,6 +41,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice *iface, return S_OK; } + if (This->child_layer) + { + TRACE("forwarding to child layer %p\n", This->child_layer); + return IUnknown_QueryInterface(This->child_layer, riid, object); + } + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); *object = NULL; @@ -64,6 +72,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice *iface) if (!refcount) { + if (This->child_layer) IUnknown_Release(This->child_layer); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 974b830..d7f8aba 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,2 +1,3 @@ @ stdcall CreateDXGIFactory(ptr ptr) +@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 507eb04..d2de584 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -36,6 +36,7 @@ static CRITICAL_SECTION dxgi_cs = {&dxgi_cs_debug, -1, 0, 0, 0, 0}; struct dxgi_main { + HMODULE d3d10core; struct dxgi_device_layer *device_layers; UINT layer_count; LONG refcount; @@ -50,6 +51,9 @@ static void dxgi_main_cleanup(void) dxgi_main.device_layers = NULL; dxgi_main.layer_count = 0; + FreeLibrary(dxgi_main.d3d10core); + dxgi_main.d3d10core = NULL; + LeaveCriticalSection(&dxgi_cs); } @@ -97,6 +101,135 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) return hr; } +static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) +{ + UINT i; + + EnterCriticalSection(&dxgi_cs); + + for (i = 0; i < dxgi_main.layer_count; ++i) + { + if (dxgi_main.device_layers[i].id == id) + { + *layer = dxgi_main.device_layers[i]; + LeaveCriticalSection(&dxgi_cs); + return TRUE; + } + } + + LeaveCriticalSection(&dxgi_cs); + return FALSE; +} + +static HRESULT register_d3d10core_layers(HMODULE d3d10core) +{ + EnterCriticalSection(&dxgi_cs); + + if (!dxgi_main.d3d10core) + { + HRESULT hr; + HRESULT (WINAPI *d3d10core_register_layers)(void); + HMODULE mod; + BOOL ret; + + ret = GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)d3d10core, &mod); + if (!ret) + { + LeaveCriticalSection(&dxgi_cs); + return E_FAIL; + } + + d3d10core_register_layers = (HRESULT (WINAPI *)(void))GetProcAddress(mod, "D3D10CoreRegisterLayers"); + hr = d3d10core_register_layers(); + if (FAILED(hr)) + { + ERR("Failed to register d3d10core layers, returning %#x\n", hr); + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + dxgi_main.d3d10core = mod; + } + + LeaveCriticalSection(&dxgi_cs); + + return S_OK; +} + +HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, + UINT flags, DWORD unknown0, void **device) +{ + struct layer_get_size_args get_size_args; + struct dxgi_device *dxgi_device; + struct dxgi_device_layer d3d10_layer; + void *layer_base; + UINT device_size; + DWORD count; + HRESULT hr; + + TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %#x, device %p\n", + d3d10core, factory, adapter, flags, unknown0, device); + + hr = register_d3d10core_layers(d3d10core); + if (FAILED(hr)) + { + ERR("Failed to register d3d10core layers, returning %#x\n", hr); + return hr; + } + + if (!get_layer(DXGI_DEVICE_LAYER_D3D10_DEVICE, &d3d10_layer)) + { + ERR("Failed to get D3D10 device layer\n"); + return E_FAIL; + } + + count = 0; + hr = d3d10_layer.init(d3d10_layer.id, &count, NULL); + if (FAILED(hr)) + { + WARN("Failed to initialize D3D10 device layer\n"); + return E_FAIL; + } + + get_size_args.unknown0 = 0; + get_size_args.unknown1 = 0; + get_size_args.unknown2 = NULL; + get_size_args.unknown3 = NULL; + get_size_args.adapter = adapter; + get_size_args.interface_major = 10; + get_size_args.interface_minor = 1; + get_size_args.version_build = 4; + get_size_args.version_revision = 6000; + + device_size = d3d10_layer.get_size(d3d10_layer.id, &get_size_args, 0); + device_size += sizeof(*dxgi_device); + + dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); + if (!dxgi_device) + { + ERR("Failed to allocate device memory\n"); + return E_OUTOFMEMORY; + } + + dxgi_device->vtbl = &dxgi_device_vtbl; + dxgi_device->refcount = 1; + layer_base = dxgi_device + 1; + + hr = d3d10_layer.create(d3d10_layer.id, &layer_base, 0, + dxgi_device, &IID_IUnknown, (void **)&dxgi_device->child_layer); + if (FAILED(hr)) + { + WARN("Failed to create device, returning %#x\n", hr); + HeapFree(GetProcessHeap(), 0, dxgi_device); + *device = NULL; + return hr; + } + + *device = (IUnknown *)dxgi_device; + + return hr; +} + HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count) { UINT i; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 051cd87..27d7271 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -44,6 +44,7 @@ extern const struct IDXGIDeviceVtbl dxgi_device_vtbl; struct dxgi_device { const struct IDXGIDeviceVtbl *vtbl; + IUnknown *child_layer; LONG refcount; };

1 0

Henri Verbeet : dxgi: Implement DXGID3D10RegisterLayers().
by Alexandre Julliard Nov. 14, 2008

Nov. 14, 2008

Module: wine Branch: master Commit: 800fedc2581c3e5ae61ee3e2595b2c9fc8c1a2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800fedc2581c3e5ae61ee3e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 14 13:57:06 2008 +0100 dxgi: Implement DXGID3D10RegisterLayers(). --- dlls/dxgi/dxgi_main.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 62e6f92..507eb04 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -24,6 +24,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static CRITICAL_SECTION dxgi_cs; +static CRITICAL_SECTION_DEBUG dxgi_cs_debug = +{ + 0, 0, &dxgi_cs, + {&dxgi_cs_debug.ProcessLocksList, + &dxgi_cs_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": dxgi_cs")} +}; +static CRITICAL_SECTION dxgi_cs = {&dxgi_cs_debug, -1, 0, 0, 0, 0}; + +struct dxgi_main +{ + struct dxgi_device_layer *device_layers; + UINT layer_count; + LONG refcount; +}; +static struct dxgi_main dxgi_main; + +static void dxgi_main_cleanup(void) +{ + EnterCriticalSection(&dxgi_cs); + + HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); + dxgi_main.device_layers = NULL; + dxgi_main.layer_count = 0; + + LeaveCriticalSection(&dxgi_cs); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { TRACE("fdwReason %u\n", fdwReason); @@ -32,6 +61,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); + ++dxgi_main.refcount; + break; + + case DLL_PROCESS_DETACH: + if (!--dxgi_main.refcount) dxgi_main_cleanup(); break; } @@ -65,7 +99,40 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count) { - FIXME("layers %p, layer_count %u stub!\n", layers, layer_count); + UINT i; + struct dxgi_device_layer *new_layers; + + TRACE("layers %p, layer_count %u\n", layers, layer_count); + + EnterCriticalSection(&dxgi_cs); + + if (!dxgi_main.layer_count) + new_layers = HeapAlloc(GetProcessHeap(), 0, layer_count * sizeof(*new_layers)); + else + new_layers = HeapReAlloc(GetProcessHeap(), 0, dxgi_main.device_layers, + (dxgi_main.layer_count + layer_count) * sizeof(*new_layers)); + + if (!new_layers) + { + LeaveCriticalSection(&dxgi_cs); + ERR("Failed to allocate layer memory\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < layer_count; ++i) + { + const struct dxgi_device_layer *layer = &layers[i]; + + TRACE("layer %d: id %#x, init %p, get_size %p, create %p\n", + i, layer->id, layer->init, layer->get_size, layer->create); + + new_layers[dxgi_main.layer_count + i] = *layer; + } + + dxgi_main.device_layers = new_layers; + dxgi_main.layer_count += layer_count; + + LeaveCriticalSection(&dxgi_cs); - return E_NOTIMPL; + return S_OK; }

1 0