Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-20 15:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync xcopy, winhlp32, wordpad, write and d3dx9_36 to Wine 1.1.40

Browse source 
svn path=/trunk/; revision=45954
This commit is contained in:
Daniel Reimer 2010-03-06 16:04:27 +00:00
parent e739983b34
commit a4aa7d5b7e
65 changed files with 1986 additions and 617 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/base/applications/cmdutils/xcopy/De.rc
View file

@ -80,4 +80,3 @@ Mit:\n\
\t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Fr.rc
View file

@ -81,4 +81,3 @@ où :\n\
\t\tque le fichier source\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/It.rc
View file

@ -81,4 +81,3 @@ Dove:\n\
\t\tdella sorgente\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Ja.rc
View file

@ -81,4 +81,3 @@ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
\t\tコピー先がコピー元より古いファイルだけコピーします。\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Lt.rc
View file

@ -81,4 +81,3 @@ Kur:\n\
\t\tsenesnis už šaltinio failą\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Nl.rc
View file

@ -79,4 +79,3 @@ Parameters:\n\
\t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Ru.rc
View file

@ -84,4 +84,3 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
после указанной даты. Если дата не указана, копирует только\n\
те файлы, которые новее в исходной папке.\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Si.rc
View file

@ -80,4 +80,3 @@ Where:\n\
\t\tod izvora\n\n"
}
#pragma code_page(default)

1
reactos/base/applications/cmdutils/xcopy/Uk.rc
View file

@ -82,4 +82,3 @@ Where:\n\
\t\tthan source\n\n"
}
#pragma code_page(default)

14
reactos/base/applications/cmdutils/xcopy/rsrc.rc
View file

@ -27,17 +27,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include <reactos/version.rc>
#include "Da.rc"
#include "De.rc"
#include "En.rc"
#include "Fr.rc"
#include "It.rc"
#include "Ja.rc"
#include "Ko.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
#include "Pt.rc"
/* UTF-8 */
#include "De.rc"
#include "Fr.rc"
#include "It.rc"
#include "Ja.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Uk.rc"

1
reactos/base/applications/winhlp32/De.rc
View file

@ -128,4 +128,3 @@ END
MENUITEM "Systemfarben verwenden", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Fr.rc
View file

@ -131,4 +131,3 @@ BEGIN
MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/It.rc
View file

@ -89,4 +89,3 @@ STID_FILE_NOT_FOUND_s "Non è stato possibile trovare '%s'. Vuoi cercare questo
STID_NO_RICHEDIT "Non è stato possibile trovare un'implementazione richedit... Annullando"
STID_PSH_INDEX, "Argomenti di aiuto: "
}
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Ja.rc
View file

@ -128,4 +128,3 @@ BEGIN
MENUITEM "システム カラーを使う", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Lt.rc
View file

@ -129,4 +129,3 @@ BEGIN
MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Nl.rc
View file

@ -127,4 +127,3 @@ BEGIN
MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Pt.rc
View file

@ -204,4 +204,3 @@ BEGIN
MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Rm.rc
View file

@ -92,4 +92,3 @@ STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yoursel
STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting"
STID_PSH_INDEX, "Help topics: "
}
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Ro.rc
View file

@ -130,4 +130,3 @@ BEGIN
MENUITEM "Utilizează culorile sistemului", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Ru.rc
View file

@ -121,4 +121,3 @@ BEGIN
MENUITEM "Использовать системные цвета", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Si.rc
View file

@ -126,4 +126,3 @@ BEGIN
MENUITEM "Uporabi sistemske barve", MNID_CTXT_SYSTEM_COLORS
END
END
#pragma code_page(default)

1
reactos/base/applications/winhlp32/Zh.rc
View file

@ -160,4 +160,3 @@ STID_FILE_NOT_FOUND_s "不能開啟檔案 '%s'. 你想要自己找這個檔案
STID_NO_RICHEDIT "找不到 richedit... 終止"
STID_PSH_INDEX, "幫助內容: "
}
#pragma code_page(default)

20
reactos/base/applications/winhlp32/rsrc.rc
View file

@ -27,25 +27,27 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
#include "Bg.rc"
#include "Cs.rc"
#include "Da.rc"
#include "De.rc"
#include "En.rc"
#include "Es.rc"
#include "Fi.rc"
#include "Fr.rc"
#include "Hu.rc"
#include "It.rc"
#include "Ja.rc"
#include "Ko.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
#include "Sk.rc"
#include "Sv.rc"
#include "Tr.rc"
/* UTF-8 */
#include "De.rc"
#include "Fr.rc"
#include "It.rc"
#include "Ja.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "Pt.rc"
#include "Rm.rc"
#include "Ro.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sk.rc"
#include "Sv.rc"
#include "Tr.rc"
#include "Zh.rc"

26
reactos/base/applications/wordpad/Da.rc
View file

@ -106,6 +106,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Sort", ID_COLOR_BLACK
MENUITEM "Mørkerød", ID_COLOR_MAROON
MENUITEM "Grøn", ID_COLOR_GREEN
MENUITEM "Oliven" ID_COLOR_OLIVE
MENUITEM "Navy" ID_COLOR_NAVY
MENUITEM "Lilla" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Grå" ID_COLOR_GRAY
MENUITEM "Sølv" ID_COLOR_SILVER
MENUITEM "Rød" ID_COLOR_RED
MENUITEM "Lime" ID_COLOR_LIME
MENUITEM "Gul" ID_COLOR_YELLOW
MENUITEM "Blå" ID_COLOR_BLUE
MENUITEM "Violet" ID_COLOR_FUCHSIA
MENUITEM "Cyan" ID_COLOR_AQUA
MENUITEM "Hvid" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Dato og tid"
@ -221,6 +245,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Luk"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE

33
reactos/base/applications/wordpad/De.rc
View file

@ -108,6 +108,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Schwarz" ID_COLOR_BLACK
MENUITEM "Kastanienbraun" ID_COLOR_MAROON
MENUITEM "Grün" ID_COLOR_GREEN
MENUITEM "Olivgrün" ID_COLOR_OLIVE
MENUITEM "Dunkelblau" ID_COLOR_NAVY
MENUITEM "Lila" ID_COLOR_PURPLE
MENUITEM "Blaugrün" ID_COLOR_TEAL
MENUITEM "Grau" ID_COLOR_GRAY
MENUITEM "Silber" ID_COLOR_SILVER
MENUITEM "Rot" ID_COLOR_RED
MENUITEM "Hellgrün" ID_COLOR_LIME
MENUITEM "Gelb" ID_COLOR_YELLOW
MENUITEM "Blau" ID_COLOR_BLUE
MENUITEM "Pink" ID_COLOR_FUCHSIA
MENUITEM "Aquamarin" ID_COLOR_AQUA
MENUITEM "Weiß" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Datum und Uhrzeit"
@ -218,9 +242,13 @@ BEGIN
STRING_PREVIEW_PRINT, "&Drucken"
STRING_PREVIEW_NEXTPAGE, "&Nächste"
STRING_PREVIEW_PREVPAGE, "&Vorherige"
STRING_PREVIEW_TWOPAGES, "Zwei Seiten"
STRING_PREVIEW_ONEPAGE, "Eine Seite"
STRING_PREVIEW_TWOPAGES, "&Zwei Seiten"
STRING_PREVIEW_ONEPAGE, "&Eine Seite"
STRING_PREVIEW_ZOOMIN, "Ver&größern"
STRING_PREVIEW_ZOOMOUT, "Ver&kleinern"
STRING_PREVIEW_CLOSE, "&Schließen"
STRING_PREVIEW_PAGE, "Seite"
STRING_PREVIEW_PAGES, "Seiten"
END
STRINGTABLE DISCARDABLE
@ -246,4 +274,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert"
STRING_MAX_TAB_STOPS, "Es können nur maximal 32 Tabstopps definiert werden."
END
#pragma code_page(default)

26
reactos/base/applications/wordpad/En.rc
View file

@ -106,6 +106,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Black", ID_COLOR_BLACK
MENUITEM "Maroon", ID_COLOR_MAROON
MENUITEM "Green", ID_COLOR_GREEN
MENUITEM "Olive" ID_COLOR_OLIVE
MENUITEM "Navy" ID_COLOR_NAVY
MENUITEM "Purple" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Gray" ID_COLOR_GRAY
MENUITEM "Silver" ID_COLOR_SILVER
MENUITEM "Red" ID_COLOR_RED
MENUITEM "Lime" ID_COLOR_LIME
MENUITEM "Yellow" ID_COLOR_YELLOW
MENUITEM "Blue" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "White" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Date and time"
@ -213,6 +237,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Close"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
STRING_UNITS_CM, "cm"
END

27
reactos/base/applications/wordpad/Fr.rc
View file

@ -109,6 +109,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Noir" ID_COLOR_BLACK
MENUITEM "Marron" ID_COLOR_MAROON
MENUITEM "Vert" ID_COLOR_GREEN
MENUITEM "Olive" ID_COLOR_OLIVE
MENUITEM "Bleu marine" ID_COLOR_NAVY
MENUITEM "Pourpre" ID_COLOR_PURPLE
MENUITEM "Sarcelle" ID_COLOR_TEAL
MENUITEM "Gris" ID_COLOR_GRAY
MENUITEM "Argent" ID_COLOR_SILVER
MENUITEM "Rouge" ID_COLOR_RED
MENUITEM "Citron vert" ID_COLOR_LIME
MENUITEM "Jaune" ID_COLOR_YELLOW
MENUITEM "Bleu" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Eau" ID_COLOR_AQUA
MENUITEM "Blanc" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Date et heure"
@ -224,6 +248,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom avant"
STRING_PREVIEW_ZOOMOUT, "Zoom arrière"
STRING_PREVIEW_CLOSE, "Fermer"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas implémentée"
STRING_MAX_TAB_STOPS, "Impossible d'ajouter plus de 32 taquets de tabulation."
END
#pragma code_page(default)

26
reactos/base/applications/wordpad/Hu.rc
View file

@ -106,6 +106,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Black", ID_COLOR_BLACK
MENUITEM "Maroon", ID_COLOR_MAROON
MENUITEM "Green", ID_COLOR_GREEN
MENUITEM "Olive" ID_COLOR_OLIVE
MENUITEM "Navy" ID_COLOR_NAVY
MENUITEM "Purple" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Gray" ID_COLOR_GRAY
MENUITEM "Silver" ID_COLOR_SILVER
MENUITEM "Red" ID_COLOR_RED
MENUITEM "Lime" ID_COLOR_LIME
MENUITEM "Yellow" ID_COLOR_YELLOW
MENUITEM "Blue" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "White" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Date and time"
@ -221,6 +245,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Close"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE

27
reactos/base/applications/wordpad/It.rc
View file

@ -110,6 +110,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Nero" ID_COLOR_BLACK
MENUITEM "Marrone rossiccio" ID_COLOR_MAROON
MENUITEM "Verde" ID_COLOR_GREEN
MENUITEM "Verde oliva" ID_COLOR_OLIVE
MENUITEM "Blu oltremare" ID_COLOR_NAVY
MENUITEM "Propora" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Grigio" ID_COLOR_GRAY
MENUITEM "Argento" ID_COLOR_SILVER
MENUITEM "Rosso" ID_COLOR_RED
MENUITEM "Verde cedro" ID_COLOR_LIME
MENUITEM "Giallo" ID_COLOR_YELLOW
MENUITEM "Blu" ID_COLOR_BLUE
MENUITEM "Fucsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "Bianco" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Data e ora"
@ -217,6 +241,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Ingrandisci"
STRING_PREVIEW_ZOOMOUT, "Rimpicciolisci"
STRING_PREVIEW_CLOSE, "Chiudi"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
STRING_UNITS_CM, "cm"
END
@ -238,4 +264,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata"
STRING_MAX_TAB_STOPS, "Non si possono aggiungere più di 32 punti di fermata delle tabulazioni."
END
#pragma code_page(default)

27
reactos/base/applications/wordpad/Ja.rc
View file

@ -109,6 +109,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "黒" ID_COLOR_BLACK
MENUITEM "茶色" ID_COLOR_MAROON
MENUITEM "緑" ID_COLOR_GREEN
MENUITEM "オリーブ" ID_COLOR_OLIVE
MENUITEM "紺" ID_COLOR_NAVY
MENUITEM "紫" ID_COLOR_PURPLE
MENUITEM "青緑" ID_COLOR_TEAL
MENUITEM "灰色" ID_COLOR_GRAY
MENUITEM "銀色" ID_COLOR_SILVER
MENUITEM "赤" ID_COLOR_RED
MENUITEM "黄緑" ID_COLOR_LIME
MENUITEM "黄" ID_COLOR_YELLOW
MENUITEM "青" ID_COLOR_BLUE
MENUITEM "赤紫" ID_COLOR_FUCHSIA
MENUITEM "水色" ID_COLOR_AQUA
MENUITEM "白" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "日付と時刻"
@ -224,6 +248,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "閉じる"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。"
STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。"
END
#pragma code_page(default)

32
reactos/base/applications/wordpad/Ko.rc
View file

@ -107,6 +107,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "검정" ID_COLOR_BLACK
MENUITEM "밤색" ID_COLOR_MAROON
MENUITEM "녹색" ID_COLOR_GREEN
MENUITEM "올리브색" ID_COLOR_OLIVE
MENUITEM "짙은 남색" ID_COLOR_NAVY
MENUITEM "심홍색" ID_COLOR_PURPLE
MENUITEM "검은 물오리색" ID_COLOR_TEAL
MENUITEM "회색" ID_COLOR_GRAY
MENUITEM "은색" ID_COLOR_SILVER
MENUITEM "빨강" ID_COLOR_RED
MENUITEM "라임색" ID_COLOR_LIME
MENUITEM "노랑" ID_COLOR_YELLOW
MENUITEM "파랑" ID_COLOR_BLUE
MENUITEM "자홍색" ID_COLOR_FUCHSIA
MENUITEM "물색" ID_COLOR_AQUA
MENUITEM "하양" ID_COLOR_WHITE
MENUITEM "자동" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "날짜와 시간"
@ -212,10 +236,12 @@ BEGIN
STRING_PREVIEW_PREVPAGE, "이전 페이지"
STRING_PREVIEW_TWOPAGES, "두 페이지"
STRING_PREVIEW_ONEPAGE, "한 페이지"
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_ZOOMIN, "확대"
STRING_PREVIEW_ZOOMOUT, "축소"
STRING_PREVIEW_CLOSE, "닫기"
STRING_UNITS_CM, "cm"
STRING_PREVIEW_PAGE, "페이지"
STRING_PREVIEW_PAGES, "페이지들"
STRING_UNITS_CM, "cm"
END
STRINGTABLE DISCARDABLE

27
reactos/base/applications/wordpad/Lt.rc
View file

@ -109,6 +109,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Juoda" ID_COLOR_BLACK
MENUITEM "Kaštoninė" ID_COLOR_MAROON
MENUITEM "Žalia" ID_COLOR_GREEN
MENUITEM "Alyvinė" ID_COLOR_OLIVE
MENUITEM "Ultramarinas" ID_COLOR_NAVY
MENUITEM "Purpurinė" ID_COLOR_PURPLE
MENUITEM "Neutrali ciano" ID_COLOR_TEAL
MENUITEM "Pilka" ID_COLOR_GRAY
MENUITEM "Sidabrinė" ID_COLOR_SILVER
MENUITEM "Raudona" ID_COLOR_RED
MENUITEM "Gelsvai žalsva" ID_COLOR_LIME
MENUITEM "Geltona" ID_COLOR_YELLOW
MENUITEM "Mėlyna" ID_COLOR_BLUE
MENUITEM "Fuksija" ID_COLOR_FUCHSIA
MENUITEM "Žydra" ID_COLOR_AQUA
MENUITEM "Balta" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Data ir laikas"
@ -224,6 +248,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Didinti"
STRING_PREVIEW_ZOOMOUT, "Mažinti"
STRING_PREVIEW_CLOSE, "Užverti"
STRING_PREVIEW_PAGE, "Puslapis"
STRING_PREVIEW_PAGES, "Puslapiai"
END
STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Spausdinimas nerealizuotas"
STRING_MAX_TAB_STOPS, "Negalima pridėti daugiau negu 32-jų tabuliavimo pozicijų."
END
#pragma code_page(default)

26
reactos/base/applications/wordpad/Nl.rc
View file

@ -107,6 +107,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Zwart" ID_COLOR_BLACK
MENUITEM "Kastanjebruin" ID_COLOR_MAROON
MENUITEM "Groen" ID_COLOR_GREEN
MENUITEM "Olijfgroen" ID_COLOR_OLIVE
MENUITEM "Marineblauw" ID_COLOR_NAVY
MENUITEM "Paars" ID_COLOR_PURPLE
MENUITEM "Groenblauw" ID_COLOR_TEAL
MENUITEM "Grijs" ID_COLOR_GRAY
MENUITEM "Zilver" ID_COLOR_SILVER
MENUITEM "Rood" ID_COLOR_RED
MENUITEM "Lichtgroen" ID_COLOR_LIME
MENUITEM "Geel" ID_COLOR_YELLOW
MENUITEM "Blauw" ID_COLOR_BLUE
MENUITEM "Fuchsiapaars" ID_COLOR_FUCHSIA
MENUITEM "Zeeblauw" ID_COLOR_AQUA
MENUITEM "Wit" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Datum en tijd"
@ -214,6 +238,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Sluiten"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE

27
reactos/base/applications/wordpad/No.rc
View file

@ -108,6 +108,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Svart" ID_COLOR_BLACK
MENUITEM "Rødbrun" ID_COLOR_MAROON
MENUITEM "Grønn" ID_COLOR_GREEN
MENUITEM "Oliven" ID_COLOR_OLIVE
MENUITEM "Marineblå" ID_COLOR_NAVY
MENUITEM "Purpur" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Grå" ID_COLOR_GRAY
MENUITEM "Sølv" ID_COLOR_SILVER
MENUITEM "Rød" ID_COLOR_RED
MENUITEM "Lime-grønn" ID_COLOR_LIME
MENUITEM "Gul" ID_COLOR_YELLOW
MENUITEM "Blå" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "Hvit" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Dato og klokkeslett"
@ -223,6 +247,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Lukk"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -248,4 +274,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Utskriftfunksjonen er ikke laget ennå."
STRING_MAX_TAB_STOPS, "Kan ikke legge til mer enn 32 tabulatorstopp."
END
#pragma code_page(default)

26
reactos/base/applications/wordpad/Pl.rc
View file

@ -107,6 +107,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Czarny" ID_COLOR_BLACK
MENUITEM "Kasztanowy" ID_COLOR_MAROON
MENUITEM "Zielony" ID_COLOR_GREEN
MENUITEM "Oliwkowy" ID_COLOR_OLIVE
MENUITEM "Granatowy" ID_COLOR_NAVY
MENUITEM "Purpurowy" ID_COLOR_PURPLE
MENUITEM "Zielonomodry" ID_COLOR_TEAL
MENUITEM "Szary" ID_COLOR_GRAY
MENUITEM "Srebrny" ID_COLOR_SILVER
MENUITEM "Czerwony" ID_COLOR_RED
MENUITEM "Limonowy" ID_COLOR_LIME
MENUITEM "¯ó³ty" ID_COLOR_YELLOW
MENUITEM "Niebieski" ID_COLOR_BLUE
MENUITEM "Fuksja" ID_COLOR_FUCHSIA
MENUITEM "Akwamaryna" ID_COLOR_AQUA
MENUITEM "Bia³y" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Data i godzina"
@ -222,6 +246,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Zamknij"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE

27
reactos/base/applications/wordpad/Pt.rc
View file

@ -110,6 +110,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Preto" ID_COLOR_BLACK
MENUITEM "Castanho" ID_COLOR_MAROON
MENUITEM "Verde" ID_COLOR_GREEN
MENUITEM "Verde-oliva" ID_COLOR_OLIVE
MENUITEM "Azul-marinho" ID_COLOR_NAVY
MENUITEM "Roxo" ID_COLOR_PURPLE
MENUITEM "Azul-petróleo" ID_COLOR_TEAL
MENUITEM "Cinza" ID_COLOR_GRAY
MENUITEM "Prateado" ID_COLOR_SILVER
MENUITEM "Vermelho" ID_COLOR_RED
MENUITEM "Verde-limão" ID_COLOR_LIME
MENUITEM "Amarelo" ID_COLOR_YELLOW
MENUITEM "Azul" ID_COLOR_BLUE
MENUITEM "Fúcsia" ID_COLOR_FUCHSIA
MENUITEM "Azul-piscina" ID_COLOR_AQUA
MENUITEM "Branco" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Data e hora"
@ -225,6 +249,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Fechar"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -250,4 +276,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada"
STRING_MAX_TAB_STOPS, "Não pode adicionar mais de 32 tabs."
END
#pragma code_page(default)

31
reactos/base/applications/wordpad/Ru.rc
View file

@ -109,6 +109,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Чёрный" ID_COLOR_BLACK
MENUITEM "Тёмно-бордовый" ID_COLOR_MAROON
MENUITEM "Зелёный" ID_COLOR_GREEN
MENUITEM "Оливковый" ID_COLOR_OLIVE
MENUITEM "Тёмно-синий" ID_COLOR_NAVY
MENUITEM "Пурпурный" ID_COLOR_PURPLE
MENUITEM "Морской волны" ID_COLOR_TEAL
MENUITEM "Серый" ID_COLOR_GRAY
MENUITEM "Серебряный" ID_COLOR_SILVER
MENUITEM "Красный" ID_COLOR_RED
MENUITEM "Лимонный" ID_COLOR_LIME
MENUITEM "Жёлтый" ID_COLOR_YELLOW
MENUITEM "Синий" ID_COLOR_BLUE
MENUITEM "Ярко-розовый" ID_COLOR_FUCHSIA
MENUITEM "Голубой" ID_COLOR_AQUA
MENUITEM "Белый" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Дата и время"
@ -221,9 +245,11 @@ BEGIN
STRING_PREVIEW_PREVPAGE, "Предыдущая страница"
STRING_PREVIEW_TWOPAGES, "Две страницы"
STRING_PREVIEW_ONEPAGE, "Одна страница"
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_ZOOMIN, "Приблизить"
STRING_PREVIEW_ZOOMOUT, "Отдалить"
STRING_PREVIEW_CLOSE, "Закрыть"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Печать не поддерживается"
STRING_MAX_TAB_STOPS, "Нельзя добавить более 32 позиций табуляции."
END
#pragma code_page(default)

27
reactos/base/applications/wordpad/Si.rc
View file

@ -108,6 +108,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Črna" ID_COLOR_BLACK
MENUITEM "Kostanjeva" ID_COLOR_MAROON
MENUITEM "Zelena" ID_COLOR_GREEN
MENUITEM "Olivna" ID_COLOR_OLIVE
MENUITEM "Mornariška" ID_COLOR_NAVY
MENUITEM "Vijolična" ID_COLOR_PURPLE
MENUITEM "Zelenomodra" ID_COLOR_TEAL
MENUITEM "Siva" ID_COLOR_GRAY
MENUITEM "Srebrna" ID_COLOR_SILVER
MENUITEM "Rdeča" ID_COLOR_RED
MENUITEM "Citronska" ID_COLOR_LIME
MENUITEM "Rumena" ID_COLOR_YELLOW
MENUITEM "Modra" ID_COLOR_BLUE
MENUITEM "Roza" ID_COLOR_FUCHSIA
MENUITEM "Akvamarin" ID_COLOR_AQUA
MENUITEM "Bela" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Datum in čas"
@ -223,6 +247,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Zapri"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo"
STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja."
END
#pragma code_page(default)

27
reactos/base/applications/wordpad/Sv.rc
View file

@ -108,6 +108,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Svart" ID_COLOR_BLACK
MENUITEM "Rödbrun" ID_COLOR_MAROON
MENUITEM "Grön" ID_COLOR_GREEN
MENUITEM "Oliv" ID_COLOR_OLIVE
MENUITEM "Navy" ID_COLOR_NAVY
MENUITEM "Lila" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Grå" ID_COLOR_GRAY
MENUITEM "Silver" ID_COLOR_SILVER
MENUITEM "Röd" ID_COLOR_RED
MENUITEM "Lime" ID_COLOR_LIME
MENUITEM "Gul" ID_COLOR_YELLOW
MENUITEM "Blå" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "Vit" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Datum och tid"
@ -223,6 +247,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zooma in"
STRING_PREVIEW_ZOOMOUT, "Zooma ut"
STRING_PREVIEW_CLOSE, "Stäng"
STRING_PREVIEW_PAGE, "Sida"
STRING_PREVIEW_PAGES, "Sidor"
END
STRINGTABLE DISCARDABLE
@ -248,4 +274,3 @@ BEGIN
STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat."
STRING_MAX_TAB_STOPS, "Kan ej lägga till mer än 32 tabbstopp."
END
#pragma code_page(default)

26
reactos/base/applications/wordpad/Tr.rc
View file

@ -108,6 +108,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Siyah" ID_COLOR_BLACK
MENUITEM "Koyu Kýrmýzý" ID_COLOR_MAROON
MENUITEM "Yeþil" ID_COLOR_GREEN
MENUITEM "Koyu Sarý" ID_COLOR_OLIVE
MENUITEM "Koyu Mavi" ID_COLOR_NAVY
MENUITEM "Mor" ID_COLOR_PURPLE
MENUITEM "Deniz Mavisi" ID_COLOR_TEAL
MENUITEM "Gri" ID_COLOR_GRAY
MENUITEM "Gümüþ" ID_COLOR_SILVER
MENUITEM "Kýrmýzý" ID_COLOR_RED
MENUITEM "Parlak Yeþil" ID_COLOR_LIME
MENUITEM "Sarý" ID_COLOR_YELLOW
MENUITEM "Mavi" ID_COLOR_BLUE
MENUITEM "Pembe" ID_COLOR_FUCHSIA
MENUITEM "Turkuaz" ID_COLOR_AQUA
MENUITEM "Beyaz" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Date and time"
@ -223,6 +247,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "Close"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE

27
reactos/base/applications/wordpad/Uk.rc
View file

@ -113,6 +113,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "×îðíèé" ID_COLOR_BLACK
MENUITEM "Áðóíàòíèé" ID_COLOR_MAROON
MENUITEM "Çåëåíèé" ID_COLOR_GREEN
MENUITEM "Îëèâêîâèé" ID_COLOR_OLIVE
MENUITEM "Ñèí³é" ID_COLOR_NAVY
MENUITEM "Ïóðïóðíèé" ID_COLOR_PURPLE
MENUITEM "Çåëåíî-ñèí³é" ID_COLOR_TEAL
MENUITEM "ѳðèé" ID_COLOR_GRAY
MENUITEM "Ñð³áíèé" ID_COLOR_SILVER
MENUITEM "×åðâîíèé" ID_COLOR_RED
MENUITEM "Ñàëàòîâèé" ID_COLOR_LIME
MENUITEM "Æîâòèé" ID_COLOR_YELLOW
MENUITEM "Ãîëóáèé" ID_COLOR_BLUE
MENUITEM "Ô³îëåòîâèé" ID_COLOR_FUCHSIA
MENUITEM "Àêâàìàðèí" ID_COLOR_AQUA
MENUITEM "Á³ëèé" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Дата та час"
@ -220,6 +244,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Збільшити"
STRING_PREVIEW_ZOOMOUT, "Зменшити"
STRING_PREVIEW_CLOSE, "Закрити"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
STRING_UNITS_CM, "cm"
END
@ -250,4 +276,3 @@ BEGIN
STRING_ALIGN_RIGHT, "По правому Краю"
STRING_ALIGN_CENTER, "По Центру"
END
#pragma code_page(default)

27
reactos/base/applications/wordpad/Zh.rc
View file

@ -111,6 +111,30 @@ BEGIN
END
END
IDM_COLOR_POPUP MENU DISCARDABLE
BEGIN
POPUP ""
BEGIN
MENUITEM "Black", ID_COLOR_BLACK
MENUITEM "Maroon", ID_COLOR_MAROON
MENUITEM "Green", ID_COLOR_GREEN
MENUITEM "Olive" ID_COLOR_OLIVE
MENUITEM "Navy" ID_COLOR_NAVY
MENUITEM "Purple" ID_COLOR_PURPLE
MENUITEM "Teal" ID_COLOR_TEAL
MENUITEM "Gray" ID_COLOR_GRAY
MENUITEM "Silver" ID_COLOR_SILVER
MENUITEM "Red" ID_COLOR_RED
MENUITEM "Lime" ID_COLOR_LIME
MENUITEM "Yellow" ID_COLOR_YELLOW
MENUITEM "Blue" ID_COLOR_BLUE
MENUITEM "Fuchsia" ID_COLOR_FUCHSIA
MENUITEM "Aqua" ID_COLOR_AQUA
MENUITEM "White" ID_COLOR_WHITE
MENUITEM "Automatic" ID_COLOR_AUTOMATIC
END
END
IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "日期和时间"
@ -226,6 +250,8 @@ BEGIN
STRING_PREVIEW_ZOOMIN, "Zoom in"
STRING_PREVIEW_ZOOMOUT, "Zoom out"
STRING_PREVIEW_CLOSE, "关闭"
STRING_PREVIEW_PAGE, "Page"
STRING_PREVIEW_PAGES, "Pages"
END
STRINGTABLE DISCARDABLE
@ -473,4 +499,3 @@ BEGIN
STRING_OPEN_FAILED, "不能開啟檔案."
STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力."
END
#pragma code_page(default)

BIN
reactos/base/applications/wordpad/formatbar.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,014 B

After

Width:  |  Height:  |  Size: 1.1 KiB

1256
reactos/base/applications/wordpad/print.c
View file

File diff suppressed because it is too large Load diff

15
reactos/base/applications/wordpad/registry.c
View file

@ -27,6 +27,7 @@
static const WCHAR key_recentfiles[] = {'R','e','c','e','n','t',' ','f','i','l','e',
' ','l','i','s','t',0};
static const WCHAR key_options[] = {'O','p','t','i','o','n','s',0};
static const WCHAR key_settings[] = {'S','e','t','t','i','n','g','s',0};
static const WCHAR key_rtf[] = {'R','T','F',0};
static const WCHAR key_text[] = {'T','e','x','t',0};
@ -94,9 +95,14 @@ void registry_set_options(HWND hMainWnd)
RegSetValueExW(hKey, var_maximized, 0, REG_DWORD, (LPBYTE)&isMaximized, sizeof(DWORD));
registry_set_pagemargins(hKey);
RegCloseKey(hKey);
}
RegCloseKey(hKey);
if(registry_get_handle(&hKey, &action, key_settings) == ERROR_SUCCESS)
{
registry_set_previewpages(hKey);
RegCloseKey(hKey);
}
}
void registry_read_winrect(RECT* rc)
@ -339,6 +345,13 @@ void registry_read_options(void)
registry_read_pagemargins(hKey);
RegCloseKey(hKey);
}
if(registry_get_handle(&hKey, 0, key_settings) != ERROR_SUCCESS) {
registry_read_previewpages(NULL);
} else {
registry_read_previewpages(hKey);
RegCloseKey(hKey);
}
}
static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[])

20
reactos/base/applications/wordpad/rsrc.rc
View file

@ -1,4 +1,4 @@
/*
/*
* Copyright 2004 by Krzysztof Foltman
* Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com>
*
@ -61,22 +61,28 @@ IDI_WRI ICON "wri.ico"
/* @makedep: txt.ico */
IDI_TXT ICON "txt.ico"
/* @makedep: zoom.cur */
IDC_ZOOM CURSOR "zoom.cur"
#include "Da.rc"
#include "De.rc"
#include "En.rc"
#include "Fr.rc"
#include "Hu.rc"
#include "Ko.rc"
#include "Nl.rc"
#include "Pl.rc"
#include "Tr.rc"
/* UTF-8 */
#include "De.rc"
#include "Fr.rc"
#include "It.rc"
#include "Ja.rc"
#include "Ko.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
#include "Pt.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sv.rc"
#include "Tr.rc"
#include "Uk.rc"
#include "Zh.rc"

66
reactos/base/applications/wordpad/wordpad.c
View file

@ -63,6 +63,7 @@ static HWND hMainWnd;
static HWND hEditorWnd;
static HWND hFindWnd;
static HMENU hPopupMenu;
static HMENU hColorPopupMenu;
static UINT ID_FINDMSGSTRING;
@ -1836,17 +1837,18 @@ static LRESULT OnCreate( HWND hWnd )
hFormatBarWnd = CreateToolbarEx(hReBarWnd,
CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON,
IDC_FORMATBAR, 7, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON));
IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON));
AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);
AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);
AddButton(hFormatBarWnd, 2, ID_FORMAT_UNDERLINE);
AddButton(hFormatBarWnd, 3, ID_FORMAT_COLOR);
AddSeparator(hFormatBarWnd);
AddButton(hFormatBarWnd, 3, ID_ALIGN_LEFT);
AddButton(hFormatBarWnd, 4, ID_ALIGN_CENTER);
AddButton(hFormatBarWnd, 5, ID_ALIGN_RIGHT);
AddButton(hFormatBarWnd, 4, ID_ALIGN_LEFT);
AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER);
AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT);
AddSeparator(hFormatBarWnd);
AddButton(hFormatBarWnd, 6, ID_BULLET);
AddButton(hFormatBarWnd, 7, ID_BULLET);
SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0);
@ -2001,6 +2003,15 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
return 0;
}
/* Copied from dlls/comdlg32/fontdlg.c */
static const COLORREF textcolors[]=
{
0x00000000L,0x00000080L,0x00008000L,0x00008080L,
0x00800000L,0x00800080L,0x00808000L,0x00808080L,
0x00c0c0c0L,0x000000ffL,0x0000ff00L,0x0000ffffL,
0x00ff0000L,0x00ff00ffL,0x00ffff00L,0x00FFFFFFL
};
static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
{
HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
@ -2098,7 +2109,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
break;
case ID_PRINT_QUICK:
print_quick(wszFileName);
print_quick(hMainWnd, wszFileName);
target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);
break;
@ -2106,7 +2117,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
{
int index = reg_formatindex(fileFormat);
DWORD tmp = barState[index];
barState[index] = 0;
barState[index] = 1 << BANDID_STATUSBAR;
set_bar_states();
barState[index] = tmp;
ShowWindow(hEditorWnd, FALSE);
@ -2152,6 +2163,46 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
break;
}
case ID_FORMAT_COLOR:
{
HWND hReBarWnd = GetDlgItem(hWnd, IDC_REBAR);
HWND hFormatBarWnd = GetDlgItem(hReBarWnd, IDC_FORMATBAR);
HMENU hPop;
RECT itemrc;
POINT pt;
int mid;
int itemidx = SendMessage(hFormatBarWnd, TB_COMMANDTOINDEX, ID_FORMAT_COLOR, 0);
SendMessage(hFormatBarWnd, TB_GETITEMRECT, itemidx, (LPARAM)&itemrc);
pt.x = itemrc.left;
pt.y = itemrc.bottom;
ClientToScreen(hFormatBarWnd, &pt);
hPop = GetSubMenu(hColorPopupMenu, 0);
mid = TrackPopupMenu(hPop, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON |
TPM_RETURNCMD | TPM_NONOTIFY,
pt.x, pt.y, 0, hWnd, 0);
if (mid >= ID_COLOR_FIRST && mid <= ID_COLOR_AUTOMATIC)
{
CHARFORMAT2W fmt;
ZeroMemory(&fmt, sizeof(fmt));
fmt.cbSize = sizeof(fmt);
SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
fmt.dwMask = CFM_COLOR;
if (mid < ID_COLOR_AUTOMATIC) {
fmt.crTextColor = textcolors[mid - ID_COLOR_FIRST];
fmt.dwEffects &= ~CFE_AUTOCOLOR;
} else {
fmt.dwEffects |= CFE_AUTOCOLOR;
}
SendMessageW(hwndEditor, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
}
break;
}
case ID_EDIT_CUT:
PostMessageW(hwndEditor, WM_CUT, 0, 0);
break;
@ -2618,6 +2669,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
set_bar_states();
set_fileformat(SF_RTF);
hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP));
hColorPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_COLOR_POPUP));
get_default_printer_opts();
target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

31
reactos/base/applications/wordpad/wordpad.h
View file

@ -80,6 +80,7 @@
#define ID_FORMAT_BOLD 1400
#define ID_FORMAT_ITALIC 1401
#define ID_FORMAT_UNDERLINE 1402
#define ID_FORMAT_COLOR 1403
#define ID_TOGGLE_TOOLBAR 1500
#define ID_TOGGLE_FORMATBAR 1501
@ -133,6 +134,25 @@
#define ID_ABOUT 1603
#define ID_VIEWPROPERTIES 1604
#define ID_COLOR_FIRST 1800
#define ID_COLOR_BLACK 1800
#define ID_COLOR_MAROON 1801
#define ID_COLOR_GREEN 1802
#define ID_COLOR_OLIVE 1803
#define ID_COLOR_NAVY 1804
#define ID_COLOR_PURPLE 1805
#define ID_COLOR_TEAL 1806
#define ID_COLOR_GRAY 1807
#define ID_COLOR_SILVER 1808
#define ID_COLOR_RED 1809
#define ID_COLOR_LIME 1810
#define ID_COLOR_YELLOW 1811
#define ID_COLOR_BLUE 1812
#define ID_COLOR_FUCHSIA 1813
#define ID_COLOR_AQUA 1814
#define ID_COLOR_WHITE 1815
#define ID_COLOR_AUTOMATIC 1816
#define IDC_STATUSBAR 2000
#define IDC_EDITOR 2001
#define IDC_TOOLBAR 2002
@ -159,6 +179,7 @@
#define IDM_MAINMENU 2200
#define IDM_POPUP 2201
#define IDM_COLOR_POPUP 2202
#define IDB_TOOLBAR 100
#define IDB_FORMATBAR 101
@ -168,6 +189,8 @@
#define IDI_WRI 104
#define IDI_TXT 105
#define IDC_ZOOM 106
#define STRING_ALL_FILES 1400
#define STRING_TEXT_FILES_TXT 1401
#define STRING_TEXT_FILES_UNICODE_TXT 1402
@ -195,8 +218,10 @@
#define STRING_PREVIEW_ZOOMIN 1453
#define STRING_PREVIEW_ZOOMOUT 1454
#define STRING_PREVIEW_CLOSE 1455
#define STRING_PREVIEW_PAGE 1456
#define STRING_PREVIEW_PAGES 1457
#define STRING_UNITS_CM 1456
#define STRING_UNITS_CM 1458
#define STRING_DEFAULT_FILENAME 1700
#define STRING_PROMPT_SAVE_CHANGES 1701
@ -217,7 +242,7 @@ LPWSTR file_basename(LPWSTR);
void dialog_printsetup(HWND);
void dialog_print(HWND, LPWSTR);
void target_device(HWND, DWORD);
void print_quick(LPWSTR);
void print_quick(HWND, LPWSTR);
LRESULT preview_command(HWND, WPARAM);
void init_preview(HWND, LPWSTR);
void close_preview(HWND);
@ -226,6 +251,8 @@ LRESULT print_preview(HWND);
void get_default_printer_opts(void);
void registry_set_pagemargins(HKEY);
void registry_read_pagemargins(HKEY);
void registry_set_previewpages(HKEY hKey);
void registry_read_previewpages(HKEY hKey);
LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM);
void redraw_ruler(HWND);

BIN
reactos/base/applications/wordpad/zoom.cur Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 766 B

1
reactos/base/applications/write/De.rc
View file

@ -27,4 +27,3 @@ STRINGTABLE
{
IDS_FAILED, "Der Start von Wordpad ist fehlgeschlagen"
}
#pragma code_page(default)

1
reactos/base/applications/write/Fr.rc
View file

@ -28,4 +28,3 @@ STRINGTABLE
{
IDS_FAILED, "Wordpad n'a pas pu être démarré"
}
#pragma code_page(default)

1
reactos/base/applications/write/It.rc
View file

@ -29,4 +29,3 @@ STRINGTABLE
{
IDS_FAILED, "Impossibile avviare WordPad"
}
#pragma code_page(default)

1
reactos/base/applications/write/Ja.rc
View file

@ -29,4 +29,3 @@ STRINGTABLE
{
IDS_FAILED, "Wordpad の起動に失敗しました"
}
#pragma code_page(default)

1
reactos/base/applications/write/Lt.rc
View file

@ -29,4 +29,3 @@ STRINGTABLE
{
IDS_FAILED, "Nepavyko paleisti Wordpad"
}
#pragma code_page(default)

1
reactos/base/applications/write/Ro.rc
View file

@ -27,4 +27,3 @@ STRINGTABLE
{
IDS_FAILED, "Execuția Wordpad a eșuat"
}
#pragma code_page(default)

1
reactos/base/applications/write/Ru.rc
View file

@ -29,4 +29,3 @@ STRINGTABLE
{
IDS_FAILED, "Не удалось запустить Wordpad"
}
#pragma code_page(default)

1
reactos/base/applications/write/Si.rc
View file

@ -28,4 +28,3 @@ STRINGTABLE
{
IDS_FAILED, "Zagon programa Wordpad ni uspel"
}
#pragma code_page(default)

1
reactos/base/applications/write/Uk.rc
View file

@ -31,4 +31,3 @@ STRINGTABLE
{
IDS_FAILED, "Не вдалось запустити Wordpad"
}
#pragma code_page(default)

14
reactos/base/applications/write/rsrc.rc
View file

@ -20,17 +20,21 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include "De.rc"
#include "En.rc"
#include "Ko.rc"
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
#include "Pt.rc"
#include "Sv.rc"
/* UTF-8 */
#include "De.rc"
#include "Fr.rc"
#include "It.rc"
#include "Ja.rc"
#include "Ko.rc"
#include "Lt.rc"
#include "Nl.rc"
#include "Pt.rc"
#include "Ro.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sv.rc"
#include "Uk.rc"

1
reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild
View file

@ -22,6 +22,7 @@
<file>shader.c</file>
<file>sprite.c</file>
<file>surface.c</file>
<file>texture.c</file>
<file>util.c</file>
<file>version.rc</file>

10
reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec
View file

@ -11,7 +11,7 @@
@ stub D3DXCleanMesh
@ stdcall D3DXColorAdjustContrast(ptr ptr long)
@ stdcall D3DXColorAdjustSaturation(ptr ptr long)
@ stub D3DXCompileShader
@ stdcall D3DXCompileShader(ptr long ptr ptr ptr ptr long ptr ptr ptr)
@ stub D3DXCompileShaderFromFileA
@ stub D3DXCompileShaderFromFileW
@ stub D3DXCompileShaderFromResourceA
@ -92,7 +92,7 @@
@ stub D3DXCreateTeapot
@ stub D3DXCreateTextA
@ stub D3DXCreateTextW
@ stub D3DXCreateTexture
@ stdcall D3DXCreateTexture(ptr long long long long long long ptr)
@ stub D3DXCreateTextureFromFileA
@ stub D3DXCreateTextureFromFileExA
@ stub D3DXCreateTextureFromFileExW
@ -129,7 +129,7 @@
@ stub D3DXFillVolumeTexture
@ stub D3DXFillVolumeTextureTX
@ stub D3DXFilterTexture
@ stub D3DXFindShaderComment
@ stdcall D3DXFindShaderComment(ptr long ptr ptr)
@ stub D3DXFloat16To32Array
@ stub D3DXFloat32To16Array
@ stub D3DXFrameAppendChild
@ -157,8 +157,8 @@
@ stdcall D3DXGetImageInfoFromResourceA(long str ptr)
@ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr)
@ stdcall D3DXGetPixelShaderProfile(ptr)
@ stub D3DXGetShaderConstantTable
@ stub D3DXGetShaderConstantTableEx
@ stdcall D3DXGetShaderConstantTable(ptr ptr)
@ stdcall D3DXGetShaderConstantTableEx(ptr long ptr)
@ stub D3DXGetShaderInputSemantics
@ stub D3DXGetShaderOutputSemantics
@ stub D3DXGetShaderSamplers

419
reactos/dll/directx/wine/d3dx9_36/shader.c
View file

@ -23,6 +23,7 @@
#include "windef.h"
#include "wingdi.h"
#include "d3dx9.h"
#include "d3dx9shader.h"
#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@ -134,6 +135,41 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device)
return NULL;
}
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size)
{
CONST DWORD *ptr = byte_code;
TRACE("(%p, %x, %p, %p)", byte_code, fourcc, data, size);
if (!byte_code)
return D3DERR_INVALIDCALL;
while (*++ptr != D3DSIO_END)
{
/* Check if it is a comment */
if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT)
{
DWORD comment_size = (*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
/* Check if this is the comment we are looking for */
if (*(ptr + 1) == fourcc)
{
UINT ctab_size = (comment_size - 1) * sizeof(DWORD);
LPCVOID ctab_data = ptr + 2;
if (size)
*size = ctab_size;
if (data)
*data = ctab_data;
TRACE("Returning comment data at %p with size %d\n", ctab_data, ctab_size);
return D3D_OK;
}
ptr += comment_size;
}
}
return S_FALSE;
}
HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
UINT data_len,
CONST D3DXMACRO* defines,
@ -142,7 +178,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
LPD3DXBUFFER* shader,
LPD3DXBUFFER* error_messages)
{
FIXME("stub\n");
FIXME("(%p, %d, %p, %p, %x, %p, %p): stub\n", data, data_len, defines, include, flags, shader, error_messages);
return D3DERR_INVALIDCALL;
}
@ -177,7 +213,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
LPD3DXBUFFER* shader,
LPD3DXBUFFER* error_messages)
{
FIXME("stub\n");
FIXME("(%s, %p, %p, %x, %p, %p): stub\n", debugstr_w(filename), defines, include, flags, shader, error_messages);
return D3DERR_INVALIDCALL;
}
@ -220,3 +256,382 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module,
return D3DXAssembleShader(buffer, len, defines, include, flags,
shader, error_messages);
}
HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData,
UINT srcDataLen,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pFunctionName,
LPCSTR pProfile,
DWORD Flags,
LPD3DXBUFFER* ppShader,
LPD3DXBUFFER* ppErrorMsgs,
LPD3DXCONSTANTTABLE * ppConstantTable)
{
FIXME("(%p, %d, %p, %p, %p, %p, %d, %p, %p, %p): stub\n",
pSrcData, srcDataLen, pDefines, pInclude, pFunctionName,
pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable);
return D3DERR_INVALIDCALL;
}
static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl;
typedef struct ID3DXConstantTableImpl {
const ID3DXConstantTableVtbl *lpVtbl;
LONG ref;
LPVOID ctab;
DWORD size;
} ID3DXConstantTableImpl;
/*** IUnknown methods ***/
static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ID3DXConstantTable))
{
ID3DXConstantTable_AddRef(iface);
*ppvObject = This;
return S_OK;
}
ERR("Interface %s not found\n", debugstr_guid(riid));
return E_NOINTERFACE;
}
static ULONG WINAPI ID3DXConstantTableImpl_AddRef(ID3DXConstantTable* iface)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
TRACE("(%p)->(): AddRef from %d\n", This, This->ref);
return InterlockedIncrement(&This->ref);
}
static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(): Release from %d\n", This, ref + 1);
if (!ref)
{
HeapFree(GetProcessHeap(), 0, This->ctab);
HeapFree(GetProcessHeap(), 0, This);
}
return ref;
}
/*** ID3DXBuffer methods ***/
static LPVOID WINAPI ID3DXConstantTableImpl_GetBufferPointer(ID3DXConstantTable* iface)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
TRACE("(%p)->()\n", This);
return This->ctab;
}
static DWORD WINAPI ID3DXConstantTableImpl_GetBufferSize(ID3DXConstantTable* iface)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
TRACE("(%p)->()\n", This);
return This->size;
}
/*** ID3DXConstantTable methods ***/
static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable* iface, D3DXCONSTANTTABLE_DESC *desc)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p): stub\n", This, desc);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* iface, D3DXHANDLE constant,
D3DXCONSTANT_DESC *desc, UINT *count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p): stub\n", This, constant, desc, count);
return E_NOTIMPL;
}
static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %d): stub\n", This, constant, index);
return NULL;
}
static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable* iface, D3DXHANDLE constant, LPCSTR name)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %s): stub\n", This, constant, name);
return NULL;
}
static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %d): stub\n", This, constant, index);
return NULL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p): stub\n", This, device);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, LPCVOID data, UINT bytes)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, data, bytes);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, BOOL b)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, b);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST BOOL* b, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, b, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, n);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST INT* n, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, n, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, FLOAT f)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %f): stub\n", This, device, constant, f);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST FLOAT* f, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, f, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXVECTOR4* vector)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, vector);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXVECTOR4* vector, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, vector, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX* matrix)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX* matrix, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX** matrix, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX* matrix)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX* matrix, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count);
return E_NOTIMPL;
}
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,
D3DXHANDLE constant, CONST D3DXMATRIX** matrix, UINT count)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count);
return E_NOTIMPL;
}
static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl =
{
/*** IUnknown methods ***/
ID3DXConstantTableImpl_QueryInterface,
ID3DXConstantTableImpl_AddRef,
ID3DXConstantTableImpl_Release,
/*** ID3DXBuffer methods ***/
ID3DXConstantTableImpl_GetBufferPointer,
ID3DXConstantTableImpl_GetBufferSize,
/*** ID3DXConstantTable methods ***/
ID3DXConstantTableImpl_GetDesc,
ID3DXConstantTableImpl_GetConstantDesc,
ID3DXConstantTableImpl_GetConstant,
ID3DXConstantTableImpl_GetConstantByName,
ID3DXConstantTableImpl_GetConstantByElement,
ID3DXConstantTableImpl_SetDefaults,
ID3DXConstantTableImpl_SetValue,
ID3DXConstantTableImpl_SetBool,
ID3DXConstantTableImpl_SetBoolArray,
ID3DXConstantTableImpl_SetInt,
ID3DXConstantTableImpl_SetIntArray,
ID3DXConstantTableImpl_SetFloat,
ID3DXConstantTableImpl_SetFloatArray,
ID3DXConstantTableImpl_SetVector,
ID3DXConstantTableImpl_SetVectorArray,
ID3DXConstantTableImpl_SetMatrix,
ID3DXConstantTableImpl_SetMatrixArray,
ID3DXConstantTableImpl_SetMatrixPointerArray,
ID3DXConstantTableImpl_SetMatrixTranspose,
ID3DXConstantTableImpl_SetMatrixTransposeArray,
ID3DXConstantTableImpl_SetMatrixTransposePointerArray
};
HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction,
DWORD flags,
LPD3DXCONSTANTTABLE* ppConstantTable)
{
ID3DXConstantTableImpl* object;
HRESULT hr;
LPCVOID data;
UINT size;
FIXME("(%p, %x, %p): semi-stub\n", pFunction, flags, ppConstantTable);
if (!pFunction || !ppConstantTable)
return D3DERR_INVALIDCALL;
hr = D3DXFindShaderComment(pFunction, MAKEFOURCC('C','T','A','B'), &data, &size);
if (hr != D3D_OK)
return D3DXERR_INVALIDDATA;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXConstantTableImpl));
if (!object)
{
ERR("Out of memory\n");
return E_OUTOFMEMORY;
}
object->lpVtbl = &ID3DXConstantTable_Vtbl;
object->ref = 1;
object->ctab = HeapAlloc(GetProcessHeap(), 0, size);
if (!object->ctab)
{
HeapFree(GetProcessHeap(), 0, object);
ERR("Out of memory\n");
return E_OUTOFMEMORY;
}
object->size = size;
memcpy(object->ctab, data, object->size);
*ppConstantTable = (LPD3DXCONSTANTTABLE)object;
return D3D_OK;
}
HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* pFunction,
LPD3DXCONSTANTTABLE* ppConstantTable)
{
TRACE("(%p, %p): Forwarded to D3DXGetShaderConstantTableEx\n", pFunction, ppConstantTable);
return D3DXGetShaderConstantTableEx(pFunction, 0, ppConstantTable);
}

6
reactos/dll/directx/wine/d3dx9_36/surface.c
View file

@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
*/
HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info)
{
FIXME("stub\n");
FIXME("(%p, %d, %p): stub\n", data, datasize, info);
if(data && datasize && !info) return D3D_OK;
if( !data || !datasize ) return D3DERR_INVALIDCALL;
@ -193,7 +193,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface,
D3DCOLOR Colorkey,
D3DXIMAGE_INFO *pSrcInfo)
{
FIXME("stub\n");
FIXME("(%p, %p, %p, %p, %d, %p, %d, %x, %p): stub\n", pDestSurface, pDestPalette,
pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo);
if( !pDestSurface || !pSrcData | !SrcDataSize ) return D3DERR_INVALIDCALL;
return E_NOTIMPL;
}

37
reactos/dll/directx/wine/d3dx9_36/texture.c Normal file
View file

@ -0,0 +1,37 @@
/*
* Copyright 2010 Christian Costa
*
* 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 "wine/debug.h"
#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice,
UINT width,
UINT height,
UINT miplevels,
DWORD usage,
D3DFORMAT format,
D3DPOOL pool,
LPDIRECT3DTEXTURE9 *ppTexture)
{
FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format,
pool, ppTexture);
return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL);
}

142
reactos/include/dxsdk/d3dx9shader.h
View file

@ -44,6 +44,15 @@
typedef LPCSTR D3DXHANDLE;
typedef enum _D3DXREGISTER_SET
{
D3DXRS_BOOL,
D3DXRS_INT4,
D3DXRS_FLOAT4,
D3DXRS_SAMPLER,
D3DXRS_FORCE_DWORD = 0x7fffffff
} D3DXREGISTER_SET, *LPD3DXREGISTER_SET;
typedef enum D3DXPARAMETER_CLASS
{
D3DXPC_SCALAR,
@ -80,6 +89,131 @@ typedef enum D3DXPARAMETER_TYPE
D3DXPT_FORCE_DWORD = 0x7fffffff,
} D3DXPARAMETER_TYPE, *LPD3DXPARAMETER_TYPE;
typedef struct _D3DXCONSTANTTABLE_DESC
{
LPCSTR Creator;
DWORD Version;
UINT Constants;
} D3DXCONSTANTTABLE_DESC, *LPD3DXCONSTANTTABLE_DESC;
typedef struct _D3DXCONSTANT_DESC
{
LPCSTR Name;
D3DXREGISTER_SET RegisterSet;
UINT RegisterIndex;
UINT RegisterCount;
D3DXPARAMETER_CLASS Class;
D3DXPARAMETER_TYPE Type;
UINT Rows;
UINT Columns;
UINT Elements;
UINT StructMembers;
UINT Bytes;
LPCVOID DefaultValue;
} D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC;
DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39, 0xc6, 0xdd, 0xfb, 0x35, 0x8b);
#undef INTERFACE
#define INTERFACE ID3DXConstantTable
DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
{
/*** IUnknown methods ***/
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBuffer methods ***/
STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE;
STDMETHOD_(DWORD, GetBufferSize)(THIS) PURE;
/*** ID3DXConstantTable methods ***/
STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE;
STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE;
STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD(SetDefaults)(THIS_ LPDIRECT3DDEVICE9 pDevice) PURE;
STDMETHOD(SetValue)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, LPCVOID pData, UINT Bytes) PURE;
STDMETHOD(SetBool)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, BOOL b) PURE;
STDMETHOD(SetBoolArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST BOOL* pb, UINT Count) PURE;
STDMETHOD(SetInt)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, INT n) PURE;
STDMETHOD(SetIntArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST INT* pn, UINT Count) PURE;
STDMETHOD(SetFloat)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, FLOAT f) PURE;
STDMETHOD(SetFloatArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST FLOAT* pf, UINT Count) PURE;
STDMETHOD(SetVector)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector) PURE;
STDMETHOD(SetVectorArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector, UINT Count) PURE;
STDMETHOD(SetMatrix)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE;
STDMETHOD(SetMatrixArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixPointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixTranspose)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE;
STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE;
};
#if !defined(__cplusplus) || defined(CINTERFACE)
/*** IUnknown methods ***/
#define ID3DXConstantTable_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ID3DXConstantTable_AddRef(p) (p)->lpVtbl->AddRef(p)
#define ID3DXConstantTable_Release(p) (p)->lpVtbl->Release(p)
/*** ID3DXBuffer methods ***/
#define ID3DXConstantTable_GetBufferPointer(p) (p)->lpVtbl->GetBufferPointer(p)
#define ID3DXConstantTable_GetBufferSize(p) (p)->lpVtbl->GetBufferSize(p)
/*** ID3DXConstantTable methods ***/
#define ID3DXConstantTable_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a)
#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->lpVtbl->GetConstantDesc(p,a,b,c)
#define ID3DXConstantTable_GetConstant(p,a,b) (p)->lpVtbl->GetConstant(p,a,b)
#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->lpVtbl->GetConstantByName(p,a,b)
#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->lpVtbl->GetConstantElement(p,a,b)
#define ID3DXConstantTable_SetDefaults(p,a) (p)->lpVtbl->SetDefaults(p,a)
#define ID3DXConstantTable_SetValue(p,a,b,c,d) (p)->lpVtbl->SetValue(p,a,b,c,d)
#define ID3DXConstantTable_SetBool(p,a,b,c) (p)->lpVtbl->SetBool(p,a,b,c)
#define ID3DXConstantTable_SetBoolArray(p,a,b,c,d) (p)->lpVtbl->SetBoolArray(p,a,b,c,d)
#define ID3DXConstantTable_SetInt(p,a,b,c) (p)->lpVtbl->SetInt(p,a,b,c)
#define ID3DXConstantTable_SetIntArray(p,a,b,c,d) (p)->lpVtbl->SetIntArray(p,a,b,c,d)
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->lpVtbl->SetFloat(p,a,b,c)
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->lpVtbl->SetFloatArray(p,a,b,c,d)
#define ID3DXConstantTable_SetVector(p,a,b,c) (p)->lpVtbl->SetVector(p,a,b,c)
#define ID3DXConstantTable_SetVectorArray(p,a,b,c,d) (p)->lpVtbl->SetVectorArray(p,a,b,c,d)
#define ID3DXConstantTable_SetMatrix(p,a,b,c) (p)->lpVtbl->SetMatrix(p,a,b,c)
#define ID3DXConstantTable_SetMatrixArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixArray(p,a,b,c,d)
#define ID3DXConstantTable_SetMatrixPointerArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixPointerArray(p,a,b,c,d)
#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->lpVtbl->SetMatrixTranspose(p,a,b,c)
#define ID3DXConstantTable_SetMatrixTransposeArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixTransposeArray(p,a,b,c,d)
#define ID3DXConstantTable_SetMatrixTransposePointerArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixTransposePointerArray(p,a,b,c,d)
#else
/*** IUnknown methods ***/
#define ID3DXConstantTable_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
#define ID3DXConstantTable_AddRef(p) (p)->AddRef()
#define ID3DXConstantTable_Release(p) (p)->Release()
/*** ID3DXBuffer methods ***/
#define ID3DXConstantTable_GetBufferPointer(p) (p)->GetBufferPointer()
#define ID3DXConstantTable_GetBufferSize(p) (p)->GetBufferSize()
/*** ID3DXConstantTable methods ***/
#define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a)
#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c)
#define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b)
#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b)
#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)
#define ID3DXConstantTable_SetDefaults(p,a) (p)->SetDefaults(a)
#define ID3DXConstantTable_SetValue(p,a,b,c,d) (p)->SetValue(a,b,c,d)
#define ID3DXConstantTable_SetBool(p,a,b,c) (p)->SetBool(a,b,c)
#define ID3DXConstantTable_SetBoolArray(p,a,b,c,d) (p)->SetBoolArray(a,b,c,d)
#define ID3DXConstantTable_SetInt(p,a,b,c) (p)->SetInt(a,b,c)
#define ID3DXConstantTable_SetIntArray(p,a,b,c,d) (p)->SetIntArray(a,b,c,d)
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->SetFloat(a,b,c)
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->SetFloatArray(a,b,c,d)
#define ID3DXConstantTable_SetVector(p,a,b,c) (p)->SetVector(a,b,c)
#define ID3DXConstantTable_SetVectorArray(p,a,b,c,d) (p)->SetVectorArray(a,b,c,d)
#define ID3DXConstantTable_SetMatrix(p,a,b,c) (p)->SetMatrix(a,b,c)
#define ID3DXConstantTable_SetMatrixArray(p,a,b,c,d) (p)->SetMatrixArray(a,b,c,d)
#define ID3DXConstantTable_SetMatrixPointerArray(p,a,b,c,d) (p)->SetMatrixPointerArray(a,b,c,d)
#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->>SetMatrixTranspose(a,b,c)
#define ID3DXConstantTable_SetMatrixTransposeArray(p,a,b,c,d) (p)->SetMatrixTransposeArray(a,b,c,d)
#define ID3DXConstantTable_SetMatrixTransposePointerArray(p,a,b,c,d) (p)->SetMatrixTransposePointerArray(a,b,c,d)
#endif
typedef struct ID3DXConstantTable *LPD3DXCONSTANTTABLE;
typedef struct _D3DXMACRO {
LPCSTR Name;
LPCSTR Definition;
@ -114,6 +248,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device);
UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code);
DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code);
LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device);
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size);
HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
CONST D3DXMACRO* defines,
@ -153,6 +288,13 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
LPD3DXBUFFER* shader,
LPD3DXBUFFER* error_messages);
HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code,
DWORD flags,
LPD3DXCONSTANTTABLE* constant_table);
HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code,
LPD3DXCONSTANTTABLE* constant_table);
#ifdef __cplusplus
}
#endif