Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/05: [HDWWIZ] New pt_PT_Translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ddbf9a5528e4a84ee758… commit 0ddbf9a5528e4a84ee758894f2c1cc1490271ae4 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Aug 3 17:52:05 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:16 2019 +0200 [HDWWIZ] New pt_PT_Translation --- dll/cpl/hdwwiz/hdwwiz.rc | 3 ++ dll/cpl/hdwwiz/lang/pt-BR.rc | 2 +- dll/cpl/hdwwiz/lang/{pt-BR.rc => pt-PT.rc} | 66 ++++++++++++++++-------------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dll/cpl/hdwwiz/hdwwiz.rc b/dll/cpl/hdwwiz/hdwwiz.rc index b7be222d796..110e6cbe934 100644 --- a/dll/cpl/hdwwiz/hdwwiz.rc +++ b/dll/cpl/hdwwiz/hdwwiz.rc @@ -73,6 +73,9 @@ IDB_HEADER BITMAP "resources/header.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/cpl/hdwwiz/lang/pt-BR.rc b/dll/cpl/hdwwiz/lang/pt-BR.rc index 722ea4d9812..5f4249ff893 100644 --- a/dll/cpl/hdwwiz/lang/pt-BR.rc +++ b/dll/cpl/hdwwiz/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dll/cpl/hdwwiz/lang/pt-BR.rc b/dll/cpl/hdwwiz/lang/pt-PT.rc similarity index 62% copy from dll/cpl/hdwwiz/lang/pt-BR.rc copy to dll/cpl/hdwwiz/lang/pt-PT.rc index 722ea4d9812..4509027b13c 100644 --- a/dll/cpl/hdwwiz/lang/pt-BR.rc +++ b/dll/cpl/hdwwiz/lang/pt-PT.rc @@ -1,3 +1,9 @@ + +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 03-08-2019 zecarlos1957(a)hotmail.com + */ + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 @@ -6,11 +12,11 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo ao 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "Este assistente o ajuda a:", -1, 114, 40, 182, 8 - LTEXT "1) Instalar software para dar suporte ao hardware adicionado ao computador.", -1, 121, 56, 184, 16 + LTEXT "Este assistente auxilia a:", -1, 114, 40, 182, 8 + LTEXT "1) Instalar software de suporte ao hardware adicionado ao computador.", -1, 121, 56, 184, 16 LTEXT "2) Solucionar problemas que possam estar ocorrendo no hardware.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "Se houver um CD de instalação para o item de hardware, clique em 'Cancelar' para fechar este assistente e use o CD do fabricante para instalar o hardware.", 503, 150, 106, 155, 50 + LTEXT "Se tem um CD de instalação para o novo hardware, clique em 'Cancelar' para fechar este assistente e utilizar o CD do fabricante para instalar este hardware.", 503, 150, 106, 155, 50 LTEXT "Para continuar, clique em 'Avançar'.", -1, 114, 166, 193, 8 END @@ -28,9 +34,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Você já conectou este hardware ao computador?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Sim, eu já conectei o hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "Não, eu não adicionei o &hardware ainda", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Já ligou este hardware ao computador?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Sim, já liguei o hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "Não, ainda não liguei o &hardware", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 @@ -38,7 +44,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Na lista abaixo, selecione um dispositivo de hardware instalado e clique em 'Avançar' para verificar as propriedades ou solucionar problemas.", -1, 21, 8, 275, 22 + LTEXT "A partir da lista abaixo, seleccione o dispositivo de hardware instalado, em seguida clique em 'Avançar' para verificar as propriedades ou solucionar problemas.", -1, 21, 8, 275, 22 LTEXT "Para adicionar itens de hardware que não estejam na lista, clique em 'Adicionar novo dispositivo de hardware'.", -1, 21, 32, 275, 24 LTEXT "&Hardware instalado:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 @@ -49,10 +55,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "O assistente pode procurar outros itens de hardware e instalá-los automaticamente, ou, se você souber exatamente o modelo de hardware que deseja instalar, poderá selecioná-lo na lista.", -1, 21, 8, 280, 24 - LTEXT "O que você deseja que o assistente faça?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Procurar e instalar automaticamente o hardware (recomendável)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "&Instalar o hardware que eu selecionar manualmente em uma lista (avançado)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "O assistente pode procurar outros itens de hardware e instalá-los automaticamente, ou, se souber exactamente o modelo de hardware que deseja instalar, poderá seleccioná-lo na lista.", -1, 21, 8, 280, 24 + LTEXT "O que deseja que o assistente faça?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Procurar e instalar automaticamente o hardware (recomendado)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Instalar o hardware que eu seleccionar manualmente na lista (avançado)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 @@ -70,7 +76,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Se você não estiver vendo a categoria de hardware que deseja, clique em 'Mostrar todos os dispositivos'.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Se não conseguir ver a categoria de hardware que deseja instalar, clique em 'Mostrar todos os dispositivos'.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Tipos comuns de &hardware:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END @@ -92,10 +98,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "O 'Assistente para adicionar hardware' foi completado com sucesso.", -1, 114, 32, 193, 19 + LTEXT "A concluir o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "O 'Assistente para adicionar hardware' foi executado com sucesso.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "Para fechar o assistente, clique em 'Concluir'.", -1, 114, 166, 132, 8 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 @@ -104,8 +110,8 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "O assistente encontrou o seguinte hardware conectado ao seu computador:", -1, 114, 32, 193, 19 - LTEXT "Para fechar o assistente, clique em 'Concluir'.", -1, 114, 166, 132, 8 + LTEXT "O assistente encontrou o seguinte hardware ligado ao computador:", -1, 114, 32, 193, 19 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END @@ -115,9 +121,9 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Este é o status atual do hardware selecionado:", -1, 114, 40, 193, 19 + LTEXT "Este é o status actual do hardware selecionado:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Para começar a solucionar os problemas que possam estar ocorrendo, clique em 'Concluir'.", -1, 114, 136, 193, 16 + LTEXT "Para começar a solucionar os problemas que possam estar a ocorrer, clique em 'Finalizar'.", -1, 114, 136, 193, 16 LTEXT "Para fechar o assistente, clique em 'Cancelar'.", IDC_STATUSTEXT, 114, 166, 132, 8 END @@ -126,22 +132,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Não é possível continuar o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "Para continuar, conecte este item de hardware ao computador.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Desligar o computador quando eu clicar em 'Concluir' para que eu possa abrir o computador e conectar o hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "Na maioria dos casos, o ReactOS irá instalar automaticamente o hardware depois que você o conectar. Se o hardware não for encontrado, você poderá abrir novamente o assistente para instalar o software de suporte.", -1, 114, 98, 193, 32 - LTEXT "Para fechar o assistente, clique em 'Concluir'.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Não é possível continuar com o 'Assistente'", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Para continuar, ligue o novo hardware ao computador.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Desligar o computador quando eu clico em 'Finalizar' para que possa abrir o computador e ligar o hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "Na maioria dos casos, o ReactOS instala automaticamente o hardware após o ligar ao computador. Se o ReactOS não o encontrar poderá reabrir este assistente para instalar o software de suporte.", -1, 114, 98, 193, 32 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Adicionar hardware" - IDS_CPLDESCRIPTION "Adiciona hardware ao seu computador." - IDS_SEARCHTITLE "Aguarde enquanto o assistente faz uma pesquisa..." - IDS_SEARCHTEXT "O assistente está procurando itens de hardware conectados ao computador que ainda não tenham sido instalados." - IDS_ISCONNECTED "O hardware está conectado?" - IDS_PROBELISTTITLE "O hardware a seguir já está instalado no computador" + IDS_CPLDESCRIPTION "Adiciona hardware ao computador." + IDS_SEARCHTITLE "Aguarde enquanto o assistente faz a pesquisa..." + IDS_SEARCHTEXT "O assistente está a procurar novo hardware ligado ao computador que ainda não tenha sido instalado." + IDS_ISCONNECTED "O hardware está ligado?" + IDS_PROBELISTTITLE "O seguinte hardware já está instalado no computador" IDS_ADDNEWDEVICE "Adicionar novo dispositivo de hardware" IDS_SELECTWAYTITLE "Este assistente pode ajudá-lo a instalar outro hardware" - IDS_HDTYPESTITLE "Na lista abaixo, seleciona o tipo de hardware que você está instalando" + IDS_HDTYPESTITLE "Na lista abaixo, seleccione o tipo de hardware que está a instalar" END

5 years, 1 month

[reactos] 01/01: [FREELDR] Add PCI BIOS emulation and PCI bus enumeration for Xbox (#1830)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c08beef1cf6cce3e69696… commit c08beef1cf6cce3e69696f6f1b32f8e04fc6d448 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 16 20:14:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 16 19:14:10 2019 +0200 [FREELDR] Add PCI BIOS emulation and PCI bus enumeration for Xbox (#1830) CORE-16216 CORE-16308 --- boot/freeldr/freeldr/arch/i386/hwpci.c | 6 ++++-- boot/freeldr/freeldr/arch/i386/machpc.c | 1 + boot/freeldr/freeldr/arch/i386/machxbox.c | 14 ++++++++++++++ boot/freeldr/freeldr/include/arch/pc/hardware.h | 6 ++++++ boot/freeldr/freeldr/include/arch/pc/machpc.h | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index 8e6062da061..c5aa14a1333 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -24,6 +24,8 @@ DBG_DEFAULT_CHANNEL(HWDETECT); +FIND_PCI_BIOS FindPciBios = NULL; + static PPCI_IRQ_ROUTING_TABLE GetPciIrqRoutingTable(VOID) @@ -75,8 +77,8 @@ GetPciIrqRoutingTable(VOID) } -static BOOLEAN -FindPciBios(PPCI_REGISTRY_INFO BusData) +BOOLEAN +PcFindPciBios(PPCI_REGISTRY_INFO BusData) { REGS RegsIn; REGS RegsOut; diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 0d17add29c6..ede5441dfae 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -1353,6 +1353,7 @@ PcHwDetect(VOID) // TODO: Discover and set the machine type as the Component->Identifier GetHarddiskConfigurationData = PcGetHarddiskConfigurationData; + FindPciBios = PcFindPciBios; /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 139f5719251..4b96228f1cf 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -23,6 +23,18 @@ DBG_DEFAULT_CHANNEL(HWDETECT); +BOOLEAN +XboxFindPciBios(PPCI_REGISTRY_INFO BusData) +{ + /* We emulate PCI BIOS here, there are 2 known working PCI buses on an original Xbox */ + + BusData->NoBuses = 2; + BusData->MajorRevision = 1; + BusData->MinorRevision = 0; + BusData->HardwareMechanism = 1; + return TRUE; +} + VOID XboxGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) { @@ -175,8 +187,10 @@ XboxHwDetect(VOID) FldrCreateSystemKey(&SystemKey); GetHarddiskConfigurationData = XboxGetHarddiskConfigurationData; + FindPciBios = XboxFindPciBios; /* TODO: Build actual xbox's hardware configuration tree */ + DetectPciBios(SystemKey, &BusNumber); DetectIsaBios(SystemKey, &BusNumber); TRACE("DetectHardware() Done\n"); diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h index 76a9bb5feda..bc6aad11971 100644 --- a/boot/freeldr/freeldr/include/arch/pc/hardware.h +++ b/boot/freeldr/freeldr/include/arch/pc/hardware.h @@ -38,6 +38,12 @@ PCM_PARTIAL_RESOURCE_LIST extern GET_HARDDISK_CONFIG_DATA GetHarddiskConfigurationData; +typedef +BOOLEAN +(*FIND_PCI_BIOS)(PPCI_REGISTRY_INFO BusData); + +extern FIND_PCI_BIOS FindPciBios; + VOID DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, PCONFIGURATION_COMPONENT_DATA BusKey); diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index fb8284fe763..e07eab29a9c 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -49,6 +49,7 @@ VOID PcVideoPrepareForReactOS(VOID); VOID PcPrepareForReactOS(VOID); PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize); +BOOLEAN PcFindPciBios(PPCI_REGISTRY_INFO BusData); BOOLEAN DiskResetController(UCHAR DriveNumber); BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize);

5 years, 1 month

[reactos] 01/01: [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f7575909f7730aca9112… commit 5f7575909f7730aca9112e7b736951c9cc6e9fea Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Aug 16 20:11:04 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 16 19:11:04 2019 +0200 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826) Rename RosAudioSrv to AudioSrv in audio service itself and in all system components which are related to this, same as it done in Win2k3. It allows MS DxDiag to detect the system audio service correctly, so it becomes possible to run DirectSound test properly with MS dsound.dll, although it works with some minor errors and only in older VirtualBox versions, ~ up to 5.1.38 (and in other emulators as well). CORE-16307 --- base/services/audiosrv/audiosrv.txt | 14 +++++++------- boot/bootdata/hivesys.inf | 16 ++++++++-------- dll/cpl/mmsys/mmsys.c | 4 ++-- sdk/include/reactos/libs/audiosrv/audiosrv.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/base/services/audiosrv/audiosrv.txt b/base/services/audiosrv/audiosrv.txt index 7d3fa23ef13..37c9d24d24b 100644 --- a/base/services/audiosrv/audiosrv.txt +++ b/base/services/audiosrv/audiosrv.txt @@ -19,18 +19,18 @@ subsequently passes to wdmaud.drv It is not necessary to duplicate the exact structure of this mapped file, since it appears to only be used internally by Windows components. -The ROS Audio Service (RosAudioSrv) is intended to be able to run +The ROS Audio Service (AudioSrv) is intended to be able to run alongside the Windows Audio Service on XP/Vista, so it should be possible to test in a "known working environment" ;) It will create a mutex, to: 1) Allow synchronization when accessing the device list -2) Provide a simple method of identifying if RosAudioSrv is running +2) Provide a simple method of identifying if AudioSrv is running (It might be worth using an event to notify WinMM when things are happening?) -The intention is to make RosAudioSrv receive PnP notifications for +The intention is to make AudioSrv receive PnP notifications for relevant audio devices, and also let AudioSrv in Windows do this. Then it should be possible to create a small application that imitates WinMM's actions :) @@ -54,12 +54,12 @@ Testing the Service =================== The service can be installed on Windows XP (possibly also Vista) like so: -sc create RosAudioSrv <path to audiosrv.exe> -net start RosAudioSrv +sc create AudioSrv <path to audiosrv.exe> +net start AudioSrv ...and can be removed like so: -net stop RosAudioSrv -sc delete RosAudioSrv +net stop AudioSrv +sc delete AudioSrv You can view a list of the currently available devices (device list is identical to the one offered by Windows' own AudioSrv) by running diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 8f65a0ac783..dde3a8e9fd8 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1521,14 +1521,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001 ; Audio Service -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE% -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION% -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Type",0x00010001,0x00000010 ; Background Intelligent Transfer Service (BITS) HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,%BITS_SERVICE% diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index e2d7c8e5391..7b8ab726446 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -553,10 +553,10 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) return ERROR_DI_DO_DEFAULT; } - hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS); + hService = OpenService(hSCManager, L"AudioSrv", SERVICE_ALL_ACCESS); if (hService) { - /* Make RosAudioSrv start automatically */ + /* Make AudioSrv start automatically */ ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); StartService(hService, 0, NULL); diff --git a/sdk/include/reactos/libs/audiosrv/audiosrv.h b/sdk/include/reactos/libs/audiosrv/audiosrv.h index 057ce3e4300..016f9cddd54 100644 --- a/sdk/include/reactos/libs/audiosrv/audiosrv.h +++ b/sdk/include/reactos/libs/audiosrv/audiosrv.h @@ -11,8 +11,8 @@ #ifndef AUDIOSRV_H #define AUDIOSRV_H -/* This is currently set to avoid conflicting service names in Windows! */ -#define SERVICE_NAME L"RosAudioSrv" +/* The service name */ +#define SERVICE_NAME L"AudioSrv" /* A named mutex is used for synchronizing access to the device list. If this mutex doesn't exist, it means the audio service isn't running. */

5 years, 1 month

[reactos] 01/01: [USBOHCI_NEW] Refactor OHCI_AbortTransfer function

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a8fc2b411ad7b9676ed7… commit 2a8fc2b411ad7b9676ed776dd25773289a141dbd Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 28 02:38:10 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Aug 16 19:08:04 2019 +0200 [USBOHCI_NEW] Refactor OHCI_AbortTransfer function - Added SAL annotation - Simplified local variables - Replace counterintuitive `do {} while ()` loops with nice `for` loops - Get rid of goto and its label, it can be simply avoided --- drivers/usb/usbohci_new/usbohci.c | 111 ++++++++++++++------------------------ 1 file changed, 40 insertions(+), 71 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index b68cc4081cc..39986e47070 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1660,6 +1660,14 @@ OHCI_ProcessDoneIsoTD(IN POHCI_EXTENSION OhciExtension, DPRINT1("OHCI_ProcessDoneIsoTD: UNIMPLEMENTED. FIXME\n"); } +/** + * @brief Aborts the transfer descriptor chain in a given endpoint + * + * @param[in] ohciExtension The ohci extension + * @param[in] ohciEndpoint The ohci endpoint + * @param[in] ohciTransfer The ohci transfer + * @param[out] CompletedLength + */ VOID NTAPI OHCI_AbortTransfer(IN PVOID ohciExtension, @@ -1670,32 +1678,19 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, POHCI_EXTENSION OhciExtension = ohciExtension; POHCI_ENDPOINT OhciEndpoint = ohciEndpoint; POHCI_TRANSFER OhciTransfer = ohciTransfer; - POHCI_TRANSFER TmpTransfer; - POHCI_HCD_ED ED; + POHCI_HCD_ED ED = OhciEndpoint->HcdED; ULONG_PTR NextTdPA; - POHCI_HCD_TD NextTD; - POHCI_HCD_TD TD; - POHCI_HCD_TD PrevTD; - POHCI_HCD_TD LastTD; - POHCI_HCD_TD td = NULL; + POHCI_HCD_TD TD, NextTD, LastTD; ULONG ix; - BOOLEAN IsIsoEndpoint = FALSE; + BOOLEAN IsIsoEndpoint; BOOLEAN IsProcessed = FALSE; DPRINT("OHCI_AbortTransfer: ohciEndpoint - %p, ohciTransfer - %p\n", OhciEndpoint, OhciTransfer); - if (OhciEndpoint->EndpointProperties.TransferType == - USBPORT_TRANSFER_TYPE_ISOCHRONOUS) - { - IsIsoEndpoint = TRUE; - } - - ED = OhciEndpoint->HcdED; - NextTdPA = ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_MASK; - - NextTD = RegPacket.UsbPortGetMappedVirtualAddress(NextTdPA, + IsIsoEndpoint = (OhciEndpoint->EndpointProperties.TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS); + NextTD = RegPacket.UsbPortGetMappedVirtualAddress(ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_MASK, OhciExtension, OhciEndpoint); @@ -1703,6 +1698,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, { LastTD = OhciTransfer->NextTD; + /* Keeping the carry bit from previous pointer value */ ED->HwED.HeadPointer = LastTD->PhysicalAddress | (ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_CARRY); @@ -1712,94 +1708,67 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, { TD = &OhciEndpoint->FirstTD[ix]; - if (TD->OhciTransfer == OhciTransfer) - { - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); - else - OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); - } + if (TD->OhciTransfer != OhciTransfer) + continue; + + if (IsIsoEndpoint) + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); + else + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); } *CompletedLength = OhciTransfer->TransferLen; return; } - TD = OhciEndpoint->HcdHeadP; - - if (TD == NextTD) - goto Exit; + if (NextTD == OhciEndpoint->HcdHeadP) + IsProcessed = TRUE; - do + for (TD = OhciEndpoint->HcdHeadP; TD != NextTD; TD = TD->NextTDVa) { - if (TD->OhciTransfer == ohciTransfer) - { - PrevTD = TD; - TD = TD->NextTDVa; - - if (PrevTD == OhciEndpoint->HcdHeadP) - OhciEndpoint->HcdHeadP = TD; + if (TD->OhciTransfer != OhciTransfer) + continue; - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); - else - OHCI_ProcessDoneTD(OhciExtension, PrevTD, FALSE); + if (OhciEndpoint->HcdHeadP == TD) + OhciEndpoint->HcdHeadP = TD->NextTDVa; - IsProcessed = TRUE; - } + if (IsIsoEndpoint) + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); else - { - TD = TD->NextTDVa; - } + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); + + IsProcessed = TRUE; } - while (TD != NextTD); if (!IsProcessed) { - TD = OhciEndpoint->HcdHeadP; - - LastTD = TD; - td = NULL; - - while (TD != OhciEndpoint->HcdTailP) + for (TD = OhciEndpoint->HcdHeadP; TD->OhciTransfer != OhciTransfer; TD = TD->NextTDVa) { - if (TD->OhciTransfer == OhciTransfer) + if (TD == OhciEndpoint->HcdTailP) { - td = TD; + TD = NULL; break; } - LastTD = TD; - - TD = TD->NextTDVa; } - TD = td; - - do + for (; TD->OhciTransfer == OhciTransfer; TD = TD->NextTDVa) { if (TD == OhciEndpoint->HcdTailP) break; - PrevTD = TD; - TD = TD->NextTDVa; - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); else - OHCI_ProcessDoneTD(OhciExtension, PrevTD, FALSE); + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); } - while (TD->OhciTransfer == OhciTransfer); - TmpTransfer = LastTD->OhciTransfer; - TmpTransfer->NextTD = TD; + LastTD->OhciTransfer->NextTD = TD; LastTD->NextTDVa = TD; LastTD->HwTD.gTD.NextTD = TD->PhysicalAddress; } -Exit: - *CompletedLength = OhciTransfer->TransferLen; if (OhciTransfer->TransferLen)

5 years, 1 month

[reactos] 01/01: [COMCTL32] Export LoadIconMetric and LoadIconWithScaleDown

by Andrew Boyarshin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a8459767965cb948eb29… commit 0a8459767965cb948eb29303ef904002f3049e0a Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Sun Nov 25 13:47:11 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 18:31:07 2019 +0200 [COMCTL32] Export LoadIconMetric and LoadIconWithScaleDown They are already implemented and there is little sense for them to be hidden. Required for ProcessHacker 3.0+. --- dll/win32/comctl32/comctl32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/comctl32.spec b/dll/win32/comctl32/comctl32.spec index b7715531819..99d7ea4599e 100644 --- a/dll/win32/comctl32/comctl32.spec +++ b/dll/win32/comctl32/comctl32.spec @@ -181,3 +181,5 @@ ; Exported in v6 but not v5 @ stdcall DrawShadowText(long wstr long ptr long long long long long) +@ stdcall -version=0x600+ LoadIconWithScaleDown(long wstr long long long) +@ stdcall -version=0x600+ LoadIconMetric(long wstr long long)

5 years, 1 month

[reactos] 01/01: [HAL] Add Xbox Hardware Abstraction Layer

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d57e396553423cb21e35… commit 5d57e396553423cb21e35d384e9f4d4f1feb95a5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Aug 12 12:23:25 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 18:28:52 2019 +0200 [HAL] Add Xbox Hardware Abstraction Layer - Create xbox.cmake based on legacy.cmake and pic.cmake - Revive Xbox HAL files and add them to the build - Fix boot with Xbox HAL, add missing parts from halinit_up.c - Code style and debug logging improvements in pcibus.c - Allow to choose Xbox HAL in usetup CORE-16216 --- boot/bootdata/txtsetup.sif | 6 ++++++ hal/halx86/CMakeLists.txt | 2 ++ hal/halx86/legacy/bus/pcibus.c | 18 +++++++++--------- hal/halx86/xbox.cmake | 34 ++++++++++++++++++++++++++++++++++ hal/halx86/xbox/halinit_xbox.c | 25 +++++++++++++++++++++++-- 5 files changed, 74 insertions(+), 11 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index e86b59f6a3f..22d0b045a41 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -224,6 +224,7 @@ pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" +xbox = "Original Xbox" [Map.Computer] ;<id> = <pnp id string> @@ -231,6 +232,7 @@ pci_up = "PC UP" ;pci_mp = "PC MP" acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" +xbox = "Xbox" [Files.pci_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 @@ -248,6 +250,10 @@ halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 ;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.xbox] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 + [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<height>,<width>,<bpp> vga = "VGA Display (640x480x4)",,Vga,640,480,4 diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index f4148eb5ec0..7ed08815974 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -55,6 +55,7 @@ if(ARCH STREQUAL "i386") include(legacy.cmake) include(up.cmake) include(pic.cmake) + include(xbox.cmake) add_subdirectory(minihal) # hal @@ -62,6 +63,7 @@ if(ARCH STREQUAL "i386") add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) + add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS generic up xbox) #add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic) #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index c06f0bafec5..93ed9cb5ca1 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -368,12 +368,12 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, * video card, so it appears to be present on 1:0:0 - 1:31:0. * We hack around these problems by indicating "device not present" for devices * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) { - DPRINT("Blacklisted PCI slot\n"); - if (0 == Offset && sizeof(USHORT) <= Length) + DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + if (Offset == 0 && Length >= sizeof(USHORT)) { *(PUSHORT)Buffer = PCI_INVALID_VENDORID; return sizeof(USHORT); @@ -460,11 +460,11 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, * video card, so it appears to be present on 1:0:0 - 1:31:0. * We hack around these problems by indicating "device not present" for devices * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) { - DPRINT1("Trying to set data on blacklisted PCI slot\n"); + DPRINT1("Trying to set data on blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); return 0; } #endif diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake new file mode 100644 index 00000000000..d21cb602894 --- /dev/null +++ b/hal/halx86/xbox.cmake @@ -0,0 +1,34 @@ + +list(APPEND HAL_XBOX_ASM_SOURCE + generic/systimer.S + generic/trap.S + up/pic.S) + +list(APPEND HAL_XBOX_SOURCE + legacy/bus/bushndlr.c + legacy/bus/cmosbus.c + legacy/bus/isabus.c + legacy/bus/pcibus.c + ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c + ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c + legacy/bus/sysbus.c + legacy/bussupp.c + legacy/halpnpdd.c + legacy/halpcat.c + generic/profil.c + generic/timer.c + xbox/part_xbox.c + xbox/halinit_xbox.c + up/pic.c) + +add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) +add_object_library(lib_hal_xbox ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) +if(NOT SARCH STREQUAL "xbox") + add_target_compile_definitions(lib_hal_xbox SARCH_XBOX) +endif() +add_dependencies(lib_hal_xbox bugcodes xdk asm) +#add_pch(lib_hal_xbox xbox/halxbox.h) + +if(MSVC) + target_link_libraries(lib_hal_xbox lib_hal_generic) +endif() diff --git a/hal/halx86/xbox/halinit_xbox.c b/hal/halx86/xbox/halinit_xbox.c index a950c988460..9069c5d64a2 100644 --- a/hal/halx86/xbox/halinit_xbox.c +++ b/hal/halx86/xbox/halinit_xbox.c @@ -15,9 +15,11 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ******************************************************************/ + const USHORT HalpBuildType = HAL_BUILD_TYPE; -/* FUNCTIONS ***************************************************************/ +/* FUNCTIONS ****************************************************************/ VOID NTAPI @@ -30,14 +32,33 @@ HalpInitProcessor( } VOID -HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + /* Initialize Xbox-specific disk hacks */ HalpXboxInitPartIo(); } VOID HalpInitPhase1(VOID) { + /* Enable IRQ 0 */ + HalpEnableInterruptHandler(IDT_DEVICE, + 0, + PRIMARY_VECTOR_BASE, + CLOCK2_LEVEL, + HalpClockInterrupt, + Latched); + + /* Enable IRQ 8 */ + HalpEnableInterruptHandler(IDT_DEVICE, + 0, + PRIMARY_VECTOR_BASE + 8, + PROFILE_LEVEL, + HalpProfileInterrupt, + Latched); + + /* Initialize DMA. NT does this in Phase 0 */ + HalpInitDma(); } /* EOF */

5 years, 1 month

[reactos] 01/01: [JSCRIPT] import wine commits "stub + implement Enumerator()"

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83dcae1e0f7f602a2e978… commit 83dcae1e0f7f602a2e978a5308cc9437d4127855 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Fri Apr 19 21:00:27 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:37:32 2019 +0200 [JSCRIPT] import wine commits "stub + implement Enumerator()" https://source.winehq.org/git/wine.git/commit/6630bc4096870d1586e6d431b93dd… https://source.winehq.org/git/wine.git/commit/a015c626438dc8cba445242c68d41… CORE-13810 --- dll/win32/jscript/CMakeLists.txt | 1 + dll/win32/jscript/enumerator.c | 348 +++++++++++++++++++++++++++++++++++++++ dll/win32/jscript/global.c | 17 +- dll/win32/jscript/jscript.h | 4 + dll/win32/jscript/object.c | 2 +- dll/win32/jscript/resource.h | 1 + 6 files changed, 364 insertions(+), 9 deletions(-) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index cb4041f0020..826800bacf9 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE decode.c dispex.c engine.c + enumerator.c error.c function.c global.c diff --git a/dll/win32/jscript/enumerator.c b/dll/win32/jscript/enumerator.c new file mode 100644 index 00000000000..5c06efd1f9b --- /dev/null +++ b/dll/win32/jscript/enumerator.c @@ -0,0 +1,348 @@ +/* + * Copyright 2019 Andreas Maier + * + * 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 + */ + +#include <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; + BOOL atend; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +{ + HRESULT hres; + VARIANT nextitem; + + if (This->atend) + return S_OK; + + /* dont leak pervious value */ + jsval_release(This->item); + + /* not at end ... get next item */ + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (hres == S_OK) + { + hres = variant_to_jsval(&nextitem, &This->item); + VariantClear(&nextitem); + if (FAILED(hres)) + { + WARN("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + return hres; + } + } + else + { + This->item = jsval_undefined(); + This->atend = TRUE; + } + + return S_OK; +} + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + EnumeratorInstance *This = enumerator_from_jsdisp(dispex); + + TRACE("\n"); + + jsval_release(This->item); + heap_free(dispex); +} + +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + TRACE("%d\n", This->atend); + + if (r) + *r = jsval_bool(This->atend); + return S_OK; +} + +static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + return r ? jsval_copy(This->item, r) : S_OK; +} + +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + hres = IEnumVARIANT_Reset(This->enumvar); + if (FAILED(hres)) + return hres; + + This->atend = FALSE; + hres = enumvar_get_next_item(This); + if(FAILED(hres)) + return hres; + } + + if (r) + *r = jsval_undefined(); + return S_OK; +} + +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + hres = enumvar_get_next_item(This); + if (FAILED(hres)) + return hres; + } + + if (r) + *r = jsval_undefined(); + return S_OK; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_ENUMERATOR, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_ENUMERATOR, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) + { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + IEnumVARIANT *enumvar = NULL; + + if (argv) + { + VARIANT varresult; + + if (!is_object_instance(*argv)) + { + FIXME("I don't know how to handle this type!\n"); + return E_NOTIMPL; + } + + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + VariantInit(&varresult); + hres = IDispatch_Invoke(obj, DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + if (FAILED(hres)) + { + WARN("Enumerator: no DISPID_NEWENUM.\n"); + return E_INVALIDARG; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + } + else + { + FIXME("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + } + VariantClear(&varresult); + if (FAILED(hres)) + return hres; + } + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if (FAILED(hres)) + { + if (enumvar) + IEnumVARIANT_Release(enumvar); + return hres; + } + + enumerator->enumvar = enumvar; + enumerator->atend = !enumvar; + hres = enumvar_get_next_item(enumerator); + if (FAILED(hres)) + { + jsdisp_release(&enumerator->dispex); + return hres; + } + + *ret = &enumerator->dispex; + return S_OK; +} + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); + + hres = create_enumerator(ctx, (argc == 1) ? &argv[0] : 0, &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|7, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} diff --git a/dll/win32/jscript/global.c b/dll/win32/jscript/global.c index 33de6414833..92b146c83ac 100644 --- a/dll/win32/jscript/global.c +++ b/dll/win32/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,15 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dll/win32/jscript/jscript.h b/dll/win32/jscript/jscript.h index 475ca4ad5a3..5149d0d4a3f 100644 --- a/dll/win32/jscript/jscript.h +++ b/dll/win32/jscript/jscript.h @@ -118,6 +118,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ENUMERATOR, JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, @@ -438,6 +439,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -470,6 +472,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; @@ -560,6 +563,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_VBARRAY_EXPECTED MAKE_JSERROR(IDS_NOT_VBARRAY) #define JS_E_INVALID_DELETE MAKE_JSERROR(IDS_INVALID_DELETE) #define JS_E_JSCRIPT_EXPECTED MAKE_JSERROR(IDS_JSCRIPT_EXPECTED) +#define JS_E_ENUMERATOR_EXPECTED MAKE_JSERROR(IDS_NOT_ENUMERATOR) #define JS_E_REGEXP_SYNTAX MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR) #define JS_E_INVALID_URI_CODING MAKE_JSERROR(IDS_URI_INVALID_CODING) #define JS_E_INVALID_URI_CHAR MAKE_JSERROR(IDS_URI_INVALID_CHAR) diff --git a/dll/win32/jscript/object.c b/dll/win32/jscript/object.c index 487eb5f14bd..6ba99db108b 100644 --- a/dll/win32/jscript/object.c +++ b/dll/win32/jscript/object.c @@ -66,7 +66,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; TRACE("\n"); diff --git a/dll/win32/jscript/resource.h b/dll/win32/jscript/resource.h index dde1b13c59a..de5d40513b4 100644 --- a/dll/win32/jscript/resource.h +++ b/dll/win32/jscript/resource.h @@ -58,6 +58,7 @@ #define IDS_INVALID_DELETE 0x1394 #define IDS_NOT_VBARRAY 0x1395 #define IDS_JSCRIPT_EXPECTED 0x1396 +#define IDS_NOT_ENUMERATOR 0x1397 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_URI_INVALID_CHAR 0x13A0 #define IDS_URI_INVALID_CODING 0x13A1

5 years, 1 month

[reactos] 01/01: [W32TIME] The interval is specified in seconds, but we need milliseconds

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcb9378e01c555975433c… commit fcb9378e01c555975433c8bd4239da8e8e1c87a4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 16 16:29:20 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:29:20 2019 +0200 [W32TIME] The interval is specified in seconds, but we need milliseconds --- base/services/w32time/w32time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index 590396fc771..abc58a5e151 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -297,7 +297,7 @@ ServiceMain(DWORD argc, LPWSTR *argv) */ } - if (WaitForSingleObject(hStopEvent, dwInterval) == WAIT_OBJECT_0) + if (WaitForSingleObject(hStopEvent, dwInterval * 1000) == WAIT_OBJECT_0) { CloseHandle(hStopEvent); hStopEvent = NULL;

5 years, 1 month

[reactos] 02/02: [COMCTL32] Checking size grip bounds in x-axis only

by Waritnan Sookbuntherng

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76dfa2b284b03e276b917… commit 76dfa2b284b03e276b91782eff69fcecdd72210c Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> AuthorDate: Tue Dec 11 22:25:16 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:22:24 2019 +0200 [COMCTL32] Checking size grip bounds in x-axis only --- dll/win32/comctl32/status.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index dd39f13f082..6ef04a66282 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -1023,10 +1023,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT;

5 years, 1 month

[reactos] 01/02: [COMCTL32] Hide size grip when the parent window is maximized

by Waritnan Sookbuntherng

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9ddad0bbb2cf7f9501b4… commit b9ddad0bbb2cf7f9501b401d84b6847f695b1ddf Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> AuthorDate: Tue Dec 11 22:22:47 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 16:22:24 2019 +0200 [COMCTL32] Hide size grip when the parent window is maximized --- dll/win32/comctl32/status.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c index 26e9d3a1c6f..dd39f13f082 100644 --- a/dll/win32/comctl32/status.c +++ b/dll/win32/comctl32/status.c @@ -298,7 +298,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -1011,7 +1012,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt;

5 years, 1 month

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019