Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[dreimer] 37773: ... by Seungju Kim
by dreimer＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: dreimer Date: Sun Nov 30 13:03:24 2008 New Revision: 37773 URL: http://svn.reactos.org/svn/reactos?rev=37773&view=rev Log: ... by Seungju Kim Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sun Nov 30 13:03:24 2008 @@ -2,6 +2,7 @@ *Korean translation by Seungju Kim(www.seungjukim.com) admin at manateeshome {dot} com *I like manatees, how about you? */ + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280

1 0

[dreimer] 37772: Bug 3890: updated a few slovak translations by Mario Kacmar Bug 3915: Korean translation of Dxdiag by
by dreimer＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: dreimer Date: Sun Nov 30 13:00:01 2008 New Revision: 37772 URL: http://svn.reactos.org/svn/reactos?rev=37772&view=rev Log: Bug 3890: updated a few slovak translations by Mario Kacmar Bug 3915: Korean translation of Dxdiag by Added: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h Added: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -1,0 +1,228 @@ +/* + *Korean translation by Seungju Kim(www.seungjukim.com) admin at manateeshome {dot} com + *I like manatees, how about you? + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "ReactX ºÐ¼® µµ±¸" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "µµ¿ò¸»(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "´ÙÀ½ Àå(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "¸ðµç Á¤º¸ ÀúÀå(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Á¾·á(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÀÌ ÇÁ·Î±×·¥Àº ReactX¿Í ÄÄÆ÷³ÍÆ®, µå¶óÀÌ¹ö¿¡ ´ëÇÑ ÀÚ¼¼ÇÑ Á¤º¸¸¦ Á¦°øÇÕ´Ï´Ù.", -1, 10, 10, 443, 17 + LTEXT "´ç½ÅÀÌ ¾î¶² ºÎºÐ¿¡¼ ¿À·ù°¡ ¹ß»ýÇÏ´ÂÁö ¾Æ½Å´Ù¸é À§ÀÇ ÅÇÀ» Å¬¸¯ÇØ ÁÖ¼¼¿ä.±×·¸Áö ¾Ê´Ù¸é ""´ÙÀ½ Àå"" ¹öÆ°À» ÀÌ¿ëÇØ °¢ ÀåÀ» ÇÏ³ªÇÏ³ª »ìÆìº¸¼¼¿ä.", -1, 10, 30, 443, 25 + GROUPBOX "½Ã½ºÅÛ Á¤º¸", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "ÇöÀç ³¯Â¥/½Ã°£:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "ÄÄÇ»ÅÍ ÀÌ¸§:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "¿î¿µ Ã¼Á¦:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "¾ð¾î:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "½Ã½ºÅÛ Á¦Á¶ÀÚ:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "½Ã½ºÅÛ ¸ðµ¨:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "ÇÁ·Î¼¼¼:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "¸Þ¸ð¸®:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "ÆäÀÌÁö ÆÄÀÏ:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX ¹öÁ¯:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÀåÄ¡", -1, 10, 10, 250, 100 + RTEXT "ÀÌ¸§:", -1, 20, 25, 70, 10 + RTEXT "Á¦Á¶ÀÚ:", -1, 20, 35, 70, 10 + RTEXT "Ä¨ Å¸ÀÔ:", -1, 20, 45, 70, 10 + RTEXT "DAC Å¸ÀÔ:", -1, 20, 55, 70, 10 + RTEXT "ÃÑ ¸Þ¸ð¸®:", -1, 20, 65, 70, 10 + RTEXT "ÇöÀç µð½ºÇÃ·¹ÀÌ ¸ðµå:", -1, 20, 75, 70, 10 + RTEXT "¸ð´ÏÅÍ:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "µå¶óÀÌ¹ö", -1, 270, 10, 190, 100 + RTEXT "¸ÞÀÎ µå¶óÀÌ¹ö:", -1, 275, 25, 55, 10 + RTEXT "¹öÁ¯:", -1, 275, 35, 55, 10 + RTEXT "³¯Â¥:", -1, 275, 45, 55, 10 + RTEXT "WHQL ·Î°í:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "DDI ¹öÁ¯:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "ReactX-±â´É", -1, 10, 115, 450, 60 + RTEXT "DirectDraw °¡¼Ó:", -1, 15, 130, 110, 12 + RTEXT "Direct3D °¡¼Ó:", -1, 15, 145, 110, 12 + RTEXT "AGP ÅØ½ºÃÄ °¡¼Ó:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "È°¼ºÈ", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "È°¼ºÈ", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "È°¼ºÈ", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "DirectDraw ½ÃÇè", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Direct3D ½ÃÇè", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED + + GROUPBOX "Âü°í", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÀåÄ¡", -1, 10, 10, 250, 100 + RTEXT "ÀÌ¸§:", -1, 20, 25, 70, 10 + RTEXT "ÀåÄ¡ ID:", -1, 20, 35, 70, 10 + RTEXT "Á¦Á¶»ç ID:", -1, 20, 45, 70, 10 + RTEXT "Á¦Ç° ID:", -1, 20, 55, 70, 10 + RTEXT "Å¸ÀÔ:", -1, 20, 65, 70, 10 + RTEXT "±âº» ÀåÄ¡:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "µå¶óÀÌ¹ö", -1, 270, 10, 190, 100 + RTEXT "ÀÌ¸§:", -1, 275, 25, 55, 10 + RTEXT "¹öÁ¯:", -1, 275, 35, 55, 10 + RTEXT "³¯Â¥:", -1, 275, 45, 55, 10 + RTEXT "WHQL ·Î°í:", -1, 275, 55, 55, 10 + RTEXT "±âÅ¸ ÆÄÀÏ:", -1, 275, 65, 55, 10 + RTEXT "°ø±ÞÀÚ:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX ±â´É", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "ÇÏµå¿þ¾î ¼Ò¸®\n°¡¼Ó ¼öÁØ:", -1, 20, 135, 90, 20 + PUSHBUTTON "DirectSound Å×½ºÆ®", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "Âü°í", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "DirectInput ÀåÄ¡", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "ÀÔ·Â ÀåÄ¡", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "Á¤º¸", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "µî·ÏµÈ DirectPlay ¼ºñ½º °ø±ÞÀÚ", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "ReactX Áø´Ü µµ±¸" + IDS_SYSTEM_DIALOG "½Ã½ºÅÛ" + IDS_DISPLAY_DIALOG "µð½ºÇÃ·¹ÀÌ" + IDS_SOUND_DIALOG "¼Ò¸®" + IDS_MUSIC_DIALOG "À½¾Ç" + IDS_INPUT_DIALOG "ÀÔ·Â" + IDS_NETWORK_DIALOG "³×Æ®¿öÅ©" + IDS_HELP_DIALOG "µµ¿ò¸»" + IDS_FORMAT_MB "%I64uMB ·¥" + IDS_FORMAT_SWAP "%I64u MB »ç¿ë, %I64u MB ³²À½" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "¾Ë·ÁÁöÁö ¾ÊÀº ¹öÁ¯" + IDS_DEVICE_STATUS_ATTACHED "¿¬°áµÊ" + IDS_DEVICE_STATUS_MISSING "¿¬°á ²÷±è" + IDS_DEVICE_STATUS_UNKNOWN "¾Ë·ÁÁöÁö ¾ÊÀ½" + IDS_DEVICE_NAME "ÀåÄ¡ ÀÌ¸§" + IDS_DEVICE_STATUS "»óÅÂ" + IDS_DEVICE_CONTROLLER "ÄÁÆ®·Ñ·¯ ID" + IDS_DEVICE_MANUFACTURER "Á¦Á¶»ç ID" + IDS_DEVICE_PRODUCT "Á¦Ç° ID" + IDS_DEVICE_FORCEFEEDBACK "Feedback-Driver °Á¦Àû¿ë" + IDS_NOT_APPLICABLE "Àû¿ë ¾ÈµÊ" + IDS_OPTION_YES "¿¹" + IDS_DIRECTPLAY_COL_NAME1 "ÀÌ¸§" + IDS_DIRECTPLAY_COL_NAME2 "·¹Áö½ºÆ®¸®" + IDS_DIRECTPLAY_COL_NAME3 "ÆÄÀÏ" + IDS_DIRECTPLAY_COL_NAME4 "¹öÁ¯" + IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-¸ðµ© ¼ºñ½º °ø±ÞÀÚ" + IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Á÷·Ä ¼ºñ½º °ø±ÞÀÚ" + IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX ¼ºñ½º °ø±ÞÀÚ" + IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP ¼ºñ½º °ø±ÞÀÚ" + IDS_DIRECTPLAY_TCPCONN "DirectPlay¸¦ À§ÇÑ TCP/IP ¿¬°á" + IDS_DIRECTPLAY_IPXCONN "DirectPlay¸¦ À§ÇÑ IPX ¿¬°á" + IDS_DIRECTPLAY_MODEMCONN "DirectPlay¸¦ À§ÇÑ ¸ðµ© ¿¬°á" + IDS_DIRECTPLAY_SERIALCONN "DirectPlay¸¦ À§ÇÑ Á÷·Ä ¿¬°á" + IDS_REG_SUCCESS "È®ÀÎ" + IDS_REG_FAIL "¿À·ù" + IDS_DDTEST_ERROR "½ÃÇè ½ÇÆÐ!" + IDS_DDTEST_DESCRIPTION "DirectDrawÀÎÅÍÆäÀÌ½º Å×½ºÆ®¸¦ ½ÃÀÛÇÒ °ÍÀÔ´Ï´Ù. °è¼ÓÇÒ±î¿ä?" + IDS_DDPRIMARY_DESCRIPTION "ÀÌ Å×½ºÆ®´Â DirectDraw¸¦ ÀÌ¿ëÇÏ¿© Ç¥ÁØ ¸ðµå¿¡¼ ÁÖ È¸éÀ» ±×¸± °ÍÀÔ´Ï´Ù. °ËÁ¤°ú Èò»ö »ç°¢ÇüµéÀÌ ±×·ÁÁú °ÍÀÔ´Ï´Ù. °è¼ÓÇÒ±î¿ä?" + IDS_DDPRIMARY_RESULT "°ËÁ¤°ú Èò»ö »ç°¢ÇüÀ» º¸¼Ì³ª¿ä?" + IDS_DDOFFSCREEN_DESCRIPTION "ÀÌ Å×½ºÆ®´Â DirectDraw¸¦ ÀÌ¿ëÇÏ¿© Ç¥ÁØ ¸ðµå¿¡¼ DirectDraw¸¦ »ç¿ëÇÏ¿© È¸é ¹ÛÀ» ±×¸± °ÍÀÔ´Ï´Ù. ¿òÁ÷ÀÌ´Â ÇÏ¾á »ç°¢ÇüÀÌ ³ªÅ¸³¯ °ÍÀÔ´Ï´Ù. °è¼ÓÇÒ±î¿ä?" + IDS_DDOFFSCREEN_RESULT "¿òÁ÷ÀÌ´Â ÇÏ¾á »ç°¢ÇüÀ» º¸¼Ì³ª¿ä?" + IDS_DDFULLSCREEN_DESCRIPTION "ÀÌ Å×½ºÆ®´Â DirectDraw¸¦ »ç¿ëÇÏ¿© ÀüÃ¼ È¸éÀ» ±×¸± °ÍÀÔ´Ï´Ù. ¿òÁ÷ÀÌ´Â ÇÏ¾á »ç°¢ÇüÀ»ÀÌ ±×·ÁÁú °ÍÀÔ´Ï´Ù. °è¼ÓÇÒ±î¿ä?" + IDS_DDFULLSCREEN_RESULT "ÀüÃ¼ È¸é »óÅÂ¿¡¼ ¿òÁ÷ÀÌ´Â ÇÏ¾á »ç°¢ÇüÀ» º¸¼Ì³ª¿ä?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ºñÆ®)(%uHz)" + IDS_OPTION_NO "¾Æ´Ï¿À" +END Propchange: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 24-04-2008 - * LAST CHANGE: 30-05-2008 + * LAST CHANGE: 30-11-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -216,7 +216,7 @@ IDS_REG_SUCCESS "OK" IDS_REG_FAIL "Chyba" IDS_DDTEST_ERROR "Test zlyhal!" - IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?" + IDS_DDTEST_DESCRIPTION "This will start DirectDraw interface test. Continue?" IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -10,6 +10,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -1,7 +1,7 @@ /* FILE: applications/games/solitaire/lang/cs-CZ.rc * PURPOSE: Czech Language File * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-02-29 + * UPDATED: 2008-11-30 by Kario */ #include "resource.h" @@ -50,7 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0." IDS_SOL_QUIT "Ukonèit rozehranou hru?" IDS_SOL_WIN "Gratulujeme, zvítìzili jste!!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "Rozdat znova?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -52,7 +52,7 @@ IDS_SOL_ABOUT "Solitér od J Brown\n\nCardLib verzia 1.0" IDS_SOL_QUIT "Naozaj chcete skonèi aktuálnu hru?" IDS_SOL_WIN "Blahoelám, vyhrali ste!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "Rozda znova?" END Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: xx-xx-2007 - * LAST UPDATE: 18-08-2008 + * LAST UPDATE: 13-11-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -48,11 +48,11 @@ BEGIN CONTROL "Nastavenia zariadení", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Poèítaè:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Klávesnica:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END @@ -61,7 +61,7 @@ CAPTION "Intalácia systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Partícia na naintalovanie systému ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 @@ -69,20 +69,36 @@ LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Vytvori partíciu" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Vytvori a naformátova partíciu",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Ve¾kos:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Systém súborov:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Zrui",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Intalaèný prieèinok", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Zrui", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -108,14 +124,13 @@ LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ - "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Language Selection" + IDS_LANGTITLE "Výber jazyka" //Vo¾ba jazyka IDS_LANGSUBTITLE "Choose language for setup and final system." IDS_TYPETITLE "Welcome to ReactOS Setup" IDS_TYPESUBTITLE "Choose setup type." Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Nov 30 13:00:01 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 15-06-08 + * LastChange: 19-11-2008 */ #ifndef LANG_SK_SK_H__ @@ -372,32 +372,32 @@ { 8, 11, - " Po¡ta:", - TEXT_STYLE_NORMAL + "Po¡ta:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 12, - " Monitor:", - TEXT_STYLE_NORMAL, + "Monitor:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 13, - " Kl vesnica:", - TEXT_STYLE_NORMAL + "Kl vesnica:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 14, - " Rozlo§enie kl.:", - TEXT_STYLE_NORMAL + "Rozlo§enie kl.:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 16, - " Akceptova:", - TEXT_STYLE_NORMAL + "Akceptova:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -842,7 +842,6 @@ 0, "Pokajte, pros¡m ...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG - }, { 0, @@ -950,19 +949,19 @@ 11, 12, "Pokajte, pros¡m, kìm Inçtal tor skop¡ruje s£bory do inçtalanho", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 30, 13, "prieinka pre ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 20, 14, "Dokonenie m§e trva niekoko min£t.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 50,

1 0

[dreimer] 37771: Bug 3890: updated a few slovak translations by Mario Kacmar
by dreimer＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: dreimer Date: Sun Nov 30 12:40:11 2008 New Revision: 37771 URL: http://svn.reactos.org/svn/reactos?rev=37771&view=rev Log: Bug 3890: updated a few slovak translations by Mario Kacmar Modified: trunk/rosapps/applications/downloader/lang/sk-SK.rc Modified: trunk/rosapps/applications/downloader/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/la… ============================================================================== --- trunk/rosapps/applications/downloader/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 12:40:11 2008 @@ -1,5 +1,6 @@ /* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 21-01-2008 + * LastChange: 31-10-2008 */ @@ -39,7 +40,7 @@ IDS_NO_APP "Vyberte, prosím, program predtým ne kliknete na tlaèidlo stiahnu. Ak potrebujete pomoc, kliknite, prosím, na tlaèidlo otáznika v pravom hornom rohu." IDS_UPDATE_TITLE "Aktualizova" IDS_UPDATE "Prepáète, ale táto funkcia zatia¾ nie je implementovaná." - IDS_HELP_TITLE "Pomoc" + IDS_HELP_TITLE "Pomocník" IDS_HELP "Vyberte kategóriu na ¾avej strane, potom vyberte program a kliknite na tlaèidlo stiahnu. Pre aktualizáciu informácii o programe kliknite na tlaèidlo ved¾a tlaèidla pomoc." IDS_NO_APPS "Prepáète, ale zatia¾ sa v tejto kategórii nenachádzajú iadne programy. Môete pomôc a prida viac programov." IDS_CHOOSE_APP "Vyberte program, prosím."

1 0

[greatlrd] 37770: Add more dump data for ddraw
by greatlrd＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: greatlrd Date: Sun Nov 30 11:14:21 2008 New Revision: 37770 URL: http://svn.reactos.org/svn/reactos?rev=37770&view=rev Log: Add more dump data for ddraw Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Sun Nov 30 11:14:21 2008 @@ -27,6 +27,7 @@ void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset); void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset); void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset); +void dump_DDPIXELFORMAT(char *str, LPDDPIXELFORMAT lpFormat, DWORD offset); /* dump all data struct when this is trun onm usefull when u debug ddraw.dll */ #define DUMP_ON 1 @@ -436,9 +437,25 @@ MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumFourCC\0"); printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumFourCC) + offset, buffer, lpDraw_gbl->dwNumFourCC); - - MY_DUMP_STR(buffer,"LPDWORD\0",str,"lpdwFourCC\0"); - printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, buffer, lpDraw_gbl->lpdwFourCC); + if (lpDraw_gbl->dwNumFourCC != 0) + { + int c; + char bbbuffer[2048]; + long long x; + + for (c=0;c<lpDraw_gbl->dwNumFourCC;c++) + { + x = (long long)lpDraw_gbl->lpdwFourCC[c]; + sprintf(bbbuffer,"lpdwFourCC[%02x]",c); + MY_DUMP_STR(buffer,"LPDWORD\0",str,bbbuffer); + printf("%08lx %s: 0x%08lx : %s\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, buffer, lpDraw_gbl->lpdwFourCC[c], (char*)&x); + } + } + else + { + MY_DUMP_STR(buffer,"LPDWORD\0",str,"lpdwFourCC\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, buffer, lpDraw_gbl->lpdwFourCC); + } MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumModes\0"); printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumModes) + offset, buffer, lpDraw_gbl->dwNumModes); @@ -738,7 +755,9 @@ MY_DUMP_STR(buffer,"LONG\0",str,"lDisplayPitch\0"); printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, lDisplayPitch)+offset, buffer, lpVidmeminfo->lDisplayPitch); - //printf("%08lx DDPIXELFORMAT %sddpfDisplay : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, ddpfDisplay)+offset, str, lpVidmeminfo->ddpfDisplay); + + sprintf(buffer,"%sddpfDisplay.",str); + dump_DDPIXELFORMAT(buffer, &lpVidmeminfo->ddpfDisplay, FIELD_OFFSET(VIDMEMINFO, ddpfDisplay) + offset ); MY_DUMP_STR(buffer,"DWORD\0",str,"dwOffscreenAlign\0"); printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOffscreenAlign)+offset, buffer, lpVidmeminfo->dwOffscreenAlign); @@ -867,8 +886,37 @@ printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lOverlayY)+offset, buffer, lpDdrawSurface->lOverlayY); } - - +void dump_DDPIXELFORMAT(char *str, LPDDPIXELFORMAT lpFormat, DWORD offset) +{ + + char buffer[2048]; + if (lpFormat == NULL) + return ; + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSize\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwSize)+offset, buffer, lpFormat->dwSize); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwFlags)+offset, buffer, lpFormat->dwFlags); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFourCC\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwFourCC)+offset, buffer, lpFormat->dwFourCC); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwRGBBitCount\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwRGBBitCount)+offset, buffer, lpFormat->dwRGBBitCount); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwRBitMask\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwRBitMask)+offset, buffer, lpFormat->dwRBitMask); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwGBitMask\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwGBitMask)+offset, buffer, lpFormat->dwGBitMask); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwBBitMask\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwBBitMask)+offset, buffer, lpFormat->dwBBitMask); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwRGBAlphaBitMask\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDPIXELFORMAT, dwRGBAlphaBitMask)+offset, buffer, lpFormat->dwRGBAlphaBitMask); +} #endif

1 0

[sginsberg] 37769: - Replace the last instances of STDCALL with WINAPI/NTAPI -- this non-standard specifier is now completely deprecated. Now the healing can begin.
by sginsberg＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: sginsberg Date: Sun Nov 30 07:46:35 2008 New Revision: 37769 URL: http://svn.reactos.org/svn/reactos?rev=37769&view=rev Log: - Replace the last instances of STDCALL with WINAPI/NTAPI -- this non-standard specifier is now completely deprecated. Now the healing can begin. Modified: trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/ntddpcm.h trunk/reactos/include/ddk/ntddser.h trunk/reactos/include/ddk/pfhook.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/usbioctl.h trunk/reactos/include/ddk/ws2san.h trunk/reactos/include/psdk/accctrl.h trunk/reactos/include/psdk/ddrawgdi.h trunk/reactos/include/psdk/dhcpcapi.h trunk/reactos/include/psdk/icmpapi.h trunk/reactos/include/psdk/imagehlp.h trunk/reactos/include/psdk/netcon.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winscard.h trunk/reactos/include/reactos/dll/directx/d3d8thk.h trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/include/reactos/libs/samlib/samlib.h trunk/reactos/include/reactos/libs/syssetup/syssetup.h trunk/reactos/include/reactos/subsys/lsass/lsasrv.h trunk/reactos/include/reactos/subsys/sm/helper.h trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/windows.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ddrawint.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -260,7 +260,7 @@ DWORD dwFlags; FLATPTR fpProcess; } DD_LOCKDATA, *PDD_LOCKDATA; -typedef DWORD (STDCALL *PDD_SURFCB_LOCK)(PDD_LOCKDATA); +typedef DWORD (WINAPI *PDD_SURFCB_LOCK)(PDD_LOCKDATA); typedef struct _DD_UNLOCKDATA @@ -270,7 +270,7 @@ HRESULT ddRVal; PVOID Unlock; } DD_UNLOCKDATA, *PDD_UNLOCKDATA; -typedef DWORD (STDCALL *PDD_SURFCB_UNLOCK)(PDD_UNLOCKDATA); +typedef DWORD (WINAPI *PDD_SURFCB_UNLOCK)(PDD_UNLOCKDATA); #define DDABLT_SRCOVERDEST 0x00000001 #define DDBLT_AFLAGS 0x80000000 @@ -297,7 +297,7 @@ DWORD dwAFlags; DDARGB ddargbScaleFactors; } DD_BLTDATA, *PDD_BLTDATA; -typedef DWORD (STDCALL *PDD_SURFCB_BLT)(PDD_BLTDATA); +typedef DWORD (WINAPI *PDD_SURFCB_BLT)(PDD_BLTDATA); typedef struct _DD_UPDATEOVERLAYDATA { @@ -311,7 +311,7 @@ HRESULT ddRVal; PVOID UpdateOverlay; } DD_UPDATEOVERLAYDATA, *PDD_UPDATEOVERLAYDATA; -typedef DWORD (STDCALL *PDD_SURFCB_UPDATEOVERLAY)(PDD_UPDATEOVERLAYDATA); +typedef DWORD (WINAPI *PDD_SURFCB_UPDATEOVERLAY)(PDD_UPDATEOVERLAYDATA); typedef struct _DD_SETOVERLAYPOSITIONDATA { @@ -323,7 +323,7 @@ HRESULT ddRVal; PVOID SetOverlayPosition; } DD_SETOVERLAYPOSITIONDATA, *PDD_SETOVERLAYPOSITIONDATA; -typedef DWORD (STDCALL *PDD_SURFCB_SETOVERLAYPOSITION)(PDD_SETOVERLAYPOSITIONDATA); +typedef DWORD (WINAPI *PDD_SURFCB_SETOVERLAYPOSITION)(PDD_SETOVERLAYPOSITIONDATA); typedef struct _DD_SETPALETTEDATA { @@ -334,7 +334,7 @@ PVOID SetPalette; BOOL Attach; } DD_SETPALETTEDATA, *PDD_SETPALETTEDATA; -typedef DWORD (STDCALL *PDD_SURFCB_SETPALETTE)(PDD_SETPALETTEDATA); +typedef DWORD (WINAPI *PDD_SURFCB_SETPALETTE)(PDD_SETPALETTEDATA); typedef struct _DD_FLIPDATA { @@ -347,7 +347,7 @@ PDD_SURFACE_LOCAL lpSurfCurrLeft; PDD_SURFACE_LOCAL lpSurfTargLeft; } DD_FLIPDATA, *PDD_FLIPDATA; -typedef DWORD (STDCALL *PDD_SURFCB_FLIP)(PDD_FLIPDATA); +typedef DWORD (WINAPI *PDD_SURFCB_FLIP)(PDD_FLIPDATA); typedef struct _DD_DESTROYSURFACEDATA { @@ -356,7 +356,7 @@ HRESULT ddRVal; PVOID DestroySurface; } DD_DESTROYSURFACEDATA, *PDD_DESTROYSURFACEDATA; -typedef DWORD (STDCALL *PDD_SURFCB_DESTROYSURFACE)(PDD_DESTROYSURFACEDATA); +typedef DWORD (WINAPI *PDD_SURFCB_DESTROYSURFACE)(PDD_DESTROYSURFACEDATA); typedef struct _DD_SETCLIPLISTDATA { @@ -365,7 +365,7 @@ HRESULT ddRVal; PVOID SetClipList; } DD_SETCLIPLISTDATA, *PDD_SETCLIPLISTDATA; -typedef DWORD (STDCALL *PDD_SURFCB_SETCLIPLIST)(PDD_SETCLIPLISTDATA); +typedef DWORD (WINAPI *PDD_SURFCB_SETCLIPLIST)(PDD_SETCLIPLISTDATA); typedef struct _DD_ADDATTACHEDSURFACEDATA { @@ -375,7 +375,7 @@ HRESULT ddRVal; PVOID AddAttachedSurface; } DD_ADDATTACHEDSURFACEDATA, *PDD_ADDATTACHEDSURFACEDATA; -typedef DWORD (STDCALL *PDD_SURFCB_ADDATTACHEDSURFACE)(PDD_ADDATTACHEDSURFACEDATA); +typedef DWORD (WINAPI *PDD_SURFCB_ADDATTACHEDSURFACE)(PDD_ADDATTACHEDSURFACEDATA); typedef struct _DD_SETCOLORKEYDATA { @@ -386,7 +386,7 @@ HRESULT ddRVal; PVOID SetColorKey; } DD_SETCOLORKEYDATA, *PDD_SETCOLORKEYDATA; -typedef DWORD (STDCALL *PDD_SURFCB_SETCOLORKEY)(PDD_SETCOLORKEYDATA); +typedef DWORD (WINAPI *PDD_SURFCB_SETCOLORKEY)(PDD_SETCOLORKEYDATA); typedef struct _DD_GETBLTSTATUSDATA { @@ -396,7 +396,7 @@ HRESULT ddRVal; PVOID GetBltStatus; } DD_GETBLTSTATUSDATA, *PDD_GETBLTSTATUSDATA; -typedef DWORD (STDCALL *PDD_SURFCB_GETBLTSTATUS)(PDD_GETBLTSTATUSDATA); +typedef DWORD (WINAPI *PDD_SURFCB_GETBLTSTATUS)(PDD_GETBLTSTATUSDATA); typedef struct _DD_GETFLIPSTATUSDATA { @@ -406,7 +406,7 @@ HRESULT ddRVal; PVOID GetFlipStatus; } DD_GETFLIPSTATUSDATA, *PDD_GETFLIPSTATUSDATA; -typedef DWORD (STDCALL *PDD_SURFCB_GETFLIPSTATUS)(PDD_GETFLIPSTATUSDATA); +typedef DWORD (WINAPI *PDD_SURFCB_GETFLIPSTATUS)(PDD_GETFLIPSTATUSDATA); typedef struct DD_SURFACECALLBACKS { @@ -456,7 +456,7 @@ HRESULT ddRVal; PVOID CreateSurface; } DD_CREATESURFACEDATA, *PDD_CREATESURFACEDATA; -typedef DWORD (STDCALL *PDD_CREATESURFACE)(PDD_CREATESURFACEDATA); +typedef DWORD (WINAPI *PDD_CREATESURFACE)(PDD_CREATESURFACEDATA); typedef struct _DD_DRVSETCOLORKEYDATA { @@ -466,7 +466,7 @@ HRESULT ddRVal; PVOID SetColorKey; } DD_DRVSETCOLORKEYDATA, *PDD_DRVSETCOLORKEYDATA; -typedef DWORD (STDCALL *PDD_SETCOLORKEY)(PDD_DRVSETCOLORKEYDATA); +typedef DWORD (WINAPI *PDD_SETCOLORKEY)(PDD_DRVSETCOLORKEYDATA); #define DDWAITVB_I_TESTVB 0x80000006 @@ -479,7 +479,7 @@ HRESULT ddRVal; PVOID WaitForVerticalBlank; } DD_WAITFORVERTICALBLANKDATA, *PDD_WAITFORVERTICALBLANKDATA; -typedef DWORD (STDCALL *PDD_WAITFORVERTICALBLANK)(PDD_WAITFORVERTICALBLANKDATA); +typedef DWORD (WINAPI *PDD_WAITFORVERTICALBLANK)(PDD_WAITFORVERTICALBLANKDATA); typedef struct _DD_CANCREATESURFACEDATA { @@ -489,7 +489,7 @@ HRESULT ddRVal; PVOID CanCreateSurface; } DD_CANCREATESURFACEDATA, *PDD_CANCREATESURFACEDATA; -typedef DWORD (STDCALL *PDD_CANCREATESURFACE)(PDD_CANCREATESURFACEDATA); +typedef DWORD (WINAPI *PDD_CANCREATESURFACE)(PDD_CANCREATESURFACEDATA); typedef struct _DD_CREATEPALETTEDATA { @@ -500,7 +500,7 @@ PVOID CreatePalette; BOOL is_excl; } DD_CREATEPALETTEDATA, *PDD_CREATEPALETTEDATA; -typedef DWORD (STDCALL *PDD_CREATEPALETTE)(PDD_CREATEPALETTEDATA); +typedef DWORD (WINAPI *PDD_CREATEPALETTE)(PDD_CREATEPALETTEDATA); typedef struct _DD_GETSCANLINEDATA { @@ -509,7 +509,7 @@ HRESULT ddRVal; PVOID GetScanLine; } DD_GETSCANLINEDATA, *PDD_GETSCANLINEDATA; -typedef DWORD (STDCALL *PDD_GETSCANLINE)(PDD_GETSCANLINEDATA); +typedef DWORD (WINAPI *PDD_GETSCANLINE)(PDD_GETSCANLINEDATA); typedef struct _DD_MAPMEMORYDATA { @@ -519,7 +519,7 @@ FLATPTR fpProcess; HRESULT ddRVal; } DD_MAPMEMORYDATA, *PDD_MAPMEMORYDATA; -typedef DWORD (STDCALL *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA); +typedef DWORD (WINAPI *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA); @@ -566,7 +566,7 @@ HRESULT ddRVal; PVOID GetAvailDriverMemory; } DD_GETAVAILDRIVERMEMORYDATA, *PDD_GETAVAILDRIVERMEMORYDATA; -typedef DWORD (STDCALL *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA); +typedef DWORD (WINAPI *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA); typedef struct _DD_MISCELLANEOUSCALLBACKS { @@ -577,7 +577,7 @@ #define DDHAL_MISCCB32_GETAVAILDRIVERMEMORY 0x00000001 -typedef DWORD (STDCALL *PDD_ALPHABLT)(PDD_BLTDATA); +typedef DWORD (WINAPI *PDD_ALPHABLT)(PDD_BLTDATA); typedef struct _DD_CREATESURFACEEXDATA { @@ -586,7 +586,7 @@ PDD_SURFACE_LOCAL lpDDSLcl; HRESULT ddRVal; } DD_CREATESURFACEEXDATA, *PDD_CREATESURFACEEXDATA; -typedef DWORD (STDCALL *PDD_CREATESURFACEEX)(PDD_CREATESURFACEEXDATA); +typedef DWORD (WINAPI *PDD_CREATESURFACEEX)(PDD_CREATESURFACEEXDATA); typedef struct _DD_GETDRIVERSTATEDATA { @@ -600,7 +600,7 @@ DWORD dwLength; HRESULT ddRVal; } DD_GETDRIVERSTATEDATA, *PDD_GETDRIVERSTATEDATA; -typedef DWORD (STDCALL *PDD_GETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); +typedef DWORD (WINAPI *PDD_GETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); typedef struct _DD_DESTROYDDLOCALDATA { @@ -608,7 +608,7 @@ PDD_DIRECTDRAW_LOCAL pDDLcl; HRESULT ddRVal; } DD_DESTROYDDLOCALDATA, *PDD_DESTROYDDLOCALDATA; -typedef DWORD (STDCALL *PDD_DESTROYDDLOCAL)(PDD_DESTROYDDLOCALDATA); +typedef DWORD (WINAPI *PDD_DESTROYDDLOCAL)(PDD_DESTROYDDLOCALDATA); @@ -636,7 +636,7 @@ HRESULT ddRVal; PVOID FreeDriverMemory; } DD_FREEDRIVERMEMORYDATA, *PDD_FREEDRIVERMEMORYDATA; -typedef DWORD (STDCALL *PDD_FREEDRIVERMEMORY)(PDD_FREEDRIVERMEMORYDATA); +typedef DWORD (WINAPI *PDD_FREEDRIVERMEMORY)(PDD_FREEDRIVERMEMORYDATA); typedef struct _DD_SETEXCLUSIVEMODEDATA { @@ -646,7 +646,7 @@ HRESULT ddRVal; PVOID SetExclusiveMode; } DD_SETEXCLUSIVEMODEDATA, *PDD_SETEXCLUSIVEMODEDATA; -typedef DWORD (STDCALL *PDD_SETEXCLUSIVEMODE)(PDD_SETEXCLUSIVEMODEDATA); +typedef DWORD (WINAPI *PDD_SETEXCLUSIVEMODE)(PDD_SETEXCLUSIVEMODEDATA); typedef struct _DD_FLIPTOGDISURFACEDATA { @@ -656,7 +656,7 @@ HRESULT ddRVal; PVOID FlipToGDISurface; } DD_FLIPTOGDISURFACEDATA, *PDD_FLIPTOGDISURFACEDATA; -typedef DWORD (STDCALL *PDD_FLIPTOGDISURFACE)(PDD_FLIPTOGDISURFACEDATA); +typedef DWORD (WINAPI *PDD_FLIPTOGDISURFACE)(PDD_FLIPTOGDISURFACEDATA); @@ -685,7 +685,7 @@ HRESULT ddRVal; PVOID DestroyPalette; } DD_DESTROYPALETTEDATA, *PDD_DESTROYPALETTEDATA; -typedef DWORD (STDCALL *PDD_PALCB_DESTROYPALETTE)(PDD_DESTROYPALETTEDATA); +typedef DWORD (WINAPI *PDD_PALCB_DESTROYPALETTE)(PDD_DESTROYPALETTEDATA); typedef struct _DD_SETENTRIESDATA { @@ -697,7 +697,7 @@ HRESULT ddRVal; PVOID SetEntries; } DD_SETENTRIESDATA, *PDD_SETENTRIESDATA; -typedef DWORD (STDCALL *PDD_PALCB_SETENTRIES)(PDD_SETENTRIESDATA); +typedef DWORD (WINAPI *PDD_PALCB_SETENTRIES)(PDD_SETENTRIESDATA); typedef struct DD_PALETTECALLBACKS { @@ -721,7 +721,7 @@ HRESULT ddRVal; PVOID CanCreateVideoPort; } DD_CANCREATEVPORTDATA, *PDD_CANCREATEVPORTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_CANCREATEVIDEOPORT)(PDD_CANCREATEVPORTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_CANCREATEVIDEOPORT)(PDD_CANCREATEVPORTDATA); typedef struct _DD_CREATEVPORTDATA { @@ -731,7 +731,7 @@ HRESULT ddRVal; PVOID CreateVideoPort; } DD_CREATEVPORTDATA, *PDD_CREATEVPORTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_CREATEVIDEOPORT)(PDD_CREATEVPORTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_CREATEVIDEOPORT)(PDD_CREATEVPORTDATA); typedef struct _DD_FLIPVPORTDATA { @@ -742,7 +742,7 @@ HRESULT ddRVal; PVOID FlipVideoPort; } DD_FLIPVPORTDATA, *PDD_FLIPVPORTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_FLIP)(PDD_FLIPVPORTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_FLIP)(PDD_FLIPVPORTDATA); typedef struct _DD_GETVPORTBANDWIDTHDATA { @@ -756,7 +756,7 @@ HRESULT ddRVal; PVOID GetVideoPortBandwidth; } DD_GETVPORTBANDWIDTHDATA, *PDD_GETVPORTBANDWIDTHDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETBANDWIDTH)(PDD_GETVPORTBANDWIDTHDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETBANDWIDTH)(PDD_GETVPORTBANDWIDTHDATA); typedef struct _DD_GETVPORTINPUTFORMATDATA { @@ -768,7 +768,7 @@ HRESULT ddRVal; PVOID GetVideoPortInputFormats; } DD_GETVPORTINPUTFORMATDATA, *PDD_GETVPORTINPUTFORMATDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETINPUTFORMATS)(PDD_GETVPORTINPUTFORMATDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETINPUTFORMATS)(PDD_GETVPORTINPUTFORMATDATA); typedef struct _DD_GETVPORTOUTPUTFORMATDATA { @@ -781,7 +781,7 @@ HRESULT ddRVal; PVOID GetVideoPortInputFormats; } DD_GETVPORTOUTPUTFORMATDATA, *PDD_GETVPORTOUTPUTFORMATDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETOUTPUTFORMATS)(PDD_GETVPORTOUTPUTFORMATDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETOUTPUTFORMATS)(PDD_GETVPORTOUTPUTFORMATDATA); typedef struct _DD_GETVPORTFIELDDATA { @@ -791,7 +791,7 @@ HRESULT ddRVal; PVOID GetVideoPortField; } DD_GETVPORTFIELDDATA, *PDD_GETVPORTFIELDDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETFIELD)(PDD_GETVPORTFIELDDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETFIELD)(PDD_GETVPORTFIELDDATA); typedef struct _DD_GETVPORTLINEDATA { @@ -801,7 +801,7 @@ HRESULT ddRVal; PVOID GetVideoPortLine; } DD_GETVPORTLINEDATA, *PDD_GETVPORTLINEDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETLINE)(PDD_GETVPORTLINEDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETLINE)(PDD_GETVPORTLINEDATA); typedef struct _DD_GETVPORTCONNECTDATA { @@ -812,7 +812,7 @@ HRESULT ddRVal; PVOID GetVideoPortConnectInfo; } DD_GETVPORTCONNECTDATA, *PDD_GETVPORTCONNECTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETVPORTCONNECT)(PDD_GETVPORTCONNECTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETVPORTCONNECT)(PDD_GETVPORTCONNECTDATA); typedef struct _DD_DESTROYVPORTDATA { @@ -821,7 +821,7 @@ HRESULT ddRVal; PVOID DestroyVideoPort; } DD_DESTROYVPORTDATA, *PDD_DESTROYVPORTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_DESTROYVPORT)(PDD_DESTROYVPORTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_DESTROYVPORT)(PDD_DESTROYVPORTDATA); typedef struct _DD_GETVPORTFLIPSTATUSDATA { @@ -830,7 +830,7 @@ HRESULT ddRVal; PVOID GetVideoPortFlipStatus; } DD_GETVPORTFLIPSTATUSDATA, *PDD_GETVPORTFLIPSTATUSDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETFLIPSTATUS)(PDD_GETVPORTFLIPSTATUSDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETFLIPSTATUS)(PDD_GETVPORTFLIPSTATUSDATA); @@ -847,7 +847,7 @@ HRESULT ddRVal; PVOID UpdateVideoPort; } DD_UPDATEVPORTDATA, *PDD_UPDATEVPORTDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_UPDATE)(PDD_UPDATEVPORTDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_UPDATE)(PDD_UPDATEVPORTDATA); typedef struct _DD_WAITFORVPORTSYNCDATA { @@ -859,7 +859,7 @@ HRESULT ddRVal; PVOID UpdateVideoPort; } DD_WAITFORVPORTSYNCDATA, *PDD_WAITFORVPORTSYNCDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_WAITFORSYNC)(PDD_WAITFORVPORTSYNCDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_WAITFORSYNC)(PDD_WAITFORVPORTSYNCDATA); typedef struct _DD_GETVPORTSIGNALDATA { @@ -869,7 +869,7 @@ HRESULT ddRVal; PVOID GetVideoSignalStatus; } DD_GETVPORTSIGNALDATA, *PDD_GETVPORTSIGNALDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_GETSIGNALSTATUS)(PDD_GETVPORTSIGNALDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_GETSIGNALSTATUS)(PDD_GETVPORTSIGNALDATA); @@ -882,7 +882,7 @@ HRESULT ddRVal; PVOID ColorControl; } DD_VPORTCOLORDATA, *PDD_VPORTCOLORDATA; -typedef DWORD (STDCALL *PDD_VPORTCB_COLORCONTROL)(PDD_VPORTCOLORDATA); +typedef DWORD (WINAPI *PDD_VPORTCB_COLORCONTROL)(PDD_VPORTCOLORDATA); typedef struct DD_VIDEOPORTCALLBACKS @@ -940,7 +940,7 @@ HRESULT ddRVal; PVOID ColorControl; } DD_COLORCONTROLDATA, *PDD_COLORCONTROLDATA; -typedef DWORD (STDCALL *PDD_COLORCB_COLORCONTROL)(PDD_COLORCONTROLDATA); +typedef DWORD (WINAPI *PDD_COLORCB_COLORCONTROL)(PDD_COLORCONTROLDATA); @@ -964,7 +964,7 @@ GUID *lpGuids; HRESULT ddRVal; } DD_GETMOCOMPGUIDSDATA, *PDD_GETMOCOMPGUIDSDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_GETGUIDS)(PDD_GETMOCOMPGUIDSDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_GETGUIDS)(PDD_GETMOCOMPGUIDSDATA); typedef struct _DD_GETMOCOMPFORMATSDATA { @@ -974,7 +974,7 @@ LPDDPIXELFORMAT lpFormats; HRESULT ddRVal; } DD_GETMOCOMPFORMATSDATA, *PDD_GETMOCOMPFORMATSDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_GETFORMATS)(PDD_GETMOCOMPFORMATSDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_GETFORMATS)(PDD_GETMOCOMPFORMATSDATA); typedef struct _DD_CREATEMOCOMPDATA { @@ -988,7 +988,7 @@ DWORD dwDataSize; HRESULT ddRVal; } DD_CREATEMOCOMPDATA, *PDD_CREATEMOCOMPDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_CREATE)(PDD_CREATEMOCOMPDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_CREATE)(PDD_CREATEMOCOMPDATA); typedef struct _DDCOMPBUFFERINFO { @@ -1012,7 +1012,7 @@ LPDDCOMPBUFFERINFO lpCompBuffInfo; HRESULT ddRVal; } DD_GETMOCOMPCOMPBUFFDATA, *PDD_GETMOCOMPCOMPBUFFDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_GETCOMPBUFFINFO)(PDD_GETMOCOMPCOMPBUFFDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_GETCOMPBUFFINFO)(PDD_GETMOCOMPCOMPBUFFDATA); typedef struct _DD_GETINTERNALMOCOMPDATA { @@ -1024,7 +1024,7 @@ DWORD dwScratchMemAlloc; HRESULT ddRVal; } DD_GETINTERNALMOCOMPDATA, *PDD_GETINTERNALMOCOMPDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_GETINTERNALINFO)(PDD_GETINTERNALMOCOMPDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_GETINTERNALINFO)(PDD_GETINTERNALMOCOMPDATA); typedef struct _DD_BEGINMOCOMPFRAMEDATA { @@ -1037,7 +1037,7 @@ LPVOID lpOutputData; HRESULT ddRVal; } DD_BEGINMOCOMPFRAMEDATA, *PDD_BEGINMOCOMPFRAMEDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_BEGINFRAME)(PDD_BEGINMOCOMPFRAMEDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_BEGINFRAME)(PDD_BEGINMOCOMPFRAMEDATA); typedef struct _DD_ENDMOCOMPFRAMEDATA { @@ -1047,7 +1047,7 @@ DWORD dwInputDataSize; HRESULT ddRVal; } DD_ENDMOCOMPFRAMEDATA, *PDD_ENDMOCOMPFRAMEDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_ENDFRAME)(PDD_ENDMOCOMPFRAMEDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_ENDFRAME)(PDD_ENDMOCOMPFRAMEDATA); typedef struct _DDMOCOMPBUFFERINFO { @@ -1071,7 +1071,7 @@ DWORD dwOutputDataSize; HRESULT ddRVal; } DD_RENDERMOCOMPDATA, *PDD_RENDERMOCOMPDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_RENDER)(PDD_RENDERMOCOMPDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_RENDER)(PDD_RENDERMOCOMPDATA); #define DDMCQUERY_READ 0x00000001 @@ -1083,7 +1083,7 @@ DWORD dwFlags; HRESULT ddRVal; } DD_QUERYMOCOMPSTATUSDATA, *PDD_QUERYMOCOMPSTATUSDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_QUERYSTATUS)(PDD_QUERYMOCOMPSTATUSDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_QUERYSTATUS)(PDD_QUERYMOCOMPSTATUSDATA); typedef struct _DD_DESTROYMOCOMPDATA { @@ -1091,7 +1091,7 @@ PDD_MOTIONCOMP_LOCAL lpMoComp; HRESULT ddRVal; } DD_DESTROYMOCOMPDATA, *PDD_DESTROYMOCOMPDATA; -typedef DWORD (STDCALL *PDD_MOCOMPCB_DESTROY)(PDD_DESTROYMOCOMPDATA); +typedef DWORD (WINAPI *PDD_MOCOMPCB_DESTROY)(PDD_DESTROYMOCOMPDATA); @@ -1154,7 +1154,7 @@ DWORD dwActualSize; HRESULT ddRVal; } DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA; -typedef DWORD (STDCALL *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA); +typedef DWORD (WINAPI *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA); @@ -1283,7 +1283,7 @@ ULONG dwDriverReserved4; HRESULT ddRVal; } DD_SYNCSURFACEDATA, *PDD_SYNCSURFACEDATA; -typedef DWORD (STDCALL *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA); +typedef DWORD (WINAPI *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA); typedef struct _DD_SYNCVIDEOPORTDATA { @@ -1297,7 +1297,7 @@ ULONG dwDriverReserved3; HRESULT ddRVal; } DD_SYNCVIDEOPORTDATA, *PDD_SYNCVIDEOPORTDATA; -typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA); +typedef DWORD (WINAPI *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA); typedef struct DD_NTPRIVATEDRIVERCAPS Modified: trunk/reactos/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -94,7 +94,7 @@ typedef ULONG MEMORY_SPACE; -typedef ULONG STDCALL +typedef ULONG NTAPI (*PPCMCIA_READ_WRITE_CONFIG)( IN PVOID Context, IN ULONG WhichSpace, @@ -121,7 +121,7 @@ #define PCMCIA_MEMORY_8BIT_ACCESS 0 #define PCMCIA_MEMORY_16BIT_ACCESS 1 -typedef BOOLEAN STDCALL +typedef BOOLEAN NTAPI (*PPCMCIA_MODIFY_MEMORY_WINDOW)( IN PVOID Context, IN ULONGLONG HostBase, @@ -136,12 +136,12 @@ #define PCMCIA_VPP_12V 1 #define PCMCIA_VPP_IS_VCC 2 -typedef BOOLEAN STDCALL +typedef BOOLEAN NTAPI (*PPCMCIA_SET_VPP)( IN PVOID Context, IN UCHAR VppLevel); -typedef BOOLEAN STDCALL +typedef BOOLEAN NTAPI (*PPCMCIA_IS_WRITE_PROTECTED)( IN PVOID Context); Modified: trunk/reactos/include/ddk/ntddser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddser.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddser.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddser.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -369,11 +369,11 @@ USHORT Reserved[1]; } SERENUM_PORT_DESC, *PSERENUM_PORT_DESC; -typedef UCHAR STDCALL +typedef UCHAR NTAPI (*PSERENUM_READPORT)( PVOID SerPortAddress); -typedef VOID STDCALL +typedef VOID NTAPI (*PSERENUM_WRITEPORT)( PVOID SerPortAddress, UCHAR Value); Modified: trunk/reactos/include/ddk/pfhook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/pfhook.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/pfhook.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/pfhook.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -45,7 +45,7 @@ PF_ICMP_ON_DROP = 3 } PF_FORWARD_ACTION; -typedef PF_FORWARD_ACTION STDCALL +typedef PF_FORWARD_ACTION NTAPI (*PacketFilterExtensionPtr)( IN unsigned char *PacketHeader, IN unsigned char *Packet, Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -86,7 +86,7 @@ UCHAR Data[SMB_MAX_DATA_SIZE]; } SMB_REQUEST, *PSMB_REQUEST; -typedef VOID STDCALL +typedef VOID NTAPI (*SMB_ALARM_NOTIFY)( PVOID Context, UCHAR Address, Modified: trunk/reactos/include/ddk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbioctl.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbioctl.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -237,7 +237,7 @@ UsbMIParent } USB_HUB_NODE; -typedef VOID STDCALL +typedef VOID NTAPI (*USB_IDLE_CALLBACK)( PVOID Context); Modified: trunk/reactos/include/ddk/ws2san.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ws2san.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/ws2san.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ws2san.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -33,7 +33,7 @@ extern "C" { #endif -#define WSPAPI STDCALL +#define WSPAPI WINAPI /* FIXME: Unknown definitions */ typedef PVOID LPWSPDATA; Modified: trunk/reactos/include/psdk/accctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/accctrl.h?rev… ============================================================================== --- trunk/reactos/include/psdk/accctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/accctrl.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -358,12 +358,12 @@ ProgressRetryOperation } PROG_INVOKE_SETTING, *PPROG_INVOKE_SETTING; -typedef VOID (STDCALL *FN_PROGRESSW)(LPWSTR pObjectName, +typedef VOID (WINAPI *FN_PROGRESSW)(LPWSTR pObjectName, DWORD Status, PPROG_INVOKE_SETTING pInvokeSetting, PVOID Args, BOOL SecuritySet); -typedef VOID (STDCALL *FN_PROGRESSA)(LPSTR pObjectName, +typedef VOID (WINAPI *FN_PROGRESSA)(LPSTR pObjectName, DWORD Status, PPROG_INVOKE_SETTING pInvokeSetting, PVOID Args, Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddrawgdi.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -49,14 +49,14 @@ #endif BOOL -STDCALL +WINAPI DdCreateDirectDrawObject( LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, HDC hdc ); BOOL -STDCALL +WINAPI DdQueryDirectDrawObject( LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, LPDDHALINFO pHalInfo, @@ -72,46 +72,46 @@ ); BOOL -STDCALL +WINAPI DdDeleteDirectDrawObject( LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal ); BOOL -STDCALL +WINAPI DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, BOOL bPrimarySurface ); BOOL -STDCALL +WINAPI DdDeleteSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal ); BOOL -STDCALL +WINAPI DdResetVisrgn( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, HWND hWnd ); HDC -STDCALL +WINAPI DdGetDC( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, LPPALETTEENTRY pColorTable ); BOOL -STDCALL +WINAPI DdReleaseDC( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal ); HBITMAP -STDCALL +WINAPI DdCreateDIBSection( HDC hdc, CONST BITMAPINFO *pbmi, @@ -122,32 +122,32 @@ ); BOOL -STDCALL +WINAPI DdReenableDirectDrawObject( LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, BOOL *pbNewMode ); BOOL -STDCALL +WINAPI DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo ); VOID -STDCALL +WINAPI DdUnattachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurface, LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached ); ULONG -STDCALL +WINAPI DdQueryDisplaySettingsUniqueness(VOID); HANDLE -STDCALL +WINAPI DdGetDxHandle( LPDDRAWI_DIRECTDRAW_LCL pDDraw, LPDDRAWI_DDRAWSURFACE_LCL pSurface, @@ -155,7 +155,7 @@ ); BOOL -STDCALL +WINAPI DdSetGammaRamp( LPDDRAWI_DIRECTDRAW_LCL pDDraw, HDC hdc, @@ -163,7 +163,7 @@ ); DWORD -STDCALL +WINAPI DdSwapTextureHandles( LPDDRAWI_DIRECTDRAW_LCL pDDraw, LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, Modified: trunk/reactos/include/psdk/dhcpcapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dhcpcapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/dhcpcapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dhcpcapi.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -8,9 +8,9 @@ extern "C" { #endif - VOID STDCALL DhcpLeaseIpAddress( ULONG AdapterIndex ); - VOID STDCALL DhcpReleaseIpAddressLease( ULONG AdapterIndex ); - VOID STDCALL DhcpStaticRefreshParams + VOID WINAPI DhcpLeaseIpAddress( ULONG AdapterIndex ); + VOID WINAPI DhcpReleaseIpAddressLease( ULONG AdapterIndex ); + VOID WINAPI DhcpStaticRefreshParams ( ULONG AdapterIndex, ULONG IpAddress, ULONG NetMask ); #ifdef __cplusplus Modified: trunk/reactos/include/psdk/icmpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icmpapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/icmpapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/icmpapi.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -21,19 +21,19 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H -HANDLE STDCALL IcmpCreateFile( +HANDLE WINAPI IcmpCreateFile( VOID ); -HANDLE STDCALL Icmp6CreateFile( +HANDLE WINAPI Icmp6CreateFile( VOID ); -BOOL STDCALL IcmpCloseHandle( +BOOL WINAPI IcmpCloseHandle( HANDLE IcmpHandle ); -DWORD STDCALL IcmpSendEcho( +DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, IPAddr DestinationAddress, LPVOID RequestData, @@ -45,7 +45,7 @@ ); DWORD -STDCALL +WINAPI IcmpSendEcho2( HANDLE IcmpHandle, HANDLE Event, @@ -61,7 +61,7 @@ ); DWORD -STDCALL +WINAPI Icmp6SendEcho2( HANDLE IcmpHandle, HANDLE Event, @@ -78,14 +78,14 @@ ); DWORD -STDCALL +WINAPI IcmpParseReplies( LPVOID ReplyBuffer, DWORD ReplySize ); DWORD -STDCALL +WINAPI Icmp6ParseReplies( LPVOID ReplyBuffer, DWORD ReplySize Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -106,7 +106,7 @@ BindMismatchedSymbols, BindSymbolsNotUpdated } IMAGEHLP_STATUS_REASON; -typedef BOOL(STDCALL*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); +typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); typedef struct _LOADED_IMAGE { LPSTR ModuleName; HANDLE hFile; @@ -185,10 +185,10 @@ DWORD Reserved[3]; KDHELP KdHelp; } STACKFRAME,*LPSTACKFRAME; -typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); -typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); -typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); -typedef DWORD(STDCALL*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS); +typedef BOOL(WINAPI*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); +typedef LPVOID(WINAPI*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); +typedef DWORD(WINAPI*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); +typedef DWORD(WINAPI*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS); typedef struct API_VERSION { USHORT MajorVersion; USHORT MinorVersion; Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -248,6 +248,6 @@ EXTERN_C const IID IID_INetConnectionPropertyUi2; -VOID STDCALL NcFreeNetconProperties (NETCON_PROPERTIES* pProps); - -#endif +VOID WINAPI NcFreeNetconProperties (NETCON_PROPERTIES* pProps); + +#endif Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -124,7 +124,6 @@ #define CDECL _cdecl #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED) -#define STDCALL __stdcall // FIXME: Non-standard, should be deprecated #define CALLBACK __stdcall #define WINAPI __stdcall #define WINAPIV __cdecl @@ -132,7 +131,6 @@ #define APIPRIVATE __stdcall #define PASCAL __stdcall #else -#define STDCALL #define CALLBACK #define WINAPI #define WINAPIV Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -4590,7 +4590,7 @@ NTSYSAPI SIZE_T -STDCALL +NTAPI RtlCompareMemory ( const VOID *Source1, const VOID *Source2, Modified: trunk/reactos/include/psdk/winscard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winscard.h?re… ============================================================================== --- trunk/reactos/include/psdk/winscard.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winscard.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -134,62 +134,62 @@ BYTE rgbMask[36]; } SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; -HANDLE STDCALL SCardAccessStartedEvent(VOID); -LONG STDCALL SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG STDCALL SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG STDCALL SCardBeginTransaction(SCARDHANDLE); -LONG STDCALL SCardCancel(SCARDCONTEXT); -LONG STDCALL SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG STDCALL SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG STDCALL SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD); -LONG STDCALL SCardDisconnect(SCARDHANDLE, DWORD); -LONG STDCALL SCardEndTransaction(SCARDHANDLE, DWORD); -LONG STDCALL SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT); -LONG STDCALL SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR); -LONG STDCALL SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR); -LONG STDCALL SCardForgetReaderA(SCARDCONTEXT, LPCSTR); -LONG STDCALL SCardForgetReaderW(SCARDCONTEXT, LPCWSTR); -LONG STDCALL SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG STDCALL SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG STDCALL SCardFreeMemory(SCARDCONTEXT, LPCVOID); -LONG STDCALL SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD); -LONG STDCALL SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD); -LONG STDCALL SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR, LPDWORD); -LONG STDCALL SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID); -LONG STDCALL SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID); -LONG STDCALL SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG STDCALL SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG STDCALL SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG STDCALL SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG STDCALL SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG STDCALL SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG STDCALL SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG STDCALL SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG STDCALL SCardIsValidContext(SCARDCONTEXT); -LONG STDCALL SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD); -LONG STDCALL SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD); -LONG STDCALL SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD); -LONG STDCALL SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD); -LONG STDCALL SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD); -LONG STDCALL SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD); -LONG STDCALL SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD); -LONG STDCALL SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD); -LONG STDCALL SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD); -LONG STDCALL SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD); -LONG STDCALL SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG STDCALL SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG STDCALL SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD); -LONG STDCALL SCardReleaseContext(SCARDCONTEXT); -VOID STDCALL SCardReleaseStartedEvent(HANDLE); -LONG STDCALL SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG STDCALL SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG STDCALL SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD); -LONG STDCALL SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR); -LONG STDCALL SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR); -LONG STDCALL SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG STDCALL SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG STDCALL SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG STDCALL SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD, LPSCARD_IO_REQUEST, LPBYTE, LPDWORD); +HANDLE WINAPI SCardAccessStartedEvent(VOID); +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); +LONG WINAPI SCardBeginTransaction(SCARDHANDLE); +LONG WINAPI SCardCancel(SCARDCONTEXT); +LONG WINAPI SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); +LONG WINAPI SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); +LONG WINAPI SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD); +LONG WINAPI SCardDisconnect(SCARDHANDLE, DWORD); +LONG WINAPI SCardEndTransaction(SCARDHANDLE, DWORD); +LONG WINAPI SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT); +LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR); +LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR); +LONG WINAPI SCardForgetReaderA(SCARDCONTEXT, LPCSTR); +LONG WINAPI SCardForgetReaderW(SCARDCONTEXT, LPCWSTR); +LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR); +LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR); +LONG WINAPI SCardFreeMemory(SCARDCONTEXT, LPCVOID); +LONG WINAPI SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR, LPDWORD); +LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID); +LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID); +LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD); +LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD); +LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); +LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); +LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR); +LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR); +LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR); +LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR); +LONG WINAPI SCardIsValidContext(SCARDCONTEXT); +LONG WINAPI SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD); +LONG WINAPI SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD); +LONG WINAPI SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD); +LONG WINAPI SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD); +LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD); +LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD); +LONG WINAPI SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD); +LONG WINAPI SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +LONG WINAPI SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD); +LONG WINAPI SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD); +LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEA, DWORD); +LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEW, DWORD); +LONG WINAPI SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD); +LONG WINAPI SCardReleaseContext(SCARDCONTEXT); +VOID WINAPI SCardReleaseStartedEvent(HANDLE); +LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); +LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); +LONG WINAPI SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD); +LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR); +LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR); +LONG WINAPI SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD); +LONG WINAPI SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); +LONG WINAPI SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); +LONG WINAPI SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD, LPSCARD_IO_REQUEST, LPBYTE, LPDWORD); #ifndef _DISABLE_TIDENTS Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/include/reactos/dll/directx/d3d8thk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -9,7 +9,7 @@ extern "C" { #endif -BOOL STDCALL OsThunkD3dContextCreate( +BOOL WINAPI OsThunkD3dContextCreate( HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, @@ -17,15 +17,15 @@ ); -DWORD STDCALL OsThunkD3dContextDestroy( +DWORD WINAPI OsThunkD3dContextDestroy( LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); -DWORD STDCALL OsThunkD3dContextDestroyAll( +DWORD WINAPI OsThunkD3dContextDestroyAll( LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); -DWORD STDCALL OsThunkD3dDrawPrimitives2( +DWORD WINAPI OsThunkD3dDrawPrimitives2( HANDLE hCmdBuf, HANDLE hVBuf, LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, @@ -35,51 +35,51 @@ DWORD *pdwSizeVtx ); -DWORD STDCALL OsThunkD3dValidateTextureStageState( +DWORD WINAPI OsThunkD3dValidateTextureStageState( LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData ); -DWORD STDCALL OsThunkDdAddAttachedSurface( +DWORD WINAPI OsThunkDdAddAttachedSurface( HANDLE hSurface, HANDLE hSurfaceAttached, PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData ); -DWORD STDCALL OsThunkDdAlphaBlt(VOID); - -BOOL STDCALL OsThunkDdAttachSurface( +DWORD WINAPI OsThunkDdAlphaBlt(VOID); + +BOOL WINAPI OsThunkDdAttachSurface( HANDLE hSurfaceFrom, HANDLE hSurfaceTo ); -DWORD STDCALL OsThunkDdBeginMoCompFrame( +DWORD WINAPI OsThunkDdBeginMoCompFrame( HANDLE hMoComp, PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData ); -DWORD STDCALL OsThunkDdBlt( +DWORD WINAPI OsThunkDdBlt( HANDLE hSurfaceDest, HANDLE hSurfaceSrc, PDD_BLTDATA puBltData ); -DWORD STDCALL OsThunkDdCanCreateD3DBuffer( +DWORD WINAPI OsThunkDdCanCreateD3DBuffer( HANDLE hDirectDraw, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData ); -DWORD STDCALL OsThunkDdCanCreateSurface( +DWORD WINAPI OsThunkDdCanCreateSurface( HANDLE hDirectDraw, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData ); -DWORD STDCALL OsThunkDdColorControl( +DWORD WINAPI OsThunkDdColorControl( HANDLE hSurface, PDD_COLORCONTROLDATA puColorControlData ); -DWORD STDCALL OsThunkDdCreateD3DBuffer( +DWORD WINAPI OsThunkDdCreateD3DBuffer( HANDLE hDirectDraw, HANDLE *hSurface, DDSURFACEDESC *puSurfaceDescription, @@ -90,14 +90,14 @@ HANDLE *puhSurface ); -HANDLE STDCALL OsThunkDdCreateDirectDrawObject(HDC hdc); - -HANDLE STDCALL OsThunkDdCreateMoComp( +HANDLE WINAPI OsThunkDdCreateDirectDrawObject(HDC hdc); + +HANDLE WINAPI OsThunkDdCreateMoComp( HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData ); -DWORD STDCALL OsThunkDdCreateSurface( +DWORD WINAPI OsThunkDdCreateSurface( HANDLE hDirectDraw, HANDLE *hSurface, DDSURFACEDESC *puSurfaceDescription, @@ -108,13 +108,13 @@ HANDLE *puhSurface ); -DWORD STDCALL OsThunkDdCreateSurfaceEx( +DWORD WINAPI OsThunkDdCreateSurfaceEx( HANDLE hDirectDraw, HANDLE hSurface, DWORD dwSurfaceHandle ); -HANDLE STDCALL OsThunkDdCreateSurfaceObject( +HANDLE WINAPI OsThunkDdCreateSurfaceObject( HANDLE hDirectDrawLocal, HANDLE hSurface, PDD_SURFACE_LOCAL puSurfaceLocal, @@ -123,34 +123,34 @@ BOOL bComplete ); -BOOL STDCALL OsThunkDdDeleteDirectDrawObject( +BOOL WINAPI OsThunkDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal ); -BOOL STDCALL OsThunkDdDeleteSurfaceObject( +BOOL WINAPI OsThunkDdDeleteSurfaceObject( HANDLE hSurface ); -DWORD STDCALL OsThunkDdDestroyD3DBuffer( +DWORD WINAPI OsThunkDdDestroyD3DBuffer( HANDLE hSurface ); -DWORD STDCALL OsThunkDdDestroyMoComp( +DWORD WINAPI OsThunkDdDestroyMoComp( HANDLE hMoComp, PDD_DESTROYMOCOMPDATA puBeginFrameData ); -DWORD STDCALL OsThunkDdDestroySurface( +DWORD WINAPI OsThunkDdDestroySurface( HANDLE hSurface, BOOL bRealDestroy ); -DWORD STDCALL OsThunkDdEndMoCompFrame( +DWORD WINAPI OsThunkDdEndMoCompFrame( HANDLE hMoComp, PDD_ENDMOCOMPFRAMEDATA puEndFrameData ); -DWORD STDCALL OsThunkDdFlip( +DWORD WINAPI OsThunkDdFlip( HANDLE hSurfaceCurrent, HANDLE hSurfaceTarget, HANDLE hSurfaceCurrentLeft, @@ -158,84 +158,84 @@ PDD_FLIPDATA puFlipData ); -DWORD STDCALL OsThunkDdFlipToGDISurface( +DWORD WINAPI OsThunkDdFlipToGDISurface( HANDLE hDirectDraw, PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData ); -DWORD STDCALL OsThunkDdGetAvailDriverMemory( +DWORD WINAPI OsThunkDdGetAvailDriverMemory( HANDLE hDirectDraw, PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData ); -DWORD STDCALL OsThunkDdGetBltStatus( +DWORD WINAPI OsThunkDdGetBltStatus( HANDLE hSurface, PDD_GETBLTSTATUSDATA puGetBltStatusData ); -HDC STDCALL OsThunkDdGetDC( +HDC WINAPI OsThunkDdGetDC( HANDLE hSurface, PALETTEENTRY *puColorTable ); -DWORD STDCALL OsThunkDdGetDriverInfo( +DWORD WINAPI OsThunkDdGetDriverInfo( HANDLE hDirectDraw, PDD_GETDRIVERINFODATA puGetDriverInfoData ); -DWORD STDCALL OsThunkDdGetDriverState( +DWORD WINAPI OsThunkDdGetDriverState( PDD_GETDRIVERSTATEDATA pdata ); -DWORD STDCALL OsThunkDdGetDxHandle( +DWORD WINAPI OsThunkDdGetDxHandle( HANDLE hDirectDraw, HANDLE hSurface, BOOL bRelease ); -DWORD STDCALL OsThunkDdGetFlipStatus( +DWORD WINAPI OsThunkDdGetFlipStatus( HANDLE hSurface, PDD_GETFLIPSTATUSDATA puGetFlipStatusData ); -DWORD STDCALL OsThunkDdGetInternalMoCompInfo( +DWORD WINAPI OsThunkDdGetInternalMoCompInfo( HANDLE hDirectDraw, PDD_GETINTERNALMOCOMPDATA puGetInternalData ); -DWORD STDCALL OsThunkDdGetMoCompBuffInfo( +DWORD WINAPI OsThunkDdGetMoCompBuffInfo( HANDLE hDirectDraw, PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData ); -DWORD STDCALL OsThunkDdGetMoCompFormats( +DWORD WINAPI OsThunkDdGetMoCompFormats( HANDLE hDirectDraw, PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData ); -DWORD STDCALL OsThunkDdGetMoCompGuids( +DWORD WINAPI OsThunkDdGetMoCompGuids( HANDLE hDirectDraw, PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData ); -DWORD STDCALL OsThunkDdGetScanLine( +DWORD WINAPI OsThunkDdGetScanLine( HANDLE hDirectDraw, PDD_GETSCANLINEDATA puGetScanLineData ); -DWORD STDCALL OsThunkDdLock( +DWORD WINAPI OsThunkDdLock( HANDLE hSurface, PDD_LOCKDATA puLockData, HDC hdcClip ); -DWORD STDCALL OsThunkDdLockD3D( +DWORD WINAPI OsThunkDdLockD3D( HANDLE hSurface, PDD_LOCKDATA puLockData ); -BOOL STDCALL OsThunkDdQueryDirectDrawObject( +BOOL WINAPI OsThunkDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, DWORD *pCallBackFlags, @@ -250,74 +250,74 @@ ); -DWORD STDCALL OsThunkDdQueryMoCompStatus( +DWORD WINAPI OsThunkDdQueryMoCompStatus( HANDLE hMoComp, PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData ); -BOOL STDCALL OsThunkDdReenableDirectDrawObject( +BOOL WINAPI OsThunkDdReenableDirectDrawObject( HANDLE hDirectDrawLocal, BOOL *pubNewMode ); -BOOL STDCALL OsThunkDdReleaseDC( +BOOL WINAPI OsThunkDdReleaseDC( HANDLE hSurface ); -DWORD STDCALL OsThunkDdRenderMoComp( +DWORD WINAPI OsThunkDdRenderMoComp( HANDLE hMoComp, PDD_RENDERMOCOMPDATA puRenderMoCompData ); -BOOL STDCALL OsThunkDdResetVisrgn( +BOOL WINAPI OsThunkDdResetVisrgn( HANDLE hSurface, HWND hwnd ); -DWORD STDCALL OsThunkDdSetColorKey( +DWORD WINAPI OsThunkDdSetColorKey( HANDLE hSurface, PDD_SETCOLORKEYDATA puSetColorKeyData ); -DWORD STDCALL OsThunkDdSetExclusiveMode( +DWORD WINAPI OsThunkDdSetExclusiveMode( HANDLE hDirectDraw, PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData ); -BOOL STDCALL OsThunkDdSetGammaRamp( +BOOL WINAPI OsThunkDdSetGammaRamp( HANDLE hDirectDraw, HDC hdc, LPVOID lpGammaRamp ); -DWORD STDCALL OsThunkDdSetOverlayPosition( +DWORD WINAPI OsThunkDdSetOverlayPosition( HANDLE hSurfaceSource, HANDLE hSurfaceDestination, PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData ); -VOID STDCALL OsThunkDdUnattachSurface( +VOID WINAPI OsThunkDdUnattachSurface( HANDLE hSurface, HANDLE hSurfaceAttached ); -DWORD STDCALL OsThunkDdUnlock( +DWORD WINAPI OsThunkDdUnlock( HANDLE hSurface, PDD_UNLOCKDATA puUnlockData ); -DWORD STDCALL OsThunkDdUnlockD3D( +DWORD WINAPI OsThunkDdUnlockD3D( HANDLE hSurface, PDD_UNLOCKDATA puUnlockData ); -DWORD STDCALL OsThunkDdUpdateOverlay( +DWORD WINAPI OsThunkDdUpdateOverlay( HANDLE hSurfaceDestination, HANDLE hSurfaceSource, PDD_UPDATEOVERLAYDATA puUpdateOverlayData ); -DWORD STDCALL OsThunkDdWaitForVerticalBlank( +DWORD WINAPI OsThunkDdWaitForVerticalBlank( HANDLE hDirectDraw, PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData ); Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -73,51 +73,51 @@ /************************************************************************/ /* win32k.sys internal protypes for driver functions it exports */ /************************************************************************/ -BOOLEAN STDCALL DxEngNUIsTermSrv(); -PDC STDCALL DxEngLockDC(HDC hDC); -BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); -DWORD_PTR STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); -BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR); -BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); -BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); -DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type); -BOOLEAN STDCALL DxEngReferenceHdev(HDEV hdev); -BOOLEAN STDCALL DxEngLockShareSem(); -BOOLEAN STDCALL DxEngUnlockShareSem(); -DWORD STDCALL DxEngScreenAccessCheck(); -BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask); +BOOLEAN NTAPI DxEngNUIsTermSrv(); +PDC NTAPI DxEngLockDC(HDC hDC); +BOOLEAN NTAPI DxEngUnlockDC(PDC pDC); +DWORD_PTR NTAPI DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN NTAPI DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR); +BOOLEAN NTAPI DxEngLockHdev(HDEV hdev); +BOOLEAN NTAPI DxEngUnlockHdev(HDEV hdev); +DWORD_PTR NTAPI DxEngGetDCState(HDC hDC, DWORD type); +BOOLEAN NTAPI DxEngReferenceHdev(HDEV hdev); +BOOLEAN NTAPI DxEngLockShareSem(); +BOOLEAN NTAPI DxEngUnlockShareSem(); +DWORD NTAPI DxEngScreenAccessCheck(); +BOOL NTAPI DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask); /* Prototypes for the following functions are not yet finished */ -BOOLEAN STDCALL DxEngRedrawDesktop(); -ULONG STDCALL DxEngDispUniq(); -ULONG STDCALL DxEngVisRgnUniq(); -HDEV* STDCALL DxEngEnumerateHdev(HDEV *hdev); -BOOL STDCALL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -BOOLEAN STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); -BOOLEAN STDCALL DxEngCleanDC(HDC hdc); -BOOLEAN STDCALL DxEngIncDispUniq(); +BOOLEAN NTAPI DxEngRedrawDesktop(); +ULONG NTAPI DxEngDispUniq(); +ULONG NTAPI DxEngVisRgnUniq(); +HDEV* NTAPI DxEngEnumerateHdev(HDEV *hdev); +BOOL NTAPI DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); +BOOLEAN NTAPI DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); +BOOLEAN NTAPI DxEngCleanDC(HDC hdc); +BOOLEAN NTAPI DxEngIncDispUniq(); -HDC STDCALL DxEngCreateMemoryDC(HDEV hDev); +HDC NTAPI DxEngCreateMemoryDC(HDEV hDev); -BOOLEAN STDCALL DxEngIsHdevLockedByCurrentThread(HDEV hDev); -BOOLEAN STDCALL DxEngUnreferenceHdev(HDEV hDev); -DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); -DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); -DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); -HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); -BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force); -BOOLEAN STDCALL DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); -DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); -DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); -DWORD STDCALL DxEngDeleteSurface(DWORD x1); -DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2); -DWORD STDCALL DxEngAltLockSurface(DWORD x1); -DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); -DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); -DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); -DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2); -DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); -DWORD STDCALL DxEngGetRedirectionBitmap(DWORD x1); -DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2); +BOOLEAN NTAPI DxEngIsHdevLockedByCurrentThread(HDEV hDev); +BOOLEAN NTAPI DxEngUnreferenceHdev(HDEV hDev); +DWORD NTAPI DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD NTAPI DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD NTAPI DxEngSpSpritesVisible(DWORD x1); +HDC NTAPI DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); +BOOLEAN NTAPI DxEngDeleteDC(HDC hdc, BOOL Force); +BOOLEAN NTAPI DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); +DWORD NTAPI DxEngSelectBitmap(DWORD x1, DWORD x2); +DWORD NTAPI DxEngSetBitmapOwner(DWORD x1, DWORD x2); +DWORD NTAPI DxEngDeleteSurface(DWORD x1); +DWORD NTAPI DxEngGetSurfaceData(DWORD x1, DWORD x2); +DWORD NTAPI DxEngAltLockSurface(DWORD x1); +DWORD NTAPI DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); +DWORD NTAPI DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); +DWORD NTAPI DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); +DWORD NTAPI DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2); +DWORD NTAPI DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); +DWORD NTAPI DxEngGetRedirectionBitmap(DWORD x1); +DWORD NTAPI DxEngLoadImage(DWORD x1,DWORD x2); Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli… ============================================================================== --- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -26,25 +26,25 @@ #define __SAMLIB_H_INCLUDED__ -BOOL STDCALL +BOOL WINAPI SamInitializeSAM (VOID); -BOOL STDCALL +BOOL WINAPI SamGetDomainSid (PSID *Sid); -BOOL STDCALL +BOOL WINAPI SamSetDomainSid (PSID Sid); -BOOL STDCALL +BOOL WINAPI SamCreateUser (PWSTR UserName, PWSTR UserPassword, PSID UserSid); -BOOL STDCALL +BOOL WINAPI SamCheckUserPassword (PWSTR UserName, PWSTR UserPassword); -BOOL STDCALL +BOOL WINAPI SamGetUserSid (PWSTR UserName, PSID *Sid); Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -27,7 +27,7 @@ /* System setup APIs */ -DWORD STDCALL +DWORD WINAPI InstallReactOS (HINSTANCE hInstance); Modified: trunk/reactos/include/reactos/subsys/lsass/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -2,7 +2,7 @@ #ifndef __LSASRV_H #define __LSASRV_H -NTSTATUS STDCALL +NTSTATUS WINAPI LsapInitLsa(VOID); #endif /* __LSASRV_H */ Modified: trunk/reactos/include/reactos/subsys/sm/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -8,30 +8,30 @@ /* $Id$ */ /* smlib/connect.c */ -NTSTATUS STDCALL +NTSTATUS WINAPI SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, IN HANDLE hSbApiPort OPTIONAL, IN WORD wSubsystem OPTIONAL, /* pe.h */ IN OUT PHANDLE phSmApiPort); /* smlib/compses.c */ -NTSTATUS STDCALL +NTSTATUS WINAPI SmCompleteSession (IN HANDLE hSmApiPort, IN HANDLE hSbApiPort, IN HANDLE hApiPort); /* smlib/execpgm.c */ -NTSTATUS STDCALL +NTSTATUS WINAPI SmExecuteProgram (IN HANDLE hSmApiPort, IN PUNICODE_STRING Pgm ); /* smdll/query.c */ -NTSTATUS STDCALL +NTSTATUS WINAPI SmQueryInformation (IN HANDLE SmApiPort, IN SM_INFORMATION_CLASS SmInformationClass, IN OUT PVOID Data, IN ULONG DataLength, IN OUT PULONG ReturnedDataLength OPTIONAL); /* smlib/lookupss.c */ -NTSTATUS STDCALL +NTSTATUS WINAPI SmLookupSubsystem (IN PWSTR Name, IN OUT PWSTR Data, IN OUT PULONG DataLength, Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -9,8 +9,8 @@ typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); -NTSTATUS STDCALL BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); -NTSTATUS STDCALL ServerDllInitialization (ULONG,LPWSTR*); +NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); +NTSTATUS WINAPI ServerDllInitialization (ULONG,LPWSTR*); #endif /* ndef __INCLUDE_WIN_BASE_H */ Modified: trunk/reactos/include/reactos/subsys/win/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/windows.h [iso-8859-1] Sun Nov 30 07:46:35 2008 @@ -5,11 +5,11 @@ /* w32 console server */ #define WIN_SRV_WIN_CONSOLE 2 -NTSTATUS STDCALL ConServerDllInitialization (ULONG,LPWSTR*); +NTSTATUS WINAPI ConServerDllInitialization (ULONG,LPWSTR*); /* w32 user server */ #define WIN_SRV_WIN_USER 3 -NTSTATUS STDCALL UserServerDllInitialization (ULONG,LPWSTR*); +NTSTATUS WINAPI UserServerDllInitialization (ULONG,LPWSTR*); #endif /* ndef __INCLUDE_WIN_WINDOWS_H */

1 0

[sginsberg] 37768: - Remove straggler STDCALL
by sginsberg＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: sginsberg Date: Sun Nov 30 07:28:04 2008 New Revision: 37768 URL: http://svn.reactos.org/svn/reactos?rev=37768&view=rev Log: - Remove straggler STDCALL Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Sun Nov 30 07:28:04 2008 @@ -23,7 +23,7 @@ #include <debug.h> #include <windns.h> // DNS_A_DATA -#define EXPORT STDCALL +#define EXPORT WINAPI extern HINSTANCE g_hInstDll; extern HANDLE GlobalHeap; Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Nov 30 07:28:04 2008 @@ -825,7 +825,7 @@ } BOOL -STDCALL +WINAPI DllMain(HANDLE hInstDll, ULONG dwReason, LPVOID lpReserved)

1 0

[jimtabor] 37767: - Sync in rev 37720: Magnus Olsen, add GdiGetBitmapBitsSize is a new api from windows xp sp3, the code was tested in vs2003. part II
by jimtabor＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: jimtabor Date: Sun Nov 30 07:17:52 2008 New Revision: 37767 URL: http://svn.reactos.org/svn/reactos?rev=37767&view=rev Log: - Sync in rev 37720: Magnus Olsen, add GdiGetBitmapBitsSize is a new api from windows xp sp3, the code was tested in vs2003. part II Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/include/gdi32p.h Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] Sun Nov 30 07:17:52 2008 @@ -622,3 +622,4 @@ bMakePathNameW@16 cGetTTFFromFOT@28 gdiPlaySpoolStream@24 +GdiGetBitmapBitsSize@4 Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sun Nov 30 07:17:52 2008 @@ -233,5 +233,8 @@ DWORD WINAPI GdiGetCodePage(HDC); UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO ); +int +WINAPI +GdiGetBitmapBitsSize(BITMAPINFO *lpbmi); + /* EOF */ -

1 0

[jimtabor] 37766: - Sync in rev 37720: Magnus Olsen, add GdiGetBitmapBitsSize is a new api from windows xp sp3, the code was tested in vs2003.
by jimtabor＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: jimtabor Date: Sun Nov 30 07:17:19 2008 New Revision: 37766 URL: http://svn.reactos.org/svn/reactos?rev=37766&view=rev Log: - Sync in rev 37720: Magnus Olsen, add GdiGetBitmapBitsSize is a new api from windows xp sp3, the code was tested in vs2003. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun Nov 30 07:17:19 2008 @@ -123,6 +123,48 @@ } DPRINT("(%ld): wrong size for header\n", header->biSize ); return -1; +} + +/* + * @implemented + */ +int +WINAPI +GdiGetBitmapBitsSize(BITMAPINFO *lpbmi) +{ + int retSize; + + if (lpbmi->bmiHeader.biSize == FIELD_OFFSET(BITMAPINFOHEADER, biPlanes)) + { + /* Calc the bits Size and align it*/ + retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * + LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31) + & -32) / 8; + } + else + { + if ( (lpbmi->bmiHeader.biCompression == BI_BITFIELDS) || + (lpbmi->bmiHeader.biCompression == BI_RGB)) + { + if (lpbmi->bmiHeader.biHeight >=0 ) + { + /* Calc the bits Size and align it*/ + retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth * + lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; + } + else + { + /* Make height postiive if it negitve then calc the bits Size and align it*/ + retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth * + lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; + } + } + else + { + retSize = lpbmi->bmiHeader.biSizeImage; + } + } + return retSize; } /* @@ -178,8 +220,6 @@ return hBitmap; } - - /*

1 0

[gschneider] 37765: Updated polish translation by Olaf Siejka, <olaf_siejka AT o2 DOT pl>
by gschneider＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: gschneider Date: Sun Nov 30 06:52:07 2008 New Revision: 37765 URL: http://svn.reactos.org/svn/reactos?rev=37765&view=rev Log: Updated polish translation by Olaf Siejka, <olaf_siejka AT o2 DOT pl> Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Sun Nov 30 06:52:07 2008 @@ -2,6 +2,7 @@ * translated by TestamenT & xrogers * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl + * updated by Caemyr (olaf_siejka(a)o2.pl), Nov, 2008 */ #include "resource.h" @@ -49,7 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J. Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Zakoñczyæ aktualn¹ grê?" IDS_SOL_WIN "Gratulacje, wygra³e!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "Nowe rozdanie?" END

1 0

[gschneider] 37764: - Add dialog to deal cards again after winning solitaire, fixes the winning infinitely bug - Patch by Lucas Suggs, <anakha AT cat DOT pdx DOT edu> - I modified indentation, added german translation, added English strings to all other languages - work for the translators - See bug #3288 for more information
by gschneider＠svn.reactos.org 30 Nov '08

30 Nov '08

Author: gschneider Date: Sun Nov 30 06:09:36 2008 New Revision: 37764 URL: http://svn.reactos.org/svn/reactos?rev=37764&view=rev Log: - Add dialog to deal cards again after winning solitaire, fixes the winning infinitely bug - Patch by Lucas Suggs, <anakha AT cat DOT pdx DOT edu> - I modified indentation, added german translation, added English strings to all other languages - work for the translators - See bug #3288 for more information Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/resource.h trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Äà ïðåêðàòÿ ëè èãðàòà?" IDS_SOL_WIN "Ïîçäðàâëåíèÿ, ïîáåäèõòå!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitari per J Brown\n\nCardLib versio 1.0." IDS_SOL_QUIT "Voleu sortir del joc actual?" IDS_SOL_WIN "Felicitats, heu guanyat!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0." IDS_SOL_QUIT "Ukonèit rozehranou hru?" IDS_SOL_WIN "Gratulujeme, zvítìzili jste!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Laufendes Spiel beenden?" IDS_SOL_WIN "Glückwunsch, Sie haben Gewonnen!" + IDS_SOL_DEAL "Neu geben?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Ôåñìáôéóìüò ôïõ ðéá÷íéäéïý áõôïý;" IDS_SOL_WIN "Óõã÷áñçôÞñéá, êåñäßóáôå!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,7 +50,8 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_WIN "Congratulations, you win!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "¿Finalizar el juego actual?" IDS_SOL_WIN "Felicidades, ¡¡Has ganado!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitarioa J Brown\n\nCardLib-k egina 1.0. bertsioa" IDS_SOL_QUIT "Uneko jokoa amaitu?" IDS_SOL_WIN "Zorionak, irabazi duzu!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quitter le jeu actuel ?" IDS_SOL_WIN "Félicitations ! Vous avez gagné !" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0." IDS_SOL_QUIT "Chiudere la partita in corso?" IDS_SOL_WIN "Congratulazioni, hai vinto!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -47,6 +47,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "ÇöÀç °ÔÀÓÀ» ³¡³¾°¡¿ä?" IDS_SOL_WIN "ÃàÇÏÇÕ´Ï´Ù!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -52,6 +52,7 @@ IDS_SOL_ABOUT "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Baigti þaidimà?" IDS_SOL_WIN "Sveikiname, jûs laimëjote!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Kabal av J Brown\n\nCardLib versjon 1.0." IDS_SOL_QUIT "Slutt nåværende spill?" IDS_SOL_WIN "Gratulerer, du vant!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -49,6 +49,7 @@ IDS_SOL_ABOUT "Solitaire by J. Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Zakoñczyæ aktualn¹ grê?" IDS_SOL_WIN "Gratulacje, wygra³e!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -44,6 +44,7 @@ IDS_SOL_ABOUT "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0." IDS_SOL_QUIT "Çàêîí÷èòü òåêóùóþ èãðó?" IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -52,6 +52,7 @@ IDS_SOL_ABOUT "Solitér od J Brown\n\nCardLib verzia 1.0" IDS_SOL_QUIT "Naozaj chcete skonèi aktuálnu hru?" IDS_SOL_WIN "Blahoelám, vyhrali ste!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -50,6 +50,7 @@ IDS_SOL_ABOUT "Êîñèíêà â³ä J Brown\n\nCardLib âåðñ³¿ 1.0." IDS_SOL_QUIT "Âèéòè ç ïîòî÷íî¿ ãðè?" IDS_SOL_WIN "Â³òàííÿ, Âè âèãðàëè!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -51,6 +51,7 @@ IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_DEAL "Deal again?" END Modified: trunk/reactos/base/applications/games/solitaire/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/resource.h [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -31,3 +31,4 @@ #define IDS_SOL_ABOUT 1301 #define IDS_SOL_QUIT 1302 #define IDS_SOL_WIN 1303 +#define IDS_SOL_DEAL 1304 Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -14,6 +14,7 @@ #endif extern TCHAR MsgWin[128]; +extern TCHAR MsgDeal[128]; CardStack activepile; bool fGameStarted = false; @@ -254,8 +255,19 @@ { pSuitStack[i]->Flash(11, 100); } - fGameStarted = false; - } + + if( IDYES == MessageBox(SolWnd, MsgDeal, szAppName, MB_YESNO | MB_ICONQUESTION) ) + { + NewGame(); + } + else + { + SolWnd.EmptyStacks(); + + fGameStarted = false; + } + } + TRACE("EXIT SuitStackAddProc()\n"); } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Nov 30 06:09:36 2008 @@ -19,6 +19,7 @@ TCHAR MsgQuit[128]; TCHAR MsgAbout[128]; TCHAR MsgWin[128]; +TCHAR MsgDeal[128]; DWORD dwOptions = 8; CardWindow SolWnd; @@ -135,6 +136,7 @@ LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0])); LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0])); LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0])); + LoadString(hInst, IDS_SOL_DEAL, MsgDeal, sizeof(MsgDeal) / sizeof(MsgDeal[0])); //Window class for the main application parent window wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW; @@ -579,3 +581,4 @@ } +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008