Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[tkreuzer] 31339: sync dbghelp.dll to wine head. should fix build
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:34:55 2007 New Revision: 31339 URL: http://svn.reactos.org/svn/reactos?rev=31339&view=rev Log: sync dbghelp.dll to wine head. should fix build Added: trunk/reactos/dll/win32/dbghelp/dwarf.c (with props) trunk/reactos/dll/win32/dbghelp/dwarf.h (with props) trunk/reactos/dll/win32/dbghelp/wdbgexts.h (with props) Removed: trunk/reactos/dll/win32/dbghelp/mscvpdb.h trunk/reactos/dll/win32/dbghelp/regex.h Modified: trunk/reactos/dll/win32/dbghelp/Makefile.in trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image.c trunk/reactos/dll/win32/dbghelp/memory.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/source.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/dll/win32/dbghelp/storage.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/Makefile… Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Added: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Added: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… Modified: trunk/reactos/dll/win32/dbghelp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image.c?… Modified: trunk/reactos/dll/win32/dbghelp/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/memory.c… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Removed: trunk/reactos/dll/win32/dbghelp/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/mscvpdb.… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Removed: trunk/reactos/dll/win32/dbghelp/regex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/regex.h?… Modified: trunk/reactos/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/source.c… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… Modified: trunk/reactos/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/storage.… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Added: trunk/reactos/dll/win32/dbghelp/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/wdbgexts…

1 0

[mpiulachs] 31338: spanish localizations by Remialdo <remialdo at gmail dot com> - Added: systeminfo, mazescr and msgina - Fix unterminated string in systeminfo/lang/es-ES.rc See issue #2905 for more details.
by mpiulachs＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: mpiulachs Date: Thu Dec 20 00:25:05 2007 New Revision: 31338 URL: http://svn.reactos.org/svn/reactos?rev=31338&view=rev Log: spanish localizations by Remialdo <remialdo at gmail dot com> - Added: systeminfo, mazescr and msgina - Fix unterminated string in systeminfo/lang/es-ES.rc See issue #2905 for more details. Added: trunk/reactos/dll/win32/msgina/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc (with props) trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc (with props) Modified: trunk/reactos/dll/win32/msgina/msgina.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/sysutils/systeminfo/rsrc.rc Added: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,61 @@ +/* + *Spanish Language resource file + * Javier Remacha 2007-12-06 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Por favor espere..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bienvenido a ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Presione la combinación Ctrl-Alt-Supr",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Acceder" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Aceptar",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar",IDCANCEL,115,122,50,14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Usuario:",IDC_STATIC,36,75,40,8 + LTEXT "Contraseña:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Seguridad" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Cancelar",IDCANCEL,170,95,70,14 + PUSHBUTTON "Salir",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN,170,76,70,14 + LTEXT "¿Qué quieres hacer?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Bloquear computadora",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Administrador de tareas",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "¡Bienvenido!" + IDS_LOCKEDSAS "La computadora está actualmente bloqueada." + IDS_PRESSCTRLALTDELETE "Presione Ctrl-Alt-Supr para acceder." + IDS_ASKFORUSER "Usuario: " + IDS_ASKFORPASSWORD "Contraseña: " + IDS_FORCELOGOFF "Esto cerrará al usuario actual y perderá todos los datos no guardados. ¿Desea Continuar?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Thu Dec 20 00:25:05 2007 @@ -19,3 +19,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc" Added: trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Laberinto" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Thu Dec 20 00:25:05 2007 @@ -14,3 +14,4 @@ #include "lang/en-US.rc" #include "lang/lt-LT.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc" Added: trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/e… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc (added) +++ trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,69 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-19 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S sistema [/U usuario [/P [contraseña]]]] [/FO formato] [/NH]\n\n\ +Description:\n\ + Esta herramienta de línea de comandos permite a un administrador preguntar\n\ + información básica de la configuración del sistema.\n\n\ +Lista de Parametros:\n\ + /S sistema Especifica el sistema remoto al cual conectarse.\n\n\ + /U [dominio\\]usuario Especifica el usuario bajo el cual el comando\n\ + debe ejecutarse.\n\n\ + /P [contraseña] Especifica la contraseña de usuario.\n\ + Pregunta por ella si es omitida.\n\n\ + /FO formato Especifica el formato en el que la salida\n\ + será mostrada.\n\ + Valores válidos: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Especifica que la \"Columna cabezera\" no será\n\ + mostrada en la salida.\n\ + Válido sólo para formatos \"TABLE\" y \"CSV\" .\n\n\ + /? Muestra esta ayuda.\n\n\ +Ejemplos:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S sistema\n\ + SYSTEMINFO /S sistema /U usuario\n\ + SYSTEMINFO /S sistema /U dominio\\usuario /P contraseña /FO TABLE\n\ + SYSTEMINFO /S sistema /FO LIST\n\ + SYSTEMINFO /S sistema /FO CSV /NH\n" + +IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" +IDS_OS_VERSION, "Versión Sistema Operativo: %d.%d.%d %s" +IDS_OS_BUILD, " Compilación %s\n" +IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" +IDS_REG_OWNER, "Propietario: %s\n" +IDS_REG_ORG, "Organización: %s\n" +IDS_PRODUCT_ID, "Identificador de Producto %s\n" +IDS_INST_DATE, "Fecha de Instalación: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "Tipo de sistema: Desconocido\n" +IDS_SYS_TYPE_X86, "Tipo de sistema: PC basado en X86\n" +IDS_SYS_TYPE_IA64, "Tipo de sistema: PC basado en IA64\n" +IDS_SYS_TYPE_AMD64, "Tipo de sistema: PC basado en AMD64\n" +IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" +IDS_ROS_DIR, "Directorio de ReactOS: %s\n" +IDS_SYS_DIR, "Directorio del Sistema: %s\n" +IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" +IDS_SYS_LOCALE, "Idioma del sistema: %s\n" +IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" +IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %ld MB (%ld KB)\n" +IDS_HOST_NAME, "Nombre del Servidor: %s\n" +IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación %s\n" +IDS_TIME_ZONE, "Zona horario: %s\n" +IDS_DOMINE, "Dominio: %s\n" +IDS_BIOS_DATE, "Fecha BIOS: %s\n" +IDS_BIOS_VERSION, "Versión BIOS: %s\n" +IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" + +END Propchange: trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/rsrc.r… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/rsrc.rc (original) +++ trunk/rosapps/sysutils/systeminfo/rsrc.rc Thu Dec 20 00:25:05 2007 @@ -4,3 +4,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/es-ES.rc"

1 0

[tkreuzer] 31337: - update dbghelp.h and cvconst.h from wine - update mscvpdb.h, winbase16.h and windef16.h wine headers - create wine/winbase.h containing SYSLEVEL struct - add regex.h to include/wine
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:11:06 2007 New Revision: 31337 URL: http://svn.reactos.org/svn/reactos?rev=31337&view=rev Log: - update dbghelp.h and cvconst.h from wine - update mscvpdb.h, winbase16.h and windef16.h wine headers - create wine/winbase.h containing SYSLEVEL struct - add regex.h to include/wine Added: trunk/reactos/include/reactos/wine/mscvpdb.h - copied, changed from r31291, trunk/reactos/dll/win32/dbghelp/mscvpdb.h trunk/reactos/include/reactos/wine/regex.h (with props) trunk/reactos/include/reactos/wine/winbase.h (with props) Modified: trunk/reactos/include/psdk/cvconst.h trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/reactos/wine/winbase16.h trunk/reactos/include/reactos/wine/windef16.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/cvconst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cvconst.h?rev… Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… Copied: trunk/reactos/include/reactos/wine/mscvpdb.h (from r31291, trunk/reactos/dll/win32/dbghelp/mscvpdb.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Added: trunk/reactos/include/reactos/wine/regex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/regex… Added: trunk/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… Modified: trunk/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… Modified: trunk/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde…

1 0

[gbrunmar] 31336: * Forgot the struct name change in self-pointer * Inited self-pointer
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:48:58 2007 New Revision: 31336 URL: http://svn.reactos.org/svn/reactos?rev=31336&view=rev Log: * Forgot the struct name change in self-pointer * Inited self-pointer Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Wed Dec 19 23:48:58 2007 @@ -88,6 +88,8 @@ pDirect3D9->unknown004583 = 0; pDirect3D9->unknown004589 = 0; + pDirect3D9->lpInt = pDirect3D9; + *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; return ERROR_SUCCESS; Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 23:48:58 2007 @@ -24,7 +24,7 @@ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; -/* 0x0024 */ struct _tagDIRECTD3D9_INT_ * lpInt; +/* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */

1 0

[gbrunmar] 31335: * Renamed internal IDirect3D9 structure * Made Direct3D9Impl's IUnknown interface more robust thanks to hpoussin * Inited more values in internal struct
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:44:43 2007 New Revision: 31335 URL: http://svn.reactos.org/svn/reactos?rev=31335&view=rev Log: * Renamed internal IDirect3D9 structure * Made Direct3D9Impl's IUnknown interface more robust thanks to hpoussin * Inited more values in internal struct Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Wed Dec 19 23:44:43 2007 @@ -14,6 +14,10 @@ static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; +LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) +{ + return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); +} BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) { @@ -58,12 +62,12 @@ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) { - LPDIRECTD3D9_INT pDirect3D9; + LPDIRECT3D9_INT pDirect3D9; if (ppDirect3D9 == 0) return DDERR_INVALIDPARAMS; - pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTD3D9_INT)); + pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECT3D9_INT)); if (0 == pDirect3D9) return DDERR_OUTOFMEMORY; @@ -75,7 +79,16 @@ pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->dwRefCnt = 1; - *ppDirect3D9 = (IDirect3D9*)pDirect3D9; + pDirect3D9->unknown004576 = 0; + pDirect3D9->unknown004578 = 0; + pDirect3D9->unknown004579 = 0; + pDirect3D9->unknown004580 = 0; + pDirect3D9->unknown004581 = 0; + pDirect3D9->unknown004582 = 0; + pDirect3D9->unknown004583 = 0; + pDirect3D9->unknown004589 = 0; + + *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; return ERROR_SUCCESS; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Wed Dec 19 23:44:43 2007 @@ -5,9 +5,13 @@ * PURPOSE: d3d9.dll helper functions * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#ifndef _D3D9_HELPERS_H_ +#define _D3D9_HELPERS_H_ -#include <d3d9.h> -#include <windows.h> +#include "d3d9_private.h" + +/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ +LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface); /* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); @@ -17,3 +21,5 @@ /* Creates a Direct3D9 object */ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); + +#endif // _D3D9_HELPERS_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 23:44:43 2007 @@ -5,20 +5,18 @@ * PURPOSE: IDirect3D9 implementation * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -#include "d3d9_private.h" +#include "d3d9_helpers.h" #include <debug.h> - -static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface); /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { - IDirect3D9Impl_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = &This->lpVtbl; return S_OK; } @@ -29,7 +27,7 @@ static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); ULONG ref = InterlockedIncrement(&This->dwRefCnt); return ref; @@ -37,7 +35,7 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); ULONG ref = InterlockedDecrement(&This->dwRefCnt); if (ref == 0) Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 23:44:43 2007 @@ -5,7 +5,10 @@ * PURPOSE: d3d9.dll helper functions * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#ifndef _D3D9_PRIVATE_H_ +#define _D3D9_PRIVATE_H_ +#define COBJMACROS #include <windows.h> #include <d3d9.h> @@ -15,7 +18,7 @@ extern const IDirect3D9Vtbl Direct3D9_Vtbl; -typedef struct _tagDIRECTD3D9_INT_ +typedef struct _tagDIRECT3D9_INT_ { /* 0x0000 */ const IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; @@ -4596,4 +4599,6 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ DWORD unknown004589; /*? 0x00000020 */ -} DIRECTD3D9_INT, *LPDIRECTD3D9_INT; +} DIRECT3D9_INT, *LPDIRECT3D9_INT; + +#endif // _D3D9_PRIVATE_H_

1 0

[cfinck] 31334: Change the umlauts to characters of the english alphabet, otherwise they aren't displayed correctly. See issue #2902 for more details.
by cfinck＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cfinck Date: Wed Dec 19 23:19:41 2007 New Revision: 31334 URL: http://svn.reactos.org/svn/reactos?rev=31334&view=rev Log: Change the umlauts to characters of the english alphabet, otherwise they aren't displayed correctly. See issue #2902 for more details. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Dec 19 23:19:41 2007 @@ -94,7 +94,7 @@ { 6, 12, - "Es gibt folgende Beschränkungen:", + "Es gibt folgende Beschraenkungen:", TEXT_NORMAL }, { @@ -335,7 +335,7 @@ { 6, 20, - "Dann druecken Sie die Eingabetaste, um eine Einstellung abzuändern.", + "Dann druecken Sie die Eingabetaste, um eine Einstellung abzuaendern.", TEXT_NORMAL }, {

1 0

[gbrunmar] 31333: Changed last IDirect3D9->QueryInterface() according to hpoussin's feedback
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:06:34 2007 New Revision: 31333 URL: http://svn.reactos.org/svn/reactos?rev=31333&view=rev Log: Changed last IDirect3D9->QueryInterface() according to hpoussin's feedback Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 23:06:34 2007 @@ -14,13 +14,16 @@ /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { + LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { IDirect3D9Impl_AddRef(iface); - *ppvObject = iface; + *ppvObject = &This->lpVtbl; return S_OK; } + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

[gbrunmar] 31332: Implemented IDirect3D9->QueryInterface()
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 22:49:10 2007 New Revision: 31332 URL: http://svn.reactos.org/svn/reactos?rev=31332&view=rev Log: Implemented IDirect3D9->QueryInterface() Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Wed Dec 19 22:49:10 2007 @@ -61,6 +61,7 @@ LPDIRECT3D9 D3D9Obj = 0; LPDIRECT3DCREATE9 DebugDirect3DCreate9 = 0; CHAR DebugMessageBuffer[DEBUG_MESSAGE_BUFFER_SIZE]; + UINT NoDebugSDKVersion = SDKVersion & 0x7FFFFFFF; UNIMPLEMENTED @@ -80,11 +81,11 @@ } } - if ((SDKVersion & 0x7FFFFFFF) != D3D_SDK_VERSION || (SDKVersion & 0x7FFFFFFF) != D3D9b_SDK_VERSION) + if (NoDebugSDKVersion != D3D_SDK_VERSION && NoDebugSDKVersion != D3D9b_SDK_VERSION) { if (SDKVersion & 0x80000000) { - FormatDebugString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, SDKVersion, D3D_SDK_VERSION); + FormatDebugString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, NoDebugSDKVersion, D3D_SDK_VERSION); OutputDebugStringA(DebugMessageBuffer); } @@ -98,13 +99,13 @@ BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; } return TRUE; Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Wed Dec 19 22:49:10 2007 @@ -5,6 +5,8 @@ <library>advapi32</library> <library>kernel32</library> + <library>uuid</library> + <library>dxguid</library> <file>d3d9.c</file> <file>d3d9_helpers.c</file> Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Wed Dec 19 22:49:10 2007 @@ -56,7 +56,7 @@ return 0; } -HRESULT CreateD3D9(IDirect3D9** ppDirect3D9) +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) { LPDIRECTD3D9_INT pDirect3D9; @@ -71,9 +71,9 @@ pDirect3D9->unknown000007 = 0; pDirect3D9->lpInt = 0; - //pDirect3D9->lpVtbl = &IDirect3D3_Vtbl; + pDirect3D9->lpVtbl = &Direct3D9_Vtbl; pDirect3D9->dwProcessId = GetCurrentThreadId(); - pDirect3D9->dwIntRefCnt = 1; + pDirect3D9->dwRefCnt = 1; *ppDirect3D9 = (IDirect3D9*)pDirect3D9; Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Wed Dec 19 22:49:10 2007 @@ -16,4 +16,4 @@ HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); /* Creates a Direct3D9 object */ -HRESULT CreateD3D9(IDirect3D9** ppDirect3D9); +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 22:49:10 2007 @@ -9,10 +9,17 @@ #include <debug.h> +static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface); + /* IDirect3D9: IUnknown implementation */ -static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppobj) +static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { - UNIMPLEMENTED + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) + { + IDirect3D9Impl_AddRef(iface); + *ppvObject = iface; + return S_OK; + } return E_NOINTERFACE; } @@ -146,7 +153,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviourFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, - IDirect3DDevice9** ppReturnedDeviceInterface) + struct IDirect3DDevice9** ppReturnedDeviceInterface) { UNIMPLEMENTED Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 22:49:10 2007 @@ -13,14 +13,16 @@ typedef IDirect3D9* (WINAPI *LPDIRECT3DCREATE9)(UINT); +extern const IDirect3D9Vtbl Direct3D9_Vtbl; + typedef struct _tagDIRECTD3D9_INT_ { -/* 0x0000 */ LPVOID lpVtbl; /* LPDIRECTD3D9 functoions table */ +/* 0x0000 */ const IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; -/* 0x001c */ DWORD unknown000007; /* 0x00000001 */ +/* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECTD3D9_INT_ * lpInt; -/* 0x0028 */ volatile LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ +/* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */ /* 0x0040 */ CHAR DeviceName[16];

1 0

[fireball] 31331: - Fix dangerous passing of possibly unterminated wide string to RtlQueryRegistryValues (by opening the keys and passing handle instead). - Fix incorrect string operation (assuming that the string is terminated). Spotted by hpoussin.
by fireball＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: fireball Date: Wed Dec 19 20:46:58 2007 New Revision: 31331 URL: http://svn.reactos.org/svn/reactos?rev=31331&view=rev Log: - Fix dangerous passing of possibly unterminated wide string to RtlQueryRegistryValues (by opening the keys and passing handle instead). - Fix incorrect string operation (assuming that the string is terminated). Spotted by hpoussin. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Dec 19 20:46:58 2007 @@ -268,8 +268,10 @@ { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; ULONG ServiceStart; - UNICODE_STRING ServiceImagePath; + UNICODE_STRING ServiceImagePath, CCSName; NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE CCSKey, ServiceKey; DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); @@ -277,6 +279,36 @@ if (ServiceName->Buffer == NULL) return STATUS_UNSUCCESSFUL; + /* Open CurrentControlSet */ + RtlInitUnicodeString(&CCSName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); + InitializeObjectAttributes(&ObjectAttributes, + &CCSName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&CCSKey, KEY_READ, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + return Status; + } + + /* Open service key */ + InitializeObjectAttributes(&ObjectAttributes, + ServiceName, + OBJ_CASE_INSENSITIVE, + CCSKey, + NULL); + Status = ZwOpenKey(&ServiceKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + ZwClose(CCSKey); + return Status; + } + /* * Get information about the service. */ @@ -293,12 +325,15 @@ QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[1].EntryContext = &ServiceImagePath; - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - ServiceName->Buffer, QueryTable, NULL, NULL); + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)ServiceKey, QueryTable, NULL, NULL); + + ZwClose(ServiceKey); + ZwClose(CCSKey); if (!NT_SUCCESS(Status)) { - DPRINT("RtlQueryRegistryValues() failed (Status %x)\n", Status); + DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); return Status; } @@ -412,9 +447,12 @@ wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); else wcscpy(NameBuffer, DRIVER_ROOT_NAME); - wcscat(NameBuffer, ServiceName->Buffer); RtlInitUnicodeString(&DriverName, NameBuffer); + DriverName.MaximumLength = sizeof(NameBuffer); + + RtlAppendUnicodeStringToString(&DriverName, ServiceName); + DPRINT("Driver name: '%wZ'\n", &DriverName); } else

1 0

[gbrunmar] 31330: Added stubs and vtable for IDirect3D9 implementation
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 20:41:05 2007 New Revision: 31330 URL: http://svn.reactos.org/svn/reactos?rev=31330&view=rev Log: Added stubs and vtable for IDirect3D9 implementation Added: trunk/reactos/dll/directx/d3d9/d3d9_impl.c (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Wed Dec 19 20:41:05 2007 @@ -8,5 +8,6 @@ <file>d3d9.c</file> <file>d3d9_helpers.c</file> + <file>d3d9_impl.c</file> <file>d3d9.rc</file> </module> Added: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 20:41:05 2007 @@ -1,0 +1,178 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_impl.c + * PURPOSE: IDirect3D9 implementation + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ +#include "d3d9_private.h" + +#include <debug.h> + +/* IDirect3D9: IUnknown implementation */ +static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppobj) +{ + UNIMPLEMENTED + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface) +{ + LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + ULONG ref = InterlockedIncrement(&This->dwRefCnt); + + return ref; +} + +static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) +{ + LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + ULONG ref = InterlockedDecrement(&This->dwRefCnt); + + if (ref == 0) + { + EnterCriticalSection(&This->d3d9_cs); + /* TODO: Free resources here */ + LeaveCriticalSection(&This->d3d9_cs); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/* IDirect3D9 interface */ +static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9 iface, void* pInitializeFunction) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9 iface) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, + D3DADAPTER_IDENTIFIER9* pIdentifier) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, + UINT Mode, D3DDISPLAYMODE* pMode) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE CheckType, + D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, + D3DFORMAT CheckFormat) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT SurfaceFormat, BOOL Windowed, + D3DMULTISAMPLE_TYPE MultiSampleType, DWORD* pQualityLevels) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, + D3DFORMAT DepthStencilFormat) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + IDirect3DDevice9** ppReturnedDeviceInterface) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +const IDirect3D9Vtbl Direct3D9_Vtbl = +{ + /* IUnknown */ + IDirect3D9Impl_QueryInterface, + IDirect3D9Impl_AddRef, + IDirect3D9Impl_Release, + + /* IDirect3D9 */ + IDirect3D9Impl_RegisterSoftwareDevice, + IDirect3D9Impl_GetAdapterCount, + IDirect3D9Impl_GetAdapterIdentifier, + IDirect3D9Impl_GetAdapterModeCount, + IDirect3D9Impl_EnumAdapterModes, + IDirect3D9Impl_GetAdapterDisplayMode, + IDirect3D9Impl_CheckDeviceType, + IDirect3D9Impl_CheckDeviceFormat, + IDirect3D9Impl_CheckDeviceMultiSampleType, + IDirect3D9Impl_CheckDepthStencilMatch, + IDirect3D9Impl_CheckDeviceFormatConversion, + IDirect3D9Impl_GetDeviceCaps, + IDirect3D9Impl_GetAdapterMonitor, + IDirect3D9Impl_CreateDevice +}; Propchange: trunk/reactos/dll/directx/d3d9/d3d9_impl.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 20:41:05 2007 @@ -20,7 +20,7 @@ /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECTD3D9_INT_ * lpInt; -/* 0x0028 */ DWORD dwIntRefCnt; /* Increases and decreases by AddRef() and Release() */ +/* 0x0028 */ volatile LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */ /* 0x0040 */ CHAR DeviceName[16];

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007