Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 25907: Indonesian translation (Zaenal Mutaqin)
by dgorbachev＠svn.reactos.org 26 Feb '07

26 Feb '07

Author: dgorbachev Date: Mon Feb 26 17:37:09 2007 New Revision: 25907 URL: http://svn.reactos.org/svn/reactos?rev=25907&view=rev Log: Indonesian translation (Zaenal Mutaqin) Added: trunk/reactos/base/applications/regedit/clb/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/dll/cpl/access/Id.rc trunk/reactos/dll/cpl/appwiz/Id.rc trunk/reactos/dll/cpl/desk/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/id-ID.rc trunk/reactos/dll/cpl/intl/id-ID.rc trunk/reactos/dll/cpl/intl_new/Id.rc trunk/reactos/dll/cpl/liccpa/Id.rc trunk/reactos/dll/cpl/main/Id.rc trunk/reactos/dll/cpl/mmsys/id-ID.rc trunk/reactos/dll/cpl/ncpa/id-ID.rc trunk/reactos/dll/cpl/powercfg/id.rc trunk/reactos/dll/cpl/sysdm/id-ID.rc trunk/reactos/dll/cpl/timedate/id-ID.rc Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl_new/intl.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/timedate/timedate.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/regedit/clb/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/dll/cpl/access/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Id.rc?rev=2… Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… Added: trunk/reactos/dll/cpl/appwiz/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/Id.rc?rev=2… Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… Added: trunk/reactos/dll/cpl/desk/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/id-ID.rc?rev=… Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… Added: trunk/reactos/dll/cpl/hdwwiz/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/id-ID.rc?re… Added: trunk/reactos/dll/cpl/intl/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/id-ID.rc?rev=… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… Added: trunk/reactos/dll/cpl/intl_new/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/Id.rc?rev… Modified: trunk/reactos/dll/cpl/intl_new/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rc?r… Added: trunk/reactos/dll/cpl/liccpa/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/Id.rc?rev=2… Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… Added: trunk/reactos/dll/cpl/main/Id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/Id.rc?rev=259… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… Added: trunk/reactos/dll/cpl/mmsys/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/id-ID.rc?rev… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Added: trunk/reactos/dll/cpl/ncpa/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/id-ID.rc?rev=… Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… Added: trunk/reactos/dll/cpl/powercfg/id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/id.rc?rev… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Added: trunk/reactos/dll/cpl/sysdm/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/id-ID.rc?rev… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… Added: trunk/reactos/dll/cpl/timedate/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/id-ID.rc?… Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.…

1 0

[dgorbachev] 25906: Indonesian translation (Zaenal Mutaqin)
by dgorbachev＠svn.reactos.org 25 Feb '07

25 Feb '07

Author: dgorbachev Date: Mon Feb 26 01:45:32 2007 New Revision: 25906 URL: http://svn.reactos.org/svn/reactos?rev=25906&view=rev Log: Indonesian translation (Zaenal Mutaqin) Added: trunk/reactos/base/shell/cmd/id-ID.rc trunk/reactos/subsystems/ntvdm/id-ID.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc Modified: trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc (original) +++ trunk/reactos/base/shell/cmd/cmd.rc Mon Feb 26 01:45:32 2007 @@ -8,16 +8,17 @@ #define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0" #include <reactos/version.rc> +#include "de-DE.rc" #include "en-US.rc" +#include "es-ES.rc" #include "fr-FR.rc" -#include "de-DE.rc" -#include "es-ES.rc" +#include "hu-HU.rc" +#include "id-ID.rc" +#include "it-IT.rc" +#include "ja-JP.rc" +#include "nb-NO.rc" #include "ru-RU.rc" -#include "ja-JP.rc" -#include "hu-HU.rc" -#include "nb-NO.rc" #include "uk-UA.rc" -#include "it-IT.rc" STRINGTABLE DISCARDABLE { Added: trunk/reactos/base/shell/cmd/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/id-ID.rc?re… ============================================================================== --- trunk/reactos/base/shell/cmd/id-ID.rc (added) +++ trunk/reactos/base/shell/cmd/id-ID.rc Mon Feb 26 01:45:32 2007 @@ -1,0 +1,651 @@ +/* + * Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 + */ + +#include "windows.h" +#include "resource.h" + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +STRING_ATTRIB_HELP, "Menampilkan atau mengubah atribut file.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ + [/S [/D]]\n\n\ + + Menyetel atribut\n\ + - Membersihkan atribut\n\ + R Atribut file Hanya-baca\n\ + A Atribut file Arsip\n\ + S Atribut file Sistem\n\ + H Atribut file Tersembunyi\n\ + /S Proses file yang sama dalam direktori dan semua subdirektori\n\ + saat ini\n\ + /D Proses direktori juga\n\n\ +Ketik ATTRIB tanpa parameter untuk menampilkan atribut dari semua file.\n" + +STRING_ALIAS_HELP, "Menyetel, menghapus atau menampilkan alias.\n\n\ +ALIAS [alias=[command]]\n\n\ + alias Nama untuk alias.\n\ + command Teks yang disubstitusi untuk alias.\n\n\ +Untuk mendaftar semua alias:\n\ + ALIAS\n\n\ +Untuk menyetel alias baru atau menimpa yang sudah ada:\n\ + ALIAS da=dir a:\n\n\ +Untuk menghapus alias dari daftar alias:\n\ + ALIAS da=" + +STRING_BEEP_HELP, "Bunyikan speaker.\n\nBEEP\n" + +STRING_CALL_HELP, "Memanggil satu program batch dari yang lainnya.\n\n\ +CALL [drive:][path]filename [batch-parameter]\n\n\ + batch-parameter Specifies any command-line information required by the\n\ + batch program." + +STRING_CD_HELP, "Mengubah direktori saat ini atau menampilkan namanya\n\n\ +CHDIR [/D][drive:][path]\n\ +CHDIR[..|.]\n\ +CD [/D][drive:][path]\n\ +CD[..|.]\n\n\ + .. direktori leluhurnya\n\ + . direktori saat ini\n\ + /D Akan mengubah drive dan direktori saat ini.\n\n\ +Ketik CD drive: untuk menampilkan direktori saat ini pada drive tertentu.\n\ +Ketik CD tanpa parameter untuk menampilkan drive dan direktori saat ini.\n" + +STRING_CHCP_HELP, "Menampilkan atau menyetel nomor halaman kode aktif.\n\n\ +CHCP [nnn]\n\n\ + nnn Menetapkan nomor halaman kode yang aktif.\n\n\ +Ketik CHCP tanpa parameter untuk menampilkan nomor halaman kode yang aktif.\n" + +STRING_CHOICE_HELP, "Menunggu pengguna untuk memilih satu dari set pilihan.\n\n\ +CHOICE [/C[:]pilihan][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]pilihan Menetapkan tombol yang dibolehkan. Standarnya YT.\n\ + /N Jangan tampilkan pilihan dan ? di akhir prompt string.\n\ + /S Perlakukan tombol pilihan sebagai sensitif huruf.\n\ + /T[:]c,nn Pilihan standar untuk c setelah nn detik.\n\ + text Prompt string untuk ditampilkan.\n\n\ +ERRORLEVEL disetel ke ofset tombol yang ditekan pengguna dalam pilihan.\n" + +STRING_CLS_HELP, "Membersihkan layar.\n\nCLS\n" + +STRING_CMD_HELP1, "\nPerintah internal yang tersedia:\n" + +STRING_CMD_HELP2, "\nFitur yang tersedia:" + +STRING_CMD_HELP3," [alias]" + +STRING_CMD_HELP4," [histori]" + +STRING_CMD_HELP5," [pelengkapan nama file unix]" + +STRING_CMD_HELP6," [tumpukan direktori]" + +STRING_CMD_HELP7," [pengalihan dan piping]" + +STRING_CMD_HELP8, "Memulai instan baru dari interpreter baris perintah ReactOS.\n\n\ +CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ + /C command Menjalankan perintah yang ditetapkan dan mengakhiri.\n\ + /K command Menjalankan perintah yang ditetapkan dan tetap tinggal.\n\ + /P CMD menjadi permanen dan menjalankan autoexec.bat\n\ + (tidak bisa diakhiri).\n\ + /T:bf Menyetel warna latar belakang/depan (lihat perintah COLOR).\n" + +STRING_COLOR_HELP1, "Menyetel warna standar latar belakang dan depan.\n\n\ +COLOR [attr [/-F]] \n\n\ + attr Menetapkan atribut warna output konsol\n\ + /-F Tidak memenuhi ruang kosong konsol dengan atribut warna\n\n\ +Ada tiga cara untuk menetapkan warna:\n\ +1) [bright] nama pada [bright] nama (hanya tiga huruf pertama yang dipakai)\n\ +2) desimal pada desimal\n\ +3) dua digit heksa\n\n\ +Warna adalah:\n\ +des heksa nama des hex nama\n\ +0 0 Black 8 8 Abu-Abu(Hitam terang)\n\ +1 1 Blue 9 9 Biru Terang\n\ +2 2 Green 10 A Hijau Terang\n\ +3 3 Cyan 11 B Biru Muda Terang\n\ +4 4 Red 12 C Merah Terang\n\ +5 5 Magenta 13 D Magenta Terang\n\ +6 6 Yellow 14 E Kuning Terang\n\ +7 7 White 15 F Putih Terang\n" + +STRING_COPY_HELP1, "Timpa %s (Ya/Tidak/Semua)? " + +STRING_COPY_HELP2, "Mengcopy satu atau lebih file ke lokasi lain.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] sumber [/A|/B]\n\ + [+ sumber [/A|/B] [+ ...]] [tujuan [/A|/B]]\n\n\ + sumber Menetapkan file yang akan dicopy.\n\ + /A Menunjukan file teks ASCII.\n\ + /B Menunjukan file biner.\n\ + tujuan Menetapkan direktori dan/atau nama file untuk file baru.\n\ + /V Verifikasi bahwa file yang baru ditulis dengan benar.\n\ + /Y Hilangkan pertanyaan untuk konfirmasi anda menimpa\n\ + file tujuan yang sudah ada.\n\ + /-Y Menyebabkan pertanyaan untuk konfirmasi anda menimpa\n\ + file tujuan yang sudah ada.\n\n\ +Saklar /Y mungkin ada dalam variabel lingkungan COPYCMD.\n\ +...\n" + +STRING_DATE_HELP1, "\nMasukkan tanggal baru (mm%cdd%cyyyy): " + +STRING_DATE_HELP2, "\nMasukkan tanggal baru (dd%cmm%cyyyy): " + +STRING_DATE_HELP3, "\nMasukkan tanggal baru (yyyy%cmm%cdd): " + +STRING_DATE_HELP4, "Menampilkan atau menyetel tanggal.\n\n\ +DATE [/T][date]\n\n\ + /T hanya menampilkan\n\n\ +Ketik DATE tanpa parameter untuk menampilkan setelan tanggal saat ini dan\n\ +meminta yang baru. Tekan ENTER untuk membiarkan tanggal tetap sama.\n" + +STRING_DEL_HELP1, "Menghapus satu atau lebih file.\n\n\ +DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ + file Menetapkan file yang dihapus.\n\n\ + /N Tidak ada.\n\ + /P Tanya. Menanyakan sebelum menghapus setiap file.\n\ + /T Total. Tampilkan total file dihapus dan ruang disk yang dibebaskan.\n\ + /Q Tenang.\n\ + /W Hapus. Timpa file dengan angka acak sebelum penghapusan.\n\ + /Y Ya. Matikan bahkan *.* tanpa bertanya.\n\ + /F Paksa hapus file yang tersembunyi, hanya-baca dan sistem.\n\ + /S Hapus file dari semua subdirektori\n\ + /A Pilih file yang dihapus berdasarkan atribut.\n\ + attributes\n\ + R File Hanya Baca\n\ + S File Sistem\n\ + A File Bisa Diarsipkan\n\ + H File Tersembunyi\n\ + - prefiks berarti tidak\n" + +STRING_DEL_HELP2, "Semua file dalam direktori akan dihapus!\nAnda yakin (Y/T)?" +STRING_DEL_HELP3, " %lu file dihapus\n" +STRING_DEL_HELP4, " %lu file dihapus\n" + +STRING_DELAY_HELP, "menunda n detik atau milidetik\n\ +DELAY [/m]n\n\n\ + /m menetapkan bahwa n adalah milidetik\n\ + sebaliknya n adalah detik\n" + +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [drive:][path][filename]\n\ + Menetapkan drive, direktori, dan/atau files ke daftar.\n\n\ + /A Menampilkan file dengan atribut yang ditetapkan.\n\ + attributes D Direktori R File Hanya-baca\n\ + H File tersemunyi A File siap diarsipkan\n\ + S File Sistem - Prefiks berarti tidak\n\ + /B Menggunakan format sembarang (tanpa info heading atau ringkasan).\n\ + /C Menampikan pemisah ribuan dalam ukuran file. Ini adlah\n\ + standar. Gunakan /-C untuk mematikan tampilan pemisah.\n\ + /D Sama seperti lebar tapi file adalah daftar diurut oleh kolom.\n\ + /L Menggunakan huruf kecil.\n\ + /N Format daftar panjang baru dimana nama file berada jauh di kanan.\n\ + /O Daftar file yang diurut berdasarkan sortorder.\n\ + sortorder N Nama (Alfabetik) S Ukuran (terkecil pertama)\n\ + E Ekstensi (Alfabetik) D Tanggal/Jam (terlama pertama)\n\ + G Grup direktori pertama - Prefiks untuk membalik urutan\n\ + /P Menunda setelah setiap layar penuh informasi.\n\ + /Q Menampilkan pemilik file.\n\ + /S Menampilkan file dalam direktori dan semua subdirektorinya.\n\ + /T Mengontrol field waktu mana atau dipakai untuk mengurut\n\ + timefield C Pembuatan\n\ + A Terakhir Diakses\n\ + W Terakhir Ditulis\n\ + /W Menggunakan format daftar lebar.\n\ + /X Ini menampilkan nama pendek yang dibuat untuk nama file\n\ + non-8dot3. Format yakni /N dengan nama pendek disisipkan\n\ + sebelum nama panjang. Jika tidak ada nama pendek, kosng\n\ + ditampilkan dalam tempatnya.\n\ + /4 Menampilkan tahun empat-digit\n\n\ +Saklar mungkin ada dalam variabel lingkungan DIRCMD. Membatalkan saklar\n\ +preset dengan mengawali setiap saklar dengan - (minus)--contohnya, /-W.\n" + +STRING_DIR_HELP2, " Volume di drive %c adalah %s\n" +STRING_DIR_HELP3, " Volume di drive %c tidak berlabel.\n" +STRING_DIR_HELP4, " Nomor Seri Volume adalah %04X-%04X\n" +STRING_DIR_HELP5, "\n Total File Didaftar:\n%16i File% 14s byte\n" +STRING_DIR_HELP6, "%16i Dir% 15s byte\n" +STRING_DIR_HELP7, "\n Direktori %s\n\n" +STRING_DIR_HELP8, "%16i File% 14s byte\n" + +STRING_DIRSTACK_HELP1, "Menyimpan direktori sekarang untuk digunakan oleh perintah POPD, lalu\n\ +mengubah ke direktori yang ditetapkan.\n\n\ +PUSHD [path | ..]\n\n\ + path Menetapkan direktori menjadi direktori sekarang\n" + +STRING_DIRSTACK_HELP2, "Mengubah ke direktori yang disimpan oleh perintah PUSHD.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Menampilkan isi tumpukan direktori.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Tumpukan direktori kosong" + +STRING_ECHO_HELP1, "Menampilkan pesan tanpa diakhiri carriage return dan line feed.\n\n\ + ECHOS pesan" + +STRING_ECHO_HELP2, "Menampilkan pesan ke output kesalahan standar.\n\n\ + ECHOERR pesan\n\ + ECHOERR. menampilkan baris kosong" + +STRING_ECHO_HELP3, "Menampilkan pesan ke output kesalahan standar tanpa diakhiri carriage return dan line feed.\n\n\ + ECHOSERR pesan" + +STRING_ECHO_HELP4, "Menampilkan pesan atau menukar perintah echoing on atau off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [pesan]\n\ + ECHO. Menampilkan baris kosong\n\n\ +Ketik ECHO tanpa parameter untuk menampilkan setelan ECHO saat ini." + +STRING_ECHO_HELP5, "ECHO adalah %s\n" + +STRING_EXIT_HELP, "Keluar dari interpreter baris perintah.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Keluar dari hanya file batch. \n\ + Jika dijalankan di luar file batch ia akan keluar dari cmd.exe\n\ + ExitCode Nilai ini akan ditempatkan ke ERRORLEVEL saat keluar\n" + +STRING_FOR_HELP1, "Menjalankan perintah yang ditetapkan untuk setiap file dalam set file\n\n\ +FOR %variabel IN (set) DO perintah [parameter]\n\n\ + %variabel Menetapkan parameter yang bisa diganti.\n\ + (set) Mentetapkan sebuah set dari satu atau lebih file. Wildcards boleh dipakai.\n\ + perintah Menetapkan perintah yang dilakukan untuk setiap file.\n\ + parameter Menetapkan parameter atau saklar untuk perintah yang dieteapkan.\n\n\ +Untuk menggunakan perintah FOR dalam program batch, tetapkan %%variable daripada\n\ +%variabel.\n" + +STRING_FREE_HELP1, "\nVolume di drive %s adalah %-11s\n\ + Nomor Seri adalah %s\n\ + %16s byte total ruang disk\n\ + %16s byte dipakai\n\ + %16s byte tersisa\n" + +STRING_FREE_HELP2, "Menampilkan informasi drive.\n\nFREE [drive: ...]\n" + +STRING_IF_HELP1, "Melakukan pemrosesan kondisional dalam program batch.\n\n\ + IF [NOT] ERRORLEVEL nomor perintah\n\ + IF [NOT] string1==string2 perintah\n\ + IF [NOT] EXIST filename perintah\n\ + IF [NOT] DEFINED variabel perintah\n\n\ +NOT Menetapkan bahwa CMD harus melakukan hanya perintah jika\n\ + kondisi adalah salah\n\ +ERRORLEVEL nomor Menetapkan kondisi benar jika program terakhir menghasilkan\n\ + kode exit sama dengan nomor yang ditetapkan.\n\ +perintah Menetapkan perintah untuk dilakukan jika kondisi dipenuhi.\n\ +string1==string2 Menetapkan kondisi benar jika string teks yang ditetapkan\n\ + sama.\n\ +EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ +DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" + +STRING_GOTO_HELP1, "Mengarahkan CMD ke baris berlabel dalam naskah batch.\n\n\ +GOTO label\n\n\ + label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ +Anda mengetik label pada sebuah baris, dimulai dengan titik dua." + +STRING_LABEL_HELP1, "Menampilkan atau mengubah label drive.\n\nLABEL [drive:][label]\n" + +STRING_LABEL_HELP2, "Volume di drive %c: adalah %s\n" +STRING_LABEL_HELP3, "Volume di drive %c: tidak berlabel\n" +STRING_LABEL_HELP4, "Nomor Seri Volume adalah %04X-%04X\n" +STRING_LABEL_HELP5, "Label Drive (11 Karakter, ENTER jika sudah)? " + +STRING_LOCALE_HELP1, "Waktu saat ini" + +STRING_MKDIR_HELP, "Membuat direktori.\n\n\ +MKDIR [drive:]path\nMD [drive:]path" + +STRING_MEMMORY_HELP1, "Menampilkan jumlah memori sistem.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% beban memori.\n\n\ + %13s byte total fisik RAM.\n\ + %13s byte fisik RAM tersedia.\n\n\ + %13s byte total file page.\n\ + %13s byte file page tersedia.\n\n\ + %13s byte total memori virtual.\n\ + %13s byte memori virtual tersedia.\n" + +STRING_MISC_HELP1, "Tekan tombol untuk melanjutkan...\n" + +STRING_MOVE_HELP1, "Timpa %s (Ya/Tidak/Semua)? " + +STRING_MOVE_HELP2, "Memindahkan file dan mengganti nama file dan direktori.\n\n\ +Untuk memindahkan satu atau lebih file:\n\ +MOVE [/N][drive:][path]filename1[,...] tujuan\n\n\ +Untuk mengganti nama direktori:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Menetapkan lokasi dan nama file\n\ + yang ingin anda pindahkan.\n\ + /N Tidak apapun. Lakukan apapun kecuali memindahkan file dan direktori.\n\n\ +Batasan saat ini:\n\ + - Anda tidak bisa memindahkan file atau direktori dari satu drive ke lainnya.\n" + +STRING_MSGBOX_HELP, "menampilkan kotak pesan dan menghasilkan respon pengguna\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type tombol ditampilkan\n\ + nilai yang mungkin adalah: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title judul kotak pesan\n\ +prompt teks ditampilkan dengan kotak pesan\n\n\n\ +ERRORLEVEL disetel berdasarkan tombol yang ditekan:\n\n\ +YA : 10 | TIDAK : 11\n\ +OK : 10 | BATAL : 12\n" + +STRING_PATH_HELP1, "Menampilkan atau menyetel path pencarian untuk file executable.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Ketik PATH ; untuk membersihkan semua setelan path-pencarian dan shell\n\ +perintah langsung untuk mencari hanya dalam direktori saat ini.\n\ +Ketik PATH tanpa parameter untuk menampilkan path saat ini.\n" + +STRING_PROMPT_HELP1, "Mengubah prompt perintah.\n\n\ +PROMPT [teks]\n\n\ + teks Menetapkan prompt perintah baru.\n\n\ +Prompt bisa dibuat dari karakter normal dan kode spesial berikut:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (Tanda kurung Kiri)\n\ + $D Tanggal saat ini\n\ + $E Kode Escape (ASCII code 27)\n\ + $F ) (Tanda kurung Kanan)\n\ + $G > (Tanda lebih-dari)\n\ + $H Backspace (menghapus karakter sebelumnya)\n\ + $L < (tanda kurang-dari)\n\ + $N Drive saat ini\n\ + $P Drive dan path saat ini\n\ + $Q = (tanda sama dengan)\n\ + $T Jam saat ini\n\ + $V Nomor versi OS\n\ + $_ Carriage return dan linefeed\n\ + $$ $ (tanda dolar)\n" + +STRING_PAUSE_HELP1, "Menunda eksekusi file batch dan menampilkan pesan berikut:\n\ +'Tekan tombol untuk melanjutkan...' atau pesan yang dibuat pengguna.\n\n\ +PAUSE [pesan]" + +STRING_PROMPT_HELP2, " $+ Menampilkan kedalaman tumpukan direktori saat ini" + +STRING_PROMPT_HELP3, "\nKetik PROMPT tanpa parameter untuk mereset prompt ke setelan standar." + +STRING_REM_HELP, "Memulai baris komentar dalam file batch.\n\nREM [Komentar]" + +STRING_RMDIR_HELP, "Menghapus direktori.\n\n\ +RMDIR [drive:]path\nRD [drive:]path\n\ +/S Menghapus semua file dan folder di dalam target\n\ +/Q Tidak bertanya pada pengguna\n" +STRING_RMDIR_HELP2, "Direktori tidak kosong!\n" + +STRING_REN_HELP1, "Mengganti nama file/direktori.\n\n\ +RENAME [/E /N /P /Q /S /T] nama_lama ... nama_baru\n\ +REN [/E /N /P /Q /S /T] nama_lama ... nama_baru\n\n\ + /E Tidak ada pesan.\n\ + /N Tidak.\n\ + /P Menanyakan konfirmasi sebelum mengganti nama setiap file.\n\ + (Belum diimplementasikan!)\n\ + /Q Diam-diam.\n\ + /S Mengganti nama subdirektori.\n\ + /T Menampilkan jumlah total dari file yang diganti nama.\n\n\ +Catatan bahwa anda tidak bisa menetapkan drive baru atau path untuk\n\ +tujuan anda. Gunakan perintah MOVE untuk keperluan itu.\n" + +STRING_REN_HELP2, " %lu file diganti nama\n" + +STRING_REN_HELP3, " %lu file diganti nama\n" + +STRING_SHIFT_HELP, "Mengubah posisi parameter yang bisa diganti dalam file batch.\n\n\ +SHIFT [DOWN]" + +STRING_SCREEN_HELP, "memindahkan kursor dan secara opsional mencetak teks\n\n\ +SCREEN row col [text]\n\n\ + row baris ke mana kursor dipindahkan\n\ + col kolom ke mana kursor dipindahkan" + +STRING_SET_HELP, "Menampilkan, menyetel, atau menghapus variabel lingkungan.\n\n\ +SET [variable[=][string]]\n\n\ + variable Menetapkan nama variabel-lingkungan.\n\ + string Menetapkan deretan karakter untuk ditempatkan ke variabel.\n\n\ +Ketik SET tanpa parameter untuk menampilkan variabel lingkungan sekarang.\n" + +STRING_START_HELP1, "Memulai sebuah perintah.\n\n\ +START command\n\n\ + command Menetapkab perintah yang dilaksanakan.\n\n\ +Untuk saat ini semua perintah dimulai secara asinkronos.\n" + +STRING_TITLE_HELP, "Menyetel judul jendela untuk jendela prompt perintah.\n\n\ +TITLE [string]\n\n\ +string Menetapkan judul untuk jendela prompt perintah.\n" + +STRING_TIME_HELP1, "Menampilkan atau menyetel jam sistem.\n\n\ +TIME [/T][time]\n\n\ + /T hanya menampilkan\n\n\ +Ketik TIME tanpa parameter untuk menampilkan setelan jam saat ini dan\n\ +meminta yang baru. Tekan ENTER untuk membiarkan jam tetap sama.\n" + +STRING_TIME_HELP2, "Masukkan jam baru: " + +STRING_TIMER_HELP1, "Berlalu %d mdetik\n" + +STRING_TIMER_HELP2, "Berlalu %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "mengijinkan penggunaan sepuluh stopwatch.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON menyetel stopwatch ON\n\ + OFF menyetel stopwatch OFF\n\ + /S Memisahkan jam. Mengembalikan pemisahan jam stopwatch\n\ + tanpa mengubah nilainya\n\ + /n Menetapkan nomor stopwatch.\n\ + Stopwatch yang tersedia adalah 0 sampai 9\n\ + Jika tidak ditetapkan standarnya adalah 1\n\ + /Fn Format output\n\ + n bisa berupa:\n\ + 0 milidetik\n\ + 1 hh%cmm%css%cdd\n\n\ +jika tidak ada yang ON, OFF atau /S ditetapkan dalam perintah\n\ +akan menghidupkan/mematikan keadaan stopwatch\n\n" + +STRING_TYPE_HELP1, "Menampilkan isi dari file teks.\n\nTYPE [drive:][path]filename \n\ + /P Menampilkan satu layar output sekali waktu.\n" + +STRING_VERIFY_HELP1, "Perintah ini hanya dummy!!\n\ +Menyetel apakah memverifikasi bawa file anda ditulis dengan benar ke\n\ +disk.\n\n\ +VERIFY [ON | OFF]\n\n\ +Ketik VERIFY tanpa parameter untuk menampilkan setelan VERIFY sekarang.\n" + +STRING_VERIFY_HELP2, "VERIFY adalah %s.\n" + +STRING_VERIFY_HELP3, "Harus menetapkan ON atau OFF." + +STRING_VERSION_HELP1, "Menampilkan Displays shell version information\n\n\ +VER [/C][/R][/W]\n\n\ + /C Menampilkan penghargaan.\n\ + /R Menampilkan informasi redistribusi.\n\ + /W menampilkan informasi jaminan." + +STRING_VERSION_HELP2, " datang dengan MUTLAK TANPA JAMINAN; untuk lengkapnya\n\ +ketik: 'ver /w'. Program ini adalah software bebas; anda bisa membagikannya\n\ +di bawah kondisi tertentu; ketik 'ver /r' untuk lengkapnya. Ketik 'ver /c'\n\ +untuk daftar penghargaan." + +STRING_VERSION_HELP3, "\n Program ini didistribusikan dengan harapan berguna,\n\ + tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari\n\ + MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat \n\ + GNU General Public License untuk lebih jelasnya." + +STRING_VERSION_HELP4, "\n Program ini adalah software bebas; anda dapat mendistribusikan dan/atau\n\ + mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\n" + +STRING_VERSION_HELP5, "\nKirim laporan bug ke <ros-dev(a)reactos.org>.\n\ +Pemutakiran tersedia di: http://www.reactos.org" + +STRING_VERSION_HELP6, "\nVersi FreeDOS ditulis oleh:\n" + +STRING_VERSION_HELP7, "\nVersi ReactOS ditulis oleh:\n" + +STRING_VOL_HELP1, " Volume dalam drive %c: adalah %s" +STRING_VOL_HELP2, " Volume dalam drive %c: tidak berlabel" +STRING_VOL_HELP3, " Nomor Seri Volume adalah %04X-%04X\n" +STRING_VOL_HELP4, "Menampilkan label dan nomor seri volume disk, jika ada.\n\nVOL [drive:]" + +STRING_WINDOW_HELP1, "mengubah aspek jendela konsol\n\n\ +WINDOW [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +/POS menetapkan penempatan dan dimensi jendela\n\ +MIN mengecilkan jendela\n\ +MAX memaksimalkan jendela\n\ +RESTORE mengembalikan jendela" + +STRING_WINDOW_HELP2, "mengubah aspek jendela konsol\n\n\ +ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +window tile jendela yang melakukan aksi\n\ +/POS menetapkan penempatan dan dimensi jendela\n\ +MIN mengecilkan jendela\n\ +MAX memaksimalkan jendela\n\ +RESTORE mengembalikan jendela\n\ +title judul baru\n" + + +STRING_HELP1, "Daftar semua perintah yang tersedia (+ deskripsi)\n\n\ + command /? Untuk informasi lengkap pada perintah tertentu\n\n\ +? Daftar semua perintah yang tersedia tanpa deskripsi.\n\ +ALIAS Menyetel, menghapus atau menampilkan alias.\n\ +ATTRIB Menampilkan atau mengubah atribut file.\n\ +BEEP Membunyikan speaker.\n\ +CALL Memanggil program batch dari yang lain.\n\ +CD Menampilkan nama atau mengubah direktori saat ini.\n\ +CHCP Menampilkan atau menyetel nomor halaman kode aktif.\n\ +CHOICE Menunggu pengguna untuk memilih satu dari set pilihan.\n\ +CLS Membersihkan layar.\n\ +CMD Memulai instan interpreter perintah ReactOS baru.\n\ +COLOR Menyetel warna standar latar belakang dan depan konsol.\n\ +COPY Mengcopy satu atau lebih file ke lokasi lain.\n\ +DATE Menampilkan atau menyetel tanggal.\n\ +DELETE Menghapus satu atau lebih file.\n\ +DIR Menampilkan daftar file dan subdirektori dalam sebuah direktori.\n\ +ECHO Menampilkan pesan, atau menghidupkan/mematikan echo perintah.\n\ +ERASE Menghapus satu atau lebih file.\n\ +EXIT Keluar dari program CMD.EXE (interpreter perintah).\n\ +FOR Menjalankan perintah tertentu untuk setiap file atau set file.\n\ +FREE (bebas) ruang disc.\n\ +GOTO Melangsungkan interpreter perintah ReactOS ke baris berlabel dalam\n\ + program batch.\n\ +HELP Menyediakan informasi Bantuan untuk perintah ReactOS.\n\ +HISTORY Mendaftarkan semua perintah yang sudah digunakan\n\ +IF Melakukan pemrosesan kondisional dalam program batch.\n\ +LABEL Membuat, mengubah, atau menghapus label volume disk.\n\ +MD Membuat sebuah direktori.\n\ +MKDIR Membuat sebuah direktori.\n\ +MOVE Memindahkan satu atau lebih file dari satu direktori ke yang lainnya\n\ + directory.\n\ +PATH Menampilkan atau menyetel path pencarian untuk file executable.\n\ +PAUSE Menunda proses file batch dan menampilkan pesan.\n\ +POPD Mengembalikan nilai sebelumnya dari direktori saat ini yang\n\ + disimpan oleh PUSHD.\n\ +PROMPT Mengubah prompt perintah.\n\ +PUSHD Menyimpan direktori saat ini lalu mengubahnya.\n\ +RD Menghapus direktori.\n\ +REM Merekam komentar (remarks) dalam file batch.\n\ +REN Mengganti nama file.\n\ +RENAME Mengganti nama file.\n\ +RMDIR Menghapus direktori.\n\ +SCREEN Memindahkan kursor dan secara opsional mencetak teks.\n\ +SET Menampilkan, menyetel, atau menghapus variabel lingkungan ReactOS.\n\ +SHIFT Mengangkat posisi parameter yang bisa diganti dalam file batch.\n" +STRING_HELP2, "START Memulai jendela terpisah untuk menjalankan perintah atau program tertentu.\n\ + Menjalankan perintah.\n\ +TIME Menampilkan atau menyetel jam sistem.\n\ +TIMER Mengijinkan penggunaan sepuluh stopwatch.\n\ +TITLE Menyetel judul jendela untuk ses CMD.EXE.\n\ +TYPE Menampilkan isi dari file teks.\n\ +VER Menampilkan versi ReactOS.\n\ +VERIFY Memberitahu ReactOS apakah memverifikasi bahwa file anda ditulis\n\ + dengan benar ke sebuah disk.\n\ +VOL Menampilkan label volume disk dan nomor seri.\n" + + +STRING_CHOICE_OPTION, "YT" +STRING_COPY_OPTION, "YTS" + + +STRING_ALIAS_ERROR, "Baris perintah terlalu panjang setelah ekspansi alias!\n" +STRING_BATCH_ERROR, "Kesalaham membuka file batch\n" +STRING_CHCP_ERROR1, "Halaman kode aktif: %u\n" +STRING_CHCP_ERROR4, "Halaman kode tidak benar\n" +STRING_CHOICE_ERROR, "Opsi tidak benar. Format diharapkan: /C[:]options" +STRING_CHOICE_ERROR_TXT, "Opsi tidak benar. Format diharapkan: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Opsi tidak benar: %s" +STRING_MD_ERROR, "Subdirektori atau file sudah ada.\n" +STRING_MD_ERROR2, "Path ke folder baru tidak ada.\n" +STRING_CMD_ERROR1, "Tidak bisa mengalihkan input dari file %s\n" +STRING_CMD_ERROR2, "Kesalahan membuat file termporal untuk pipe data\n" +STRING_CMD_ERROR3, "Tidak bisa mengalihkan ke file %s\n" +STRING_CMD_ERROR4, "Menjalankan %s...\n" +STRING_CMD_ERROR5, "Menjalankan cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" +STRING_COLOR_ERROR2, "Kesalahan dalam spesifikasi warna" +STRING_COLOR_ERROR3, "Warna %x\n" +STRING_COLOR_ERROR4, "warna sama salah!" +STRING_CONSOLE_ERROR, "Kesalahan tidak dikenal: %d\n" +STRING_COPY_ERROR1, "Salah: Tidak dapat membuka sumber - %s!\n" +STRING_COPY_ERROR2, "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" +STRING_COPY_ERROR3, "Kesalahan menulis tujuan!\n" +STRING_COPY_ERROR4, "Salah: Belum diimplementasikan!\n" +STRING_DATE_ERROR, "Tanggal tidak benar." +STRING_DEL_ERROR5, "File %s akan dihapus! " +STRING_DEL_ERROR6, "Anda yakin (Y/N)?" +STRING_DEL_ERROR7, "Menghapus: %s\n" +STRING_ERROR_ERROR1, "Kesalahan tidak dikenal! Kode kesalahan: 0x%lx\n" +STRING_ERROR_ERROR2, "Sintaks salah" +STRING_FOR_ERROR1, "'in' kurang dalam pernyataan for." +STRING_FOR_ERROR2, "tidak ada kurung ditemukan." +STRING_FOR_ERROR3, "'do' hilang." +STRING_FOR_ERROR4, "tidak ada perintah setelah 'do'." +STRING_FREE_ERROR1, "Drive tidak benar" +STRING_FREE_ERROR2, "tak berlabel" +STRING_GOTO_ERROR1, "Tidak ada label ditetapkan untuk GOTO" +STRING_GOTO_ERROR2, "Label '%s' tidak ditemukan\n" + +STRING_MOVE_ERROR1, "[OK]\n" +STRING_MOVE_ERROR2, "[Salah]\n" + +STRING_REN_ERROR1, "MoveFile() gagal. Kesalahan: %lu\n" + +STRING_START_ERROR1, "Tidak ada dukungan batch untuk saat ini!" + +STRING_TIME_ERROR1, "Jam tidak benar." + +STRING_TYPE_ERROR1, "Opsi tidak benar '/%s'\n" + +STRING_WINDOW_ERROR1, "jendela tidak ditemukan" + + +STRING_ERROR_PARAMETERF_ERROR, "Format parameter tidak benar - %c\n" +STRING_ERROR_INVALID_SWITCH, "Saklar tidak benar - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "Terlalu banyak parameter - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Path tidak ditemukan\n" +STRING_ERROR_FILE_NOT_FOUND, "File tidak ditemukan\n" +STRING_ERROR_REQ_PARAM_MISSING, "Parameter yang diperlukan kurang\n" +STRING_ERROR_INVALID_DRIVE, "Spesifikasi drive tidak benar\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Format parameter tidak benar - %s\n" +STRING_ERROR_BADCOMMAND, "Perintah atau nama file salah\n" +STRING_ERROR_OUT_OF_MEMORY, "Kesalahan kekurangan memori.\n" +STRING_ERROR_CANNOTPIPE, "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n" +STRING_ERROR_D_PAUSEMSG, "Tekan tombol untuk melanjutkan . . ." +STRING_ERROR_DRIVER_NOT_READY, "Drive tidak siap" + +STRING_PATH_ERROR, "CMD: Tidak dalam lingkungan '%s'\n" + +STRING_CMD_SHELLINFO, "\nInterpreter Baris Perintah ReactOS" +STRING_VERSION_RUNVER, " berjalan pada %s" +STRING_COPY_FILE , " %d file di-copy\n" +STRING_DELETE_WIPE, "dihapus" +STRING_FOR_ERROR, "spesifikasi variabel tidak baik." +STRING_SCREEN_COL, "Nilai untuk kolom tidak benar" +STRING_SCREEN_ROW, "Nilai untuk baris tidak benar" +STRING_TIMER_TIME "Timer %d adalah %s: " + +STRING_INVALID_OPERAND, "Operand tidak benar." +STRING_EXPECTED_CLOSE_PAREN, "Diharapkan ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Nomor atau nama variabel diharapkan." +STRING_SYNTAX_COMMAND_INCORRECT, "Sintaks perintah tidak benar." + +} Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Feb 26 01:45:32 2007 @@ -114,6 +114,7 @@ "#include ""explorer-fr.rc""\r\n" "#include ""explorer-gr.rc""\r\n" "#include ""explorer-hu.rc""\r\n" + "#include ""explorer-id.rc""\r\n" "#include ""explorer-it.rc""\r\n" "#include ""explorer-jp.rc""\r\n" "#include ""explorer-nl.rc""\r\n" Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Mon Feb 26 01:45:32 2007 @@ -1545,8 +1545,8 @@ if (!Flags) { /* It wasn't, so just return the data */ - *ModuleObject = LdrEntry; - *ImageBaseAddress = LdrEntry->DllBase; + if (ModuleObject) *ModuleObject = LdrEntry; + if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; Status = STATUS_IMAGE_ALREADY_LOADED; } else Added: trunk/reactos/subsystems/ntvdm/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/id-ID.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/id-ID.rc (added) +++ trunk/reactos/subsystems/ntvdm/id-ID.rc Mon Feb 26 01:45:32 2007 @@ -1,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Dukungan ReactOS Virtual DOS Machine.\n" +STRING_PromptMsg, "Ketik r<cr> untuk menjalankan, s<cr> untuk mematikan atau q<cr> untuk keluar sekarang." +} Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Mon Feb 26 01:45:32 2007 @@ -11,6 +11,7 @@ #include "es-ES.rc" #include "fr-FR.rc" #include "hu-HU.rc" +#include "id-ID.rc" #include "ja-JP.rc" #include "nb-NO.rc" #include "th-TH.rc" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc Mon Feb 26 01:45:32 2007 @@ -1,0 +1,48 @@ +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Akhir Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mengakhiri Program... Harap menunggu",IDC_STATIC,7,7,186,11 + CONTROL "Progres",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Jika anda memilih untuk segera mengakhiri program, anda akan kehilangan data yang belum disimpan. Untuk mengakhiri program sekarang, klik Akhiri Sekarang.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Akhiri Sekarang",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mengakhiri Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Batal",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Akhiri Sekarang",IDC_END_NOW,78,98,43,17 + LTEXT "Program ini tidak merespon",IDC_STATIC,7,7,178,8 + LTEXT "Untuk kembali ke ReactOS dan memeriksa status program, klik Batal", + IDC_STATIC,7,26,178,16 + LTEXT "Jika anda memilih untuk segera mengakhiri program, anda akan kehilangan data yang belum disimpan. Untuk mengakhiri program sekarang, klik Akhiri Sekarang.", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Edit" + IDS_MARK "Tandai" + IDS_COPY "Copy\tEnter" + IDS_PASTE "Paste" + IDS_SELECTALL "Pilih Semua" + IDS_SCROLL "Gulung" + IDS_FIND "Cari..." + IDS_DEFAULTS "Standar" + IDS_PROPERTIES "Properti" + IDS_SCROLLHERE "Gulung ke Sini" + IDS_SCROLLTOP "Gulung ke Atas" + IDS_SCROLLBOTTOM "Gulung ke Bawah" + IDS_SCROLLPAGE_UP "Halaman Naik" + IDS_SCROLLPAGE_DOWN "Halaman Turun" + IDS_SCROLLUP "Gulung Naik" + IDS_SCROLLDOWN "Gulung Turun" +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Mon Feb 26 01:45:32 2007 @@ -6,4 +6,5 @@ 1 ICON DISCARDABLE res/terminal.ico #include "lang/en-US.rc" +#include "lang/id-ID.rc" #include "lang/uk-UA.rc"

1 0

[ekohl] 25905: - Sort font names alphabetically. - Enable the user to choose fonts.
by ekohl＠svn.reactos.org 25 Feb '07

25 Feb '07

Author: ekohl Date: Mon Feb 26 00:58:20 2007 New Revision: 25905 URL: http://svn.reactos.org/svn/reactos?rev=25905&view=rev Log: - Sort font names alphabetically. - Enable the user to choose fonts. Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Mon Feb 26 00:58:20 2007 @@ -92,7 +92,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Mon Feb 26 00:58:20 2007 @@ -97,7 +97,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Mon Feb 26 00:58:20 2007 @@ -431,6 +431,28 @@ } +static VOID +GetSelectedComboText(HWND hwnd, INT id, LPWSTR lpStr) +{ + INT nCount; +// INT i; + + nCount = SendDlgItemMessage(hwnd, id, CB_GETCURSEL, 0, 0); + if (nCount == CB_ERR) + { + *lpStr = 0; + return; + } + + nCount = SendDlgItemMessage(hwnd, id, CB_GETLBTEXT, (WPARAM)nCount, (LPARAM)lpStr); + if (nCount == CB_ERR) + { + *lpStr = 0; + } +} + + + INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -510,6 +532,39 @@ } break; + case IDC_ADVAPPEARANCE_FONT_C: + if (g && HIWORD(wParam) == CBN_SELCHANGE) + { +// MessageBeep(-1); + + switch (g->CurrentElement) + { + case IDX_INACTIVE_CAPTION: + case IDX_ACTIVE_CAPTION: + GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_MENU: + GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_DIALOG: + GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + } + } + break; + case IDC_ADVAPPEARANCE_COLOR1_B: GetColor(hwndDlg, g, 0); break; Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Schriftart:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Schriftgra&d:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Mon Feb 26 00:58:20 2007 @@ -96,7 +96,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Mon Feb 26 00:58:20 2007 @@ -90,7 +90,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Mon Feb 26 00:58:20 2007 @@ -89,7 +89,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Mon Feb 26 00:58:20 2007 @@ -90,7 +90,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c (original) +++ trunk/reactos/dll/cpl/desk/preview.c Mon Feb 26 00:58:20 2007 @@ -343,7 +343,7 @@ /* Draw the menu bar */ DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar, pPreviewData->hMenu, - pPreviewData->hMessageFont); + pPreviewData->hMenuFont); /* Draw the client area */ CopyRect(&rc, &pPreviewData->rcActiveClient); @@ -558,6 +558,30 @@ } break; + case PVM_SETCAPTIONFONT: + CopyMemory(&pPreviewData->lfCaptionFont, (LOGFONT*)lParam, sizeof(LOGFONT)); + DeleteObject(pPreviewData->hCaptionFont); + pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont); + CalculateItemSize(pPreviewData); + InvalidateRect(hwnd, NULL, FALSE); + break; + + case PVM_SETMENUFONT: + CopyMemory(&pPreviewData->lfMenuFont, (LOGFONT*)lParam, sizeof(LOGFONT)); + DeleteObject(pPreviewData->hMenuFont); + pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont); + CalculateItemSize(pPreviewData); + InvalidateRect(hwnd, NULL, FALSE); + break; + + case PVM_SETDIALOGFONT: + CopyMemory(&pPreviewData->lfMessageFont, (LOGFONT*)lParam, sizeof(LOGFONT)); + DeleteObject(pPreviewData->hMessageFont); + pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont); + CalculateItemSize(pPreviewData); + InvalidateRect(hwnd, NULL, FALSE); + break; + default: DefWindowProc(hwnd, uMsg, Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h (original) +++ trunk/reactos/dll/cpl/desk/preview.h Mon Feb 26 00:58:20 2007 @@ -35,5 +35,9 @@ #define PVM_GETCYSIZEFRAME (WM_USER+7) #define PVM_SETCYSIZEFRAME (WM_USER+8) +#define PVM_SETCAPTIONFONT (WM_USER+9) +#define PVM_SETMENUFONT (WM_USER+10) +#define PVM_SETDIALOGFONT (WM_USER+11) + BOOL RegisterPreviewControl(IN HINSTANCE hInstance); VOID UnregisterPreviewControl(IN HINSTANCE hInstance); Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Mon Feb 26 00:58:20 2007 @@ -92,7 +92,7 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL

1 0

[arty] 25904: @@@ revision 25750
by arty＠svn.reactos.org 25 Feb '07

25 Feb '07

Author: arty Date: Sun Feb 25 10:47:42 2007 New Revision: 25904 URL: http://svn.reactos.org/svn/reactos?rev=25904&view=rev Log: @@@ revision 25750 Added: branches/arty-stable/reactos/ - copied from r25750, trunk/reactos/

1 0

[arty] 25903: Remove my branch pending reconstruction at known good rev 25750.
by arty＠svn.reactos.org 25 Feb '07

25 Feb '07

Author: arty Date: Sun Feb 25 10:18:11 2007 New Revision: 25903 URL: http://svn.reactos.org/svn/reactos?rev=25903&view=rev Log: Remove my branch pending reconstruction at known good rev 25750. Removed: branches/arty-stable/reactos/

1 0

[tretiakov] 25902: Fix installname
by tretiakov＠svn.reactos.org 24 Feb '07

24 Feb '07

Author: tretiakov Date: Sat Feb 24 21:16:50 2007 New Revision: 25902 URL: http://svn.reactos.org/svn/reactos?rev=25902&view=rev Log: Fix installname Modified: trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild Modified: trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/D3DParseUnknownComma… ============================================================================== --- trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild (original) +++ trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild Sat Feb 24 21:16:50 2007 @@ -1,4 +1,4 @@ -<module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show" allowwarnings="true"> +<module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe" allowwarnings="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" />

1 0

[greatlrd] 25901: adding -dump as param to dumping out all struct and data
by greatlrd＠svn.reactos.org 24 Feb '07

24 Feb '07

Author: greatlrd Date: Sat Feb 24 16:58:25 2007 New Revision: 25901 URL: http://svn.reactos.org/svn/reactos?rev=25901&view=rev Log: adding -dump as param to dumping out all struct and data Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c trunk/rosapps/dxtest/win32kdxtest/main.c trunk/rosapps/dxtest/win32kdxtest/test.h Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/dump.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/dump.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/dump.c Sat Feb 24 16:58:25 2007 @@ -9,6 +9,15 @@ #include "test.h" + +void +dump_CallBackFlags(DWORD *pCallBackFlags, char *text) +{ + printf("dumping the CallBackFlags from %s\n",text); + printf("pCallBackFlags[0] : 0x%08lx\n",pCallBackFlags[0]); + printf("pCallBackFlags[1] : 0x%08lx\n",pCallBackFlags[1]); + printf("pCallBackFlags[2] : 0x%08lx\n",pCallBackFlags[2]); +} void dump_halinfo(DD_HALINFO *pHalInfo, char *text) Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sat Feb 24 16:58:25 2007 @@ -12,6 +12,8 @@ #include <dll/directx/d3d8thk.h> #include "test.h" +BOOL dumping_on =FALSE; + /* we using d3d8thk.dll it is doing the real syscall in windows 2000 * in ReactOS and Windows XP and higher d3d8thk.dll it linking to * gdi32.dll instead doing syscall, gdi32.dll export DdEntry1-56 @@ -23,6 +25,14 @@ int main(int argc, char **argv) { HANDLE hDirectDrawLocal; + + if (argc == 2) + { + if (stricmp(argv[1],"-dump")==0) + { + dumping_on = TRUE; + } + } hDirectDrawLocal = test_NtGdiDdCreateDirectDrawObject(); @@ -162,11 +172,14 @@ if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\n"); + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n"); fails++; } - /* FIXME dump pHalInfo */ + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...)"); + } /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, NULL, ....)\n"); @@ -199,8 +212,11 @@ fails++; } - /* FIXME dump pHalInfo */ - /* FIXME dump pCallBackFlags */ + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + } /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ....)\n"); @@ -236,9 +252,12 @@ fails++; } - /* FIXME dump pHalInfo */ - /* FIXME dump pCallBackFlags */ - /* FIXME dump puD3dCallbacks */ + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + } /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ....)\n"); @@ -277,14 +296,13 @@ fails++; } - /* FIXME dump pHalInfo */ - /* FIXME dump pCallBackFlags */ - /* FIXME dump puD3dCallbacks */ - /* FIXME dump puD3dDriverData */ - - - - + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + /* FIXME dump puD3dDriverData */ + } show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); } Modified: trunk/rosapps/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/test.h… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/test.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/test.h Sat Feb 24 16:58:25 2007 @@ -5,7 +5,7 @@ void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); void dump_halinfo(DD_HALINFO *pHalInfo, char *text); - +void dump_CallBackFlags(DWORD *pCallBackFlags, char *text);

1 0

[greatlrd] 25900: adding more testcase for NtGdiDdQueryDirectDrawObject
by greatlrd＠svn.reactos.org 24 Feb '07

24 Feb '07

Author: greatlrd Date: Sat Feb 24 16:32:09 2007 New Revision: 25900 URL: http://svn.reactos.org/svn/reactos?rev=25900&view=rev Log: adding more testcase for NtGdiDdQueryDirectDrawObject Modified: trunk/rosapps/dxtest/win32kdxtest/main.c Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sat Feb 24 16:32:09 2007 @@ -82,7 +82,7 @@ D3DNTHAL_CALLBACKS D3dCallbacks; D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; - DDSURFACEDESC D3dTextureFormats; + DDSURFACEDESC2 D3dTextureFormats[100]; // DWORD NumHeaps = 0; VIDEOMEMORY vmList; // DWORD NumFourCC = 0; @@ -100,7 +100,7 @@ printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); /* testing OsThunkDdQueryDirectDrawObject( NULL, .... */ - printf("testing OsThunkDdQueryDirectDrawObject( NULL, ....)\n"); + printf("testing DdQueryDirectDrawObject( NULL, ....)\n"); retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, pCallBackFlags, puD3dCallbacks, @@ -119,7 +119,7 @@ testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, .... */ - printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, ....)\n"); + printf("testing DdQueryDirectDrawObject( hDD, NULL, ....)\n"); retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, @@ -139,7 +139,7 @@ testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, .... */ - printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, ....)\n"); + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, NULL, ....)\n"); pHalInfo = &HalInfo; retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, @@ -163,12 +163,13 @@ (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) { printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\n"); + fails++; } /* FIXME dump pHalInfo */ /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ - printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ....)\n"); + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, NULL, ....)\n"); pHalInfo = &HalInfo; pCallBackFlags = CallBackFlags; @@ -189,16 +190,100 @@ testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); - testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) { - printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n"); + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\n"); + fails++; } /* FIXME dump pHalInfo */ /* FIXME dump pCallBackFlags */ + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\n"); + fails++; + } + + /* FIXME dump pHalInfo */ + /* FIXME dump pCallBackFlags */ + /* FIXME dump puD3dCallbacks */ + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + + testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ...);\n"); + fails++; + } + + /* FIXME dump pHalInfo */ + /* FIXME dump pCallBackFlags */ + /* FIXME dump puD3dCallbacks */ + /* FIXME dump puD3dDriverData */ + + + show_status(fails, "NtGdiDdQueryDirectDrawObject\0");

1 0

[greatlrd] 25899: adding more testcase for NtGdiDdQueryDirectDrawObject
by greatlrd＠svn.reactos.org 24 Feb '07

24 Feb '07

Author: greatlrd Date: Sat Feb 24 15:24:31 2007 New Revision: 25899 URL: http://svn.reactos.org/svn/reactos?rev=25899&view=rev Log: adding more testcase for NtGdiDdQueryDirectDrawObject Modified: trunk/rosapps/dxtest/win32kdxtest/main.c Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Sat Feb 24 15:24:31 2007 @@ -99,7 +99,9 @@ printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); - /* testing NULL */ + /* testing OsThunkDdQueryDirectDrawObject( NULL, .... */ + printf("testing OsThunkDdQueryDirectDrawObject( NULL, ....)\n"); + retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, @@ -116,6 +118,9 @@ testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, .... */ + printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, NULL, ....)\n"); + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, @@ -133,10 +138,8 @@ testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\0"); - /* - * we expect the pHalInfo will be fill in and correct but we expect return value be - * false - */ + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, .... */ + printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, NULL, ....)\n"); pHalInfo = &HalInfo; retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, @@ -155,13 +158,47 @@ testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); - - - - - - + + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, NULL, ...);\n"); + } + + /* FIXME dump pHalInfo */ + + /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + printf("testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dCallbacks,NULL,fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dDriverData,NULL,fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dBufferCallbacks,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puD3dTextureFormats,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("10. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\n"); + } + + /* FIXME dump pHalInfo */ + /* FIXME dump pCallBackFlags */ show_status(fails, "NtGdiDdQueryDirectDrawObject\0");

1 0

[tretiakov] 25898: kbdse.dll -> kbdsw.dll
by tretiakov＠svn.reactos.org 24 Feb '07

24 Feb '07

Author: tretiakov Date: Sat Feb 24 15:00:43 2007 New Revision: 25898 URL: http://svn.reactos.org/svn/reactos?rev=25898&view=rev Log: kbdse.dll -> kbdsw.dll Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/kbdsw/kbdsw.def trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Feb 24 15:00:43 2007 @@ -141,7 +141,7 @@ dll\keyboard\kbdja\kbdja.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.dll 1 -dll\keyboard\kbdse\kbdse.dll 1 +dll\keyboard\kbdsw\kbdsw.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 dll\keyboard\kbdth\kbdth.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Feb 24 15:00:43 2007 @@ -40,7 +40,7 @@ [SetupData] DefaultPath = \ReactOS ;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4" +OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" @@ -124,7 +124,7 @@ 0000040E = kbdhu.dll 00000410 = kbdit.dll 00000419 = kbdru.dll -0000041D = kbdse.dll +0000041D = kbdsw.dll 0000041E = kbdth.dll 00000422 = kbdur.dll 00000809 = kbduk.dll Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.def (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.def Sat Feb 24 15:00:43 2007 @@ -1,7 +1,7 @@ ; ; ReactOS Operating System ; -LIBRARY kbdse.dll +LIBRARY kbdsw.dll EXPORTS KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc Sat Feb 24 15:00:43 2007 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdse\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdse.dll\0" +#define REACTOS_STR_INTERNAL_NAME "kbdsw\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsw.dll\0" #include <reactos/version.rc>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs