ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2008
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
25 participants
761 discussions
Start a n
N
ew thread
[fireball] 34389: Autosyncing with Wine HEAD
by fireball@svn.reactos.org
Author: fireball Date: Wed Jul 9 06:20:39 2008 New Revision: 34389 URL:
http://svn.reactos.org/svn/reactos?rev=34389&view=rev
Log: Autosyncing with Wine HEAD Modified: trunk/reactos/include/psdk/docobj.idl Modified: trunk/reactos/include/psdk/docobj.idl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/docobj.idl?re…
============================================================================== --- trunk/reactos/include/psdk/docobj.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/docobj.idl [iso-8859-1] Wed Jul 9 06:20:39 2008 @@ -262,7 +262,19 @@ OLECMDID_PRINT2 = 49, OLECMDID_PRINTPREVIEW2 = 50, OLECMDID_SETPRINTTEMPLATE = 51, - OLECMDID_GETPRINTTEMPLATE = 52 + OLECMDID_GETPRINTTEMPLATE = 52, + OLECMDID_PAGEACTIONBLOCKED = 55, + OLECMDID_PAGEACTIONUIQUERY = 56, + OLECMDID_FOCUSVIEWCONTROLS = 57, + OLECMDID_FOCUSVIEWCONTROLSQUERY = 58, + OLECMDID_SHOWPAGEACTIONMENU = 59, + OLECMDID_ADDTRAVELENTRY = 60, + OLECMDID_UPDATETRAVELENTRY = 61, + OLECMDID_UPDATEBACKFORWARDSTATE = 62, + OLECMDID_OPTICAL_ZOOM = 63, + OLECMDID_OPTICAL_GETZOOMRANGE = 64, + OLECMDID_WINDOWSTATECHANGED = 65, + OLECMDID_ACTIVEXINSTALLSCOPE = 66 } OLECMDID; HRESULT QueryStatus(
16 years, 5 months
1
0
0
0
[fireball] 34388: - Add MapVirtualKey translation types.
by fireball@svn.reactos.org
Author: fireball Date: Wed Jul 9 05:27:56 2008 New Revision: 34388 URL:
http://svn.reactos.org/svn/reactos?rev=34388&view=rev
Log: - Add MapVirtualKey translation types. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Jul 9 05:27:56 2008 @@ -2179,6 +2179,14 @@ #define VK_NONAME 0xFC #define VK_PA1 0xFD #define VK_OEM_CLEAR 0xFE + +/* MapVirtualKey translation types */ +#define MAPVK_VK_TO_VSC 0 +#define MAPVK_VSC_TO_VK 1 +#define MAPVK_VK_TO_CHAR 2 +#define MAPVK_VSC_TO_VK_EX 3 +#define MAPVK_VK_TO_VSC_EX 4 + #define TME_HOVER 1 #define TME_LEAVE 2 #define TME_NONCLIENT 0x00000010
16 years, 5 months
1
0
0
0
[pschweitzer] 34387: - Fixed build - Added a diff with GreatLord changes
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Wed Jul 9 04:28:50 2008 New Revision: 34387 URL:
http://svn.reactos.org/svn/reactos?rev=34387&view=rev
Log: - Fixed build - Added a diff with GreatLord changes Added: trunk/reactos/dll/win32/usp10/usp10_ros.diff Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Jul 9 04:28:50 2008 @@ -1726,3 +1726,10 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } + + +VOID WINAPI LpkPresent() +{ + /* FIXME */ + DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +} Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed Jul 9 04:28:50 2008 @@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr) Added: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff (added) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] Wed Jul 9 04:28:50 2008 @@ -1,0 +1,25 @@ +Index: usp10.c +=================================================================== +--- usp10.c (revision 34385) ++++ usp10.c (working copy) +@@ -1726,3 +1726,10 @@ + for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; + return S_OK; + } ++ ++ ++VOID WINAPI LpkPresent() ++{ ++ /* FIXME */ ++ DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); ++} +Index: usp10.spec +=================================================================== +--- usp10.spec (revision 34385) ++++ usp10.spec (working copy) +@@ -1,4 +1,4 @@ +-@ stub LpkPresent ++@ stdcall LpkPresent() + @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) + @ stub ScriptApplyLogicalWidth + @ stdcall ScriptBreak(ptr long ptr ptr)
16 years, 5 months
1
0
0
0
[pschweitzer] 34386: Synced usp10_winetest.exe with Wine HEAD
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Wed Jul 9 04:23:34 2008 New Revision: 34386 URL:
http://svn.reactos.org/svn/reactos?rev=34386&view=rev
Log: Synced usp10_winetest.exe with Wine HEAD Modified: trunk/rostests/winetests/usp10/testlist.c (contents, props changed) trunk/rostests/winetests/usp10/usp10.c (contents, props changed) trunk/rostests/winetests/usp10/usp10.rbuild (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/usp10/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/testlist.…
Modified: trunk/rostests/winetests/usp10/usp10.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r…
Modified: trunk/rostests/winetests/usp10/usp10.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.rbu…
16 years, 5 months
1
0
0
0
[pschweitzer] 34385: Synced shfolder.dll, stdole2.tlb, tapi32.dll, usp10.dll, winhttp.dll, wldap32.dll, wtsapi32.dll with Wine HEAD
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Wed Jul 9 04:19:04 2008 New Revision: 34385 URL:
http://svn.reactos.org/svn/reactos?rev=34385&view=rev
Log: Synced shfolder.dll, stdole2.tlb, tapi32.dll, usp10.dll, winhttp.dll, wldap32.dll, wtsapi32.dll with Wine HEAD Added: trunk/reactos/dll/win32/wldap32/wldap32_Da.rc (with props) Modified: trunk/reactos/dll/win32/shfolder/shfolder.rbuild trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc trunk/reactos/dll/win32/tapi32/assisted.c trunk/reactos/dll/win32/tapi32/tapi32.rbuild trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec trunk/reactos/dll/win32/winhttp/main.c trunk/reactos/dll/win32/winhttp/winhttp.spec trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild trunk/reactos/include/psdk/tapi.h trunk/reactos/include/psdk/winhttp.h Modified: trunk/reactos/dll/win32/shfolder/shfolder.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/shfolde…
============================================================================== --- trunk/reactos/dll/win32/shfolder/shfolder.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shfolder/shfolder.rbuild [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1,16 +1,18 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="shfolder" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> +<group> +<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="shfolder.spec.def" /> <include base="shfolder">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>version.rc</file> + <file>shfolder.spec</file> <library>wine</library> <library>shell32</library> <library>kernel32</library> <library>ntdll</library> - <file>version.rc</file> - <file>shfolder.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/rsrc…
============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -28,4 +27,5 @@ #include "wine/wine_common_ver.rc" +/* @makedep: std_ole_v2.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Modified: trunk/reactos/dll/win32/tapi32/assisted.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/assisted.…
============================================================================== --- trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdio.h> @@ -49,7 +52,7 @@ if(!RegQueryValueExA(hkey, "CurrentID", 0, &type, (LPBYTE) &currid, &valsize) && type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintf( szlockey, "Location%lu", currid); + sprintf( szlockey, "Location%u", currid); if( !RegOpenKeyA( hkey, szlockey, &hsubkey)) { if( lpszCityCode) { bufsize=sizeof(buf); @@ -63,7 +66,7 @@ bufsize=sizeof(buf); if( !RegQueryValueExA( hsubkey, "Country", 0, &type, buf, &bufsize) && type == REG_DWORD) - snprintf( lpszCountryCode, 8, "%lu", *(LPDWORD) buf ); + snprintf( lpszCountryCode, 8, "%u", *(LPDWORD) buf ); else lpszCountryCode[0] = '\0'; } Modified: trunk/reactos/dll/win32/tapi32/tapi32.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.rb…
============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.rbuild [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1,19 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="tapi32" type="win32dll" baseaddress="${BASEADDRESS_TAPI32}" installbase="system32" installname="tapi32.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="tapi32.spec.def" /> - <include base="tapi32">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="TAPI_CURRENT_VERSION">0x00020000</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>assisted.c</file> - <file>line.c</file> - <file>phone.c</file> - <file>tapi32.spec</file> -</module> + <importlibrary definition="tapi32.spec.def" /> + <include base="tapi32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>assisted.c</file> + <file>line.c</file> + <file>phone.c</file> + <file>tapi32.spec</file> + <library>wine</library> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Modified: trunk/reactos/dll/win32/usp10/usp10.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1726,11 +1726,3 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } - - -VOID WINAPI LpkPresent() -{ - /* FIXME */ - DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -} - Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1,4 +1,4 @@ -@ stdcall LpkPresent() +@ stub LpkPresent @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr) Modified: trunk/reactos/dll/win32/winhttp/main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/main.c?r…
============================================================================== --- trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -140,3 +140,110 @@ SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +/*********************************************************************** + * WinHttpConnect (winhttp.@) + */ + +HINTERNET WINAPI WinHttpConnect (HINTERNET hSession, LPCWSTR pwszServerName, + INTERNET_PORT nServerPort, DWORD dwReserved) +{ + FIXME("(%s, %d, 0x%x): stub\n", debugstr_w(pwszServerName), nServerPort, dwReserved); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} + +/*********************************************************************** + * WinHttpOpenRequest (winhttp.@) + */ +HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWSTR pwszObjectName, + LPCWSTR pwszVersion, LPCWSTR pwszReferrer, LPCWSTR* ppwszAcceptTypes, + DWORD dwFlags) +{ + FIXME("(%s, %s, %s, %s, 0x%x): stub\n", debugstr_w(pwszVerb), debugstr_w(pwszObjectName), + debugstr_w(pwszVersion), debugstr_w(pwszReferrer), dwFlags); + + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} + +/*********************************************************************** + * WinHttpSendRequest (winhttp.@) + */ +BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD dwHeadersLength, + LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwTotalLength, + DWORD_PTR dwContext) +{ + FIXME("(%s, %d, %d, %d): stub\n", debugstr_w(pwszHeaders), dwHeadersLength, dwOptionalLength, dwTotalLength); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpQueryOption (winhttp.@) + */ +BOOL WINAPI WinHttpQueryOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, LPDWORD lpdwBufferLength) +{ + FIXME("(%d): stub\n", dwOption); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpQueryDataAvailable (winhttp.@) + */ +BOOL WINAPI WinHttpQueryDataAvailable (HINTERNET hInternet, LPDWORD lpdwNumberOfBytesAvailable) +{ + FIXME("stub\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpReceiveResponse (winhttp.@) + */ +BOOL WINAPI WinHttpReceiveResponse (HINTERNET hRequest, LPVOID lpReserved) +{ + FIXME("stub\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpSetOption (winhttp.@) + */ +BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength) +{ + FIXME("stub\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpReadData (winhttp.@) + */ +BOOL WINAPI WinHttpReadData (HINTERNET hInternet, LPVOID lpBuffer, DWORD dwNumberOfBytesToRead, + LPDWORD lpdwNumberOfBytesRead) +{ + FIXME("(%d): stub\n", dwNumberOfBytesToRead); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/*********************************************************************** + * WinHttpReadData (winhttp.@) + */ +BOOL WINAPI WinHttpCloseHandle (HINTERNET hInternet) +{ + FIXME("stub\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} Modified: trunk/reactos/dll/win32/winhttp/winhttp.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.…
============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -4,8 +4,8 @@ @ stdcall -private DllUnregisterServer() @ stub WinHttpAddRequestHeaders @ stdcall WinHttpCheckPlatform() -@ stub WinHttpCloseHandle -@ stub WinHttpConnect +@ stdcall WinHttpCloseHandle(ptr) +@ stdcall WinHttpConnect(ptr wstr long long) @ stub WinHttpCrackUrl @ stub WinHttpCreateUrl @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) @@ -13,17 +13,17 @@ @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl @ stdcall WinHttpOpen(wstr long wstr wstr long) -@ stub WinHttpOpenRequest +@ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stub WinHttpQueryAuthSchemes -@ stub WinHttpQueryDataAvailable +@ stdcall WinHttpQueryDataAvailable(ptr ptr) @ stub WinHttpQueryHeaders -@ stub WinHttpQueryOption -@ stub WinHttpReadData -@ stub WinHttpReceiveResponse -@ stub WinHttpSendRequest +@ stdcall WinHttpQueryOption(ptr long ptr ptr) +@ stdcall WinHttpReadData(ptr ptr long ptr) +@ stdcall WinHttpReceiveResponse(ptr ptr) +@ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) @ stub WinHttpSetCredentials @ stub WinHttpSetDefaultProxyConfiguration -@ stub WinHttpSetOption +@ stdcall WinHttpSetOption(ptr long ptr long) @ stub WinHttpSetStatusCallback @ stub WinHttpSetTimeouts @ stub WinHttpTimeFromSystemTime Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -22,6 +22,7 @@ #include "winbase.h" #include "winuser.h" +#include "wldap32_Da.rc" #include "wldap32_De.rc" #include "wldap32_En.rc" #include "wldap32_Es.rc" Added: trunk/reactos/dll/win32/wldap32/wldap32_Da.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Da.rc (added) +++ trunk/reactos/dll/win32/wldap32/wldap32_Da.rc [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1,0 +1,123 @@ +/* + * Danish resources for WLDAP32 + * + * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "Success" + 1 "Operationsfejl" + 2 "Protokolfejl" + 3 "Tidsbegrænsning overskredet" + 4 "Størrelsesbegrænsing overskredet" + 5 "Sammenligning falsk" + 6 "Sammenligning sand" + 7 "Autentikeringsmetoden understøttes ikke" + 8 "Stærk autentisering kræves" + 9 "Henvisning (v2)" + 10 "Henvisning" + 11 "Administrationsbegrænsing overskredet" + 12 "Kritisk udvidelse utilgængelig" + 13 "Kræver konfidencialitet" + 14 "" + 15 "" + 16 "Kender ikke attribut" + 17 "Udefineret type" + 18 "Upassende sammenligning" + 19 "Begrænsning overskredet" + 20 "Attribut eller værdi findes allerede" + 21 "Ugyldig syntaks" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Objekt eksistere ikke" + 33 "Alias problem" + 34 "Ugyldig DN syntaks" + 35 "Er blad" + 36 "Problem med alias dereference" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Upassende autenticering" + 49 "Ugyldige kreditiver" + 50 "Manglende rettigheder" + 51 "Optaget" + 52 "Utilgængelig" + 53 "Uvillig til at udføre" + 54 "Løkke opdaget" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Sorteringskontrol mangler" + 61 "Fejl i indeksrækkeviden" + 62 "" + 63 "" + 64 "Navngivings overtrædelse" + 65 "Objektklasse overtrædelse" + 66 "Ikke tilladt på ikke blad" + 67 "Ikke tilladt på RDN" + 68 "Findes allerede" + 69 "Ingen objektklasse modificerere" + 70 "Resultaterne er for store" + 71 "Berører flere DSA'er" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Anden" + 81 "Server nede" + 82 "Lokal fejl" + 83 "Kodings fejl" + 84 "Dekodings fejl" + 85 "Tidsafbrud" + 86 "Ukendt autentikering" + 87 "Filter fejl" + 88 "Bruger afbrød" + 89 "Parameter fejl" + 90 "Intet hukommelse" + 91 "Kunne ikke tilsluttes til LDAP serveren" + 92 "Operationen understøttes ikke af denne version af LDAP protokollen" + 93 "Den specificerede kontroller blev ikke funndt i beskeden" + 94 "Ingen resultater i besked" + 95 "Flere resultater returneret" + 96 "Løkke under håndtering af henvisninger" + 97 "Grænse for henvisnings hop overskredet" +} Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -56,7 +56,7 @@ 31 "" 32 "Objet inconnu" 33 "Problème d'alias" - 34 "Synatxe DN invalide" + 34 "Syntaxe DN invalide" 35 "Est une feuille" 36 "Problème de déréférencement d'alias" 37 "" Modified: trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3…
============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="wtsapi32" type="win32dll" baseaddress="${BASEADDRESS_WTSAPI32}" installbase="system32" installname="wtsapi32.dll" allowwarnings="true"> <importlibrary definition="wtsapi32.spec.def" /> <include base="wtsapi32">.</include> @@ -7,9 +8,10 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>wtsapi32.c</file> + <file>wtsapi32.spec</file> <library>wine</library> <library>kernel32</library> <library>ntdll</library> - <file>wtsapi32.c</file> - <file>wtsapi32.spec</file> </module> +</group> Modified: trunk/reactos/include/psdk/tapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tapi.h?rev=34…
============================================================================== --- trunk/reactos/include/psdk/tapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tapi.h [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -123,25 +123,6 @@ #define LINEERR_INVALFEATURE 0x80000055 #define LINEERR_NOMULTIPLEINSTANCE 0x80000056 -#define LINEFORWARDMODE_UNCOND 0x00000001 -#define LINEFORWARDMODE_UNCONDINTERNAL 0x00000002 -#define LINEFORWARDMODE_UNCONDEXTERNAL 0x00000004 -#define LINEFORWARDMODE_UNCONDSPECIFIC 0x00000008 -#define LINEFORWARDMODE_BUSY 0x00000010 -#define LINEFORWARDMODE_BUSYINTERNAL 0x00000020 -#define LINEFORWARDMODE_BUSYEXTERNAL 0x00000040 -#define LINEFORWARDMODE_BUSYSPECIFIC 0x00000080 -#define LINEFORWARDMODE_NOANSW 0x00000100 -#define LINEFORWARDMODE_NOANSWINTERNAL 0x00000200 -#define LINEFORWARDMODE_NOANSWEXTERNAL 0x00000400 -#define LINEFORWARDMODE_NOANSWSPECIFIC 0x00000800 -#define LINEFORWARDMODE_BUSYNA 0x00001000 -#define LINEFORWARDMODE_BUSYNAINTERNAL 0x00002000 -#define LINEFORWARDMODE_BUSYNAEXTERNAL 0x00004000 -#define LINEFORWARDMODE_BUSYNASPECIFIC 0x00008000 -#define LINEFORWARDMODE_UNKNOWN 0x00010000 -#define LINEFORWARDMODE_UNAVAIL 0x00020000 - #define STRINGFORMAT_ASCII 0x00000001 #define STRINGFORMAT_DBCS 0x00000002 #define STRINGFORMAT_UNICODE 0x00000003 @@ -172,13 +153,6 @@ #define LINEDEVCAPFLAGS_DIALBILLING 0x00000040 #define LINEDEVCAPFLAGS_DIALQUIET 0x00000080 #define LINEDEVCAPFLAGS_DIALDIALTONE 0x00000100 -#if (TAPI_CURRENT_VERSION >= 0x00030000) -#define LINEDEVCAPFLAGS_MSP 0x00000200 -#define LINEDEVCAPFLAGS_CALLHUB 0x00000400 -#define LINEDEVCAPFLAGS_CALLHUBTRACKING 0x00000800 -#define LINEDEVCAPFLAGS_PRIVATEOBJECTS 0x00001000 -#endif -#define LINEDEVCAPFLAGS_LOCAL 0x00002000 #define LINEDEVSTATE_OTHER 0x00000001 #define LINEDEVSTATE_RINGING 0x00000002 @@ -206,22 +180,6 @@ #define LINEDEVSTATE_TRANSLATECHANGE 0x00400000 #define LINEDEVSTATE_COMPLCANCEL 0x00800000 #define LINEDEVSTATE_REMOVED 0x01000000 - -#define LINEDEVSTATUSFLAGS_CONNECTED 0x00000001 -#define LINEDEVSTATUSFLAGS_MSGWAIT 0x00000002 -#define LINEDEVSTATUSFLAGS_INSERVICE 0x00000004 -#define LINEDEVSTATUSFLAGS_LOCKED 0x00000008 - -#define LINEDIALTONEMODE_NORMAL 0x00000001 -#define LINEDIALTONEMODE_SPECIAL 0x00000002 -#define LINEDIALTONEMODE_INTERNAL 0x00000004 -#define LINEDIALTONEMODE_EXTERNAL 0x00000008 -#define LINEDIALTONEMODE_UNKNOWN 0x00000010 -#define LINEDIALTONEMODE_UNAVAIL 0x00000020 - -#define LINEDIGITMODE_PULSE 0x00000001 -#define LINEDIGITMODE_DTMF 0x00000002 -#define LINEDIGITMODE_DTMFEND 0x00000004 #define LINELOCATIONOPTION_PULSEDIAL 0x00000001 @@ -260,70 +218,12 @@ #define LINE_CREATE 19L #define PHONE_CREATE 20L -#if (TAPI_CURRENT_VERSION >= 0x00020000) #define LINE_AGENTSPECIFIC 21L #define LINE_AGENTSTATUS 22L #define LINE_APPNEWCALL 23L #define LINE_PROXYREQUEST 24L #define LINE_REMOVE 25L #define PHONE_REMOVE 26L -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00020002) -#define LINE_AGENTSESSIONSTATUS 27L -#define LINE_QUEUESTATUS 28L -#define LINE_AGENTSTATUSEX 29L -#define LINE_GROUPSTATUS 30L -#define LINE_PROXYSTATUS 31L -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00030000) -#define LINE_APPNEWCALLHUB 32L -#define LINE_CALLHUBCLOSE 33L -#define LINE_DEVSPECIFICEX 34L -#endif - -#define INITIALIZE_NEGOTIATION 0xFFFFFFFFUL - -#define LINEADDRCAPFLAGS_FWDNUMRINGS 0x00000001 -#define LINEADDRCAPFLAGS_PICKUPGROUPID 0x00000002 -#define LINEADDRCAPFLAGS_SECURE 0x00000004 -#define LINEADDRCAPFLAGS_BLOCKIDDEFAULT 0x00000008 -#define LINEADDRCAPFLAGS_BLOCKIDOVERRIDE 0x00000010 -#define LINEADDRCAPFLAGS_DIALED 0x00000020 -#define LINEADDRCAPFLAGS_ORIGOFFHOOK 0x00000040 -#define LINEADDRCAPFLAGS_DESTOFFHOOK 0x00000080 -#define LINEADDRCAPFLAGS_FWDCONSULT 0x00000100 -#define LINEADDRCAPFLAGS_SETUPCONFNULL 0x00000200 -#define LINEADDRCAPFLAGS_AUTORECONNECT 0x00000400 -#define LINEADDRCAPFLAGS_COMPLETIONID 0x00000800 -#define LINEADDRCAPFLAGS_TRANSFERHELD 0x00001000 -#define LINEADDRCAPFLAGS_TRANSFERMAKE 0x00002000 -#define LINEADDRCAPFLAGS_CONFERENCEHELD 0x00004000 -#define LINEADDRCAPFLAGS_CONFERENCEMAKE 0x00008000 -#define LINEADDRCAPFLAGS_PARTIALDIAL 0x00010000 -#define LINEADDRCAPFLAGS_FWDSTATUSVALID 0x00020000 -#define LINEADDRCAPFLAGS_FWDINTEXTADDR 0x00040000 -#define LINEADDRCAPFLAGS_FWDBUSYNAADDR 0x00080000 -#define LINEADDRCAPFLAGS_ACCEPTTOALERT 0x00100000 -#define LINEADDRCAPFLAGS_CONFDROP 0x00200000 -#define LINEADDRCAPFLAGS_PICKUPCALLWAIT 0x00400000 -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINEADDRCAPFLAGS_PREDICTIVEDIALER 0x00800000 -#define LINEADDRCAPFLAGS_QUEUE 0x01000000 -#define LINEADDRCAPFLAGS_ROUTEPOINT 0x02000000 -#define LINEADDRCAPFLAGS_HOLDMAKESNEW 0x04000000 -#define LINEADDRCAPFLAGS_NOINTERNALCALLS 0x08000000 -#define LINEADDRCAPFLAGS_NOEXTERNALCALLS 0x10000000 -#define LINEADDRCAPFLAGS_SETCALLINGID 0x20000000 -#endif -#if (TAPI_CURRENT_VERSION >= 0x00020002) -#define LINEADDRCAPFLAGS_ACDGROUP 0x40000000 -#endif -#if (TAPI_CURRENT_VERSION >= 0x00030000) -#define LINEADDRCAPFLAGS_NOPSTNADDRESSTRANSLATION 0x80000000 -#endif - /* these are used as Param1 of line_callstate messages */ #define LINECALLSTATE_IDLE 0x00000001 #define LINECALLSTATE_OFFERING 0x00000002 @@ -341,21 +241,11 @@ #define LINECALLSTATE_ONHOLDPENDTRANSFER 0x00002000 #define LINECALLSTATE_DISCONNECTED 0x00004000 #define LINECALLSTATE_UNKNOWN 0x00008000 - #define LINECONNECTEDMODE_ACTIVE 0x00000001 #define LINECONNECTEDMODE_INACTIVE 0x00000002 -#if (TAPI_CURRENT_VERSION >= 0x00020000) #define LINECONNECTEDMODE_ACTIVEHELD 0x00000004 #define LINECONNECTEDMODE_INACTIVEHELD 0x00000008 #define LINECONNECTEDMODE_CONFIRMED 0x00000010 -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLTREATMENT_SILENCE 0x00000001 -#define LINECALLTREATMENT_RINGBACK 0x00000002 -#define LINECALLTREATMENT_BUSY 0x00000003 -#define LINECALLTREATMENT_MUSIC 0x00000004 -#endif /* these are Param2 values for state_disconnected line_callstate messages */ #define LINEDISCONNECTMODE_NORMAL 0x00000001 @@ -371,7 +261,6 @@ #define LINEDISCONNECTMODE_INCOMPATIBLE 0x00000400 #define LINEDISCONNECTMODE_UNAVAIL 0x00000800 #define LINEDISCONNECTMODE_NODIALTONE 0x00001000 -#if (TAPI_CURRENT_VERSION >= 0x00020000) #define LINEDISCONNECTMODE_NUMBERCHANGED 0x00002000 #define LINEDISCONNECTMODE_OUTOFORDER 0x00004000 #define LINEDISCONNECTMODE_TEMPFAILURE 0x00008000 @@ -379,41 +268,15 @@ #define LINEDISCONNECTMODE_BLOCKED 0x00020000 #define LINEDISCONNECTMODE_DONOTDISTURB 0x00040000 #define LINEDISCONNECTMODE_CANCELLED 0x00080000 -#endif #define LINECALLSELECT_LINE 0x00000001 #define LINECALLSELECT_ADDRESS 0x00000002 #define LINECALLSELECT_CALL 0x00000004 -#if (TAPI_CURRENT_VERSION >= 0x00020001) #define LINECALLSELECT_DEVICEID 0x00000008 -#endif -#if (TAPI_CURRENT_VERSION >= 0x00030000) -#define LINECALLSELECT_CALLID 0x00000010 -#endif #define LINECALLPRIVILEGE_NONE 0x00000001 #define LINECALLPRIVILEGE_MONITOR 0x00000002 #define LINECALLPRIVILEGE_OWNER 0x00000004 - -#define LINECALLREASON_DIRECT 0x00000001 -#define LINECALLREASON_FWDBUSY 0x00000002 -#define LINECALLREASON_FWDNOANSWER 0x00000004 -#define LINECALLREASON_FWDUNCOND 0x00000008 -#define LINECALLREASON_PICKUP 0x00000010 -#define LINECALLREASON_UNPARK 0x00000020 -#define LINECALLREASON_REDIRECT 0x00000040 -#define LINECALLREASON_CALLCOMPLETION 0x00000080 -#define LINECALLREASON_TRANSFER 0x00000100 -#define LINECALLREASON_REMINDER 0x00000200 -#define LINECALLREASON_UNKNOWN 0x00000400 -#define LINECALLREASON_UNAVAIL 0x00000800 -#define LINECALLREASON_INTRUDE 0x00001000 -#define LINECALLREASON_PARKED 0x00002000 -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLREASON_CAMPEDON 0x00004000 -#define LINECALLREASON_ROUTEREQUEST 0x00008000 -#endif - #define LINECALLFEATURE_ACCEPT 0x00000001 #define LINECALLFEATURE_ADDTOCONF 0x00000002 #define LINECALLFEATURE_ANSWER 0x00000004 @@ -443,570 +306,6 @@ #define LINECALLFEATURE_SWAPHOLD 0x04000000 #define LINECALLFEATURE_UNHOLD 0x08000000 #define LINECALLFEATURE_RELEASEUSERUSERINFO 0x10000000 -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLFEATURE_SETTREATMENT 0x20000000 -#define LINECALLFEATURE_SETQOS 0x40000000 -#define LINECALLFEATURE_SETCALLDATA 0x80000000 -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLFEATURE2_NOHOLDCONFERENCE 0x00000001 -#define LINECALLFEATURE2_ONESTEPTRANSFER 0x00000002 -#define LINECALLFEATURE2_COMPLCAMPON 0x00000004 -#define LINECALLFEATURE2_COMPLCALLBACK 0x00000008 -#define LINECALLFEATURE2_COMPLINTRUDE 0x00000010 -#define LINECALLFEATURE2_COMPLMESSAGE 0x00000020 -#define LINECALLFEATURE2_TRANSFERNORM 0x00000040 -#define LINECALLFEATURE2_TRANSFERCONF 0x00000080 -#define LINECALLFEATURE2_PARKDIRECT 0x00000100 -#define LINECALLFEATURE2_PARKNONDIRECT 0x00000200 -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00030000) -#define LINECALLHUBTRACKING_NONE 0x00000000 -#define LINECALLHUBTRACKING_PROVIDERLEVEL 0x00000001 -#define LINECALLHUBTRACKING_ALLCALLS 0x00000002 -#endif - -#define LINECALLINFOSTATE_OTHER 0x00000001 -#define LINECALLINFOSTATE_DEVSPECIFIC 0x00000002 -#define LINECALLINFOSTATE_BEARERMODE 0x00000004 -#define LINECALLINFOSTATE_RATE 0x00000008 -#define LINECALLINFOSTATE_MEDIAMODE 0x00000010 -#define LINECALLINFOSTATE_APPSPECIFIC 0x00000020 -#define LINECALLINFOSTATE_CALLID 0x00000040 -#define LINECALLINFOSTATE_RELATEDCALLID 0x00000080 -#define LINECALLINFOSTATE_ORIGIN 0x00000100 -#define LINECALLINFOSTATE_REASON 0x00000200 -#define LINECALLINFOSTATE_COMPLETIONID 0x00000400 -#define LINECALLINFOSTATE_NUMOWNERINCR 0x00000800 -#define LINECALLINFOSTATE_NUMOWNERDECR 0x00001000 -#define LINECALLINFOSTATE_NUMMONITORS 0x00002000 -#define LINECALLINFOSTATE_TRUNK 0x00004000 -#define LINECALLINFOSTATE_CALLERID 0x00008000 -#define LINECALLINFOSTATE_CALLEDID 0x00010000 -#define LINECALLINFOSTATE_CONNECTEDID 0x00020000 -#define LINECALLINFOSTATE_REDIRECTIONID 0x00040000 -#define LINECALLINFOSTATE_REDIRECTINGID 0x00080000 -#define LINECALLINFOSTATE_DISPLAY 0x00100000 -#define LINECALLINFOSTATE_USERUSERINFO 0x00200000 -#define LINECALLINFOSTATE_HIGHLEVELCOMP 0x00400000 -#define LINECALLINFOSTATE_LOWLEVELCOMP 0x00800000 -#define LINECALLINFOSTATE_CHARGINGINFO 0x01000000 -#define LINECALLINFOSTATE_TERMINAL 0x02000000 -#define LINECALLINFOSTATE_DIALPARAMS 0x04000000 -#define LINECALLINFOSTATE_MONITORMODES 0x08000000 -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLINFOSTATE_TREATMENT 0x10000000 -#define LINECALLINFOSTATE_QOS 0x20000000 -#define LINECALLINFOSTATE_CALLDATA 0x40000000 -#endif - -#define LINECALLORIGIN_OUTBOUND 0x00000001 -#define LINECALLORIGIN_INTERNAL 0x00000002 -#define LINECALLORIGIN_EXTERNAL 0x00000004 -#define LINECALLORIGIN_UNKNOWN 0x00000010 -#define LINECALLORIGIN_UNAVAIL 0x00000020 -#define LINECALLORIGIN_CONFERENCE 0x00000040 -#define LINECALLORIGIN_INBOUND 0x00000080 - -#define LINECALLPARAMFLAGS_SECURE 0x00000001 -#define LINECALLPARAMFLAGS_IDLE 0x00000002 -#define LINECALLPARAMFLAGS_BLOCKID 0x00000004 -#define LINECALLPARAMFLAGS_ORIGOFFHOOK 0x00000008 -#define LINECALLPARAMFLAGS_DESTOFFHOOK 0x00000010 -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINECALLPARAMFLAGS_NOHOLDCONFERENCE 0x00000020 -#define LINECALLPARAMFLAGS_PREDICTIVEDIAL 0x00000040 -#define LINECALLPARAMFLAGS_ONESTEPTRANSFER 0x00000080 -#endif - -#define LINECALLPARTYID_BLOCKED 0x00000001 -#define LINECALLPARTYID_OUTOFAREA 0x00000002 -#define LINECALLPARTYID_NAME 0x00000004 -#define LINECALLPARTYID_ADDRESS 0x00000008 -#define LINECALLPARTYID_PARTIAL 0x00000010 -#define LINECALLPARTYID_UNKNOWN 0x00000020 -#define LINECALLPARTYID_UNAVAIL 0x00000040 - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define LINEPROXYREQUEST_SETAGENTGROUP 0x00000001 -#define LINEPROXYREQUEST_SETAGENTSTATE 0x00000002 -#define LINEPROXYREQUEST_SETAGENTACTIVITY 0x00000003 -#define LINEPROXYREQUEST_GETAGENTCAPS 0x00000004 -#define LINEPROXYREQUEST_GETAGENTSTATUS 0x00000005 -#define LINEPROXYREQUEST_AGENTSPECIFIC 0x00000006 -#define LINEPROXYREQUEST_GETAGENTACTIVITYLIST 0x00000007 -#define LINEPROXYREQUEST_GETAGENTGROUPLIST 0x00000008 -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00020002) -#define LINEPROXYREQUEST_CREATEAGENT 0x00000009 -#define LINEPROXYREQUEST_SETAGENTMEASUREMENTPERIOD 0x0000000A -#define LINEPROXYREQUEST_GETAGENTINFO 0x0000000B -#define LINEPROXYREQUEST_CREATEAGENTSESSION 0x0000000C -#define LINEPROXYREQUEST_GETAGENTSESSIONLIST 0x0000000D -#define LINEPROXYREQUEST_SETAGENTSESSIONSTATE 0x0000000E -#define LINEPROXYREQUEST_GETAGENTSESSIONINFO 0x0000000F -#define LINEPROXYREQUEST_GETQUEUELIST 0x00000010 -#define LINEPROXYREQUEST_SETQUEUEMEASUREMENTPERIOD 0x00000011 -#define LINEPROXYREQUEST_GETQUEUEINFO 0x00000012 -#define LINEPROXYREQUEST_GETGROUPLIST 0x00000013 -#define LINEPROXYREQUEST_SETAGENTSTATEEX 0x00000014 -#endif - -#define TAPI_REPLY WM_USER + 99 - -#define TAPIERR_CONNECTED 0L -#define TAPIERR_DROPPED -1L -#define TAPIERR_NOREQUESTRECIPIENT -2L -#define TAPIERR_REQUESTQUEUEFULL -3L -#define TAPIERR_INVALDESTADDRESS -4L -#define TAPIERR_INVALWINDOWHANDLE -5L -#define TAPIERR_INVALDEVICECLASS -6L -#define TAPIERR_INVALDEVICEID -7L -#define TAPIERR_DEVICECLASSUNAVAIL -8L -#define TAPIERR_DEVICEIDUNAVAIL -9L -#define TAPIERR_DEVICEINUSE -10L -#define TAPIERR_DESTBUSY -11L -#define TAPIERR_DESTNOANSWER -12L -#define TAPIERR_DESTUNAVAIL -13L -#define TAPIERR_UNKNOWNWINHANDLE -14L -#define TAPIERR_UNKNOWNREQUESTID -15L -#define TAPIERR_REQUESTFAILED -16L -#define TAPIERR_REQUESTCANCELLED -17L -#define TAPIERR_INVALPOINTER -18L -#define TAPIERR_NOTADMIN -19L -#define TAPIERR_MMCWRITELOCKED -20L -#define TAPIERR_PROVIDERALREADYINSTALLED -21L -#define TAPIERR_SCP_ALREADY_EXISTS -22L -#define TAPIERR_SCP_DOES_NOT_EXIST -23L - -#define TAPIMAXDESTADDRESSSIZE 80L -#define TAPIMAXAPPNAMESIZE 40L -#define TAPIMAXCALLEDPARTYSIZE 40L -#define TAPIMAXCOMMENTSIZE 80L -#define TAPIMAXDEVICECLASSSIZE 40L -#define TAPIMAXDEVICEIDSIZE 40L - -#define PHONEBUTTONFUNCTION_UNKNOWN 0x00000000 -#define PHONEBUTTONFUNCTION_CONFERENCE 0x00000001 -#define PHONEBUTTONFUNCTION_TRANSFER 0x00000002 -#define PHONEBUTTONFUNCTION_DROP 0x00000003 -#define PHONEBUTTONFUNCTION_HOLD 0x00000004 -#define PHONEBUTTONFUNCTION_RECALL 0x00000005 -#define PHONEBUTTONFUNCTION_DISCONNECT 0x00000006 -#define PHONEBUTTONFUNCTION_CONNECT 0x00000007 -#define PHONEBUTTONFUNCTION_MSGWAITON 0x00000008 -#define PHONEBUTTONFUNCTION_MSGWAITOFF 0x00000009 -#define PHONEBUTTONFUNCTION_SELECTRING 0x0000000A -#define PHONEBUTTONFUNCTION_ABBREVDIAL 0x0000000B -#define PHONEBUTTONFUNCTION_FORWARD 0x0000000C -#define PHONEBUTTONFUNCTION_PICKUP 0x0000000D -#define PHONEBUTTONFUNCTION_RINGAGAIN 0x0000000E -#define PHONEBUTTONFUNCTION_PARK 0x0000000F -#define PHONEBUTTONFUNCTION_REJECT 0x00000010 -#define PHONEBUTTONFUNCTION_REDIRECT 0x00000011 -#define PHONEBUTTONFUNCTION_MUTE 0x00000012 -#define PHONEBUTTONFUNCTION_VOLUMEUP 0x00000013 -#define PHONEBUTTONFUNCTION_VOLUMEDOWN 0x00000014 -#define PHONEBUTTONFUNCTION_SPEAKERON 0x00000015 -#define PHONEBUTTONFUNCTION_SPEAKEROFF 0x00000016 -#define PHONEBUTTONFUNCTION_FLASH 0x00000017 -#define PHONEBUTTONFUNCTION_DATAON 0x00000018 -#define PHONEBUTTONFUNCTION_DATAOFF 0x00000019 -#define PHONEBUTTONFUNCTION_DONOTDISTURB 0x0000001A -#define PHONEBUTTONFUNCTION_INTERCOM 0x0000001B -#define PHONEBUTTONFUNCTION_BRIDGEDAPP 0x0000001C -#define PHONEBUTTONFUNCTION_BUSY 0x0000001D -#define PHONEBUTTONFUNCTION_CALLAPP 0x0000001E -#define PHONEBUTTONFUNCTION_DATETIME 0x0000001F -#define PHONEBUTTONFUNCTION_DIRECTORY 0x00000020 -#define PHONEBUTTONFUNCTION_COVER 0x00000021 -#define PHONEBUTTONFUNCTION_CALLID 0x00000022 -#define PHONEBUTTONFUNCTION_LASTNUM 0x00000023 -#define PHONEBUTTONFUNCTION_NIGHTSRV 0x00000024 -#define PHONEBUTTONFUNCTION_SENDCALLS 0x00000025 -#define PHONEBUTTONFUNCTION_MSGINDICATOR 0x00000026 -#define PHONEBUTTONFUNCTION_REPDIAL 0x00000027 -#define PHONEBUTTONFUNCTION_SETREPDIAL 0x00000028 -#define PHONEBUTTONFUNCTION_SYSTEMSPEED 0x00000029 -#define PHONEBUTTONFUNCTION_STATIONSPEED 0x0000002A -#define PHONEBUTTONFUNCTION_CAMPON 0x0000002B -#define PHONEBUTTONFUNCTION_SAVEREPEAT 0x0000002C -#define PHONEBUTTONFUNCTION_QUEUECALL 0x0000002D -#define PHONEBUTTONFUNCTION_NONE 0x0000002E -#if (TAPI_CURRENT_VERSION >= 0x00030001) -#define PHONEBUTTONFUNCTION_SEND 0x0000002F -#endif - -#define PHONEBUTTONMODE_DUMMY 0x00000001 -#define PHONEBUTTONMODE_CALL 0x00000002 -#define PHONEBUTTONMODE_FEATURE 0x00000004 -#define PHONEBUTTONMODE_KEYPAD 0x00000008 -#define PHONEBUTTONMODE_LOCAL 0x00000010 -#define PHONEBUTTONMODE_DISPLAY 0x00000020 - -#define PHONEBUTTONSTATE_UP 0x00000001 -#define PHONEBUTTONSTATE_DOWN 0x00000002 -#define PHONEBUTTONSTATE_UNKNOWN 0x00000004 -#define PHONEBUTTONSTATE_UNAVAIL 0x00000008 - -#define PHONEERR_ALLOCATED 0x90000001 -#define PHONEERR_BADDEVICEID 0x90000002 -#define PHONEERR_INCOMPATIBLEAPIVERSION 0x90000003 -#define PHONEERR_INCOMPATIBLEEXTVERSION 0x90000004 -#define PHONEERR_INIFILECORRUPT 0x90000005 -#define PHONEERR_INUSE 0x90000006 -#define PHONEERR_INVALAPPHANDLE 0x90000007 -#define PHONEERR_INVALAPPNAME 0x90000008 -#define PHONEERR_INVALBUTTONLAMPID 0x90000009 -#define PHONEERR_INVALBUTTONMODE 0x9000000A -#define PHONEERR_INVALBUTTONSTATE 0x9000000B -#define PHONEERR_INVALDATAID 0x9000000C -#define PHONEERR_INVALDEVICECLASS 0x9000000D -#define PHONEERR_INVALEXTVERSION 0x9000000E -#define PHONEERR_INVALHOOKSWITCHDEV 0x9000000F -#define PHONEERR_INVALHOOKSWITCHMODE 0x90000010 -#define PHONEERR_INVALLAMPMODE 0x90000011 -#define PHONEERR_INVALPARAM 0x90000012 -#define PHONEERR_INVALPHONEHANDLE 0x90000013 -#define PHONEERR_INVALPHONESTATE 0x90000014 -#define PHONEERR_INVALPOINTER 0x90000015 -#define PHONEERR_INVALPRIVILEGE 0x90000016 -#define PHONEERR_INVALRINGMODE 0x90000017 -#define PHONEERR_NODEVICE 0x90000018 -#define PHONEERR_NODRIVER 0x90000019 -#define PHONEERR_NOMEM 0x9000001A -#define PHONEERR_NOTOWNER 0x9000001B -#define PHONEERR_OPERATIONFAILED 0x9000001C -#define PHONEERR_OPERATIONUNAVAIL 0x9000001D -#define PHONEERR_RESOURCEUNAVAIL 0x9000001F -#define PHONEERR_REQUESTOVERRUN 0x90000020 -#define PHONEERR_STRUCTURETOOSMALL 0x90000021 -#define PHONEERR_UNINITIALIZED 0x90000022 -#define PHONEERR_REINIT 0x90000023 -#define PHONEERR_DISCONNECTED 0x90000024 -#define PHONEERR_SERVICE_NOT_RUNNING 0x90000025 - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define PHONEFEATURE_GETBUTTONINFO 0x00000001 -#define PHONEFEATURE_GETDATA 0x00000002 -#define PHONEFEATURE_GETDISPLAY 0x00000004 -#define PHONEFEATURE_GETGAINHANDSET 0x00000008 -#define PHONEFEATURE_GETGAINSPEAKER 0x00000010 -#define PHONEFEATURE_GETGAINHEADSET 0x00000020 -#define PHONEFEATURE_GETHOOKSWITCHHANDSET 0x00000040 -#define PHONEFEATURE_GETHOOKSWITCHSPEAKER 0x00000080 -#define PHONEFEATURE_GETHOOKSWITCHHEADSET 0x00000100 -#define PHONEFEATURE_GETLAMP 0x00000200 -#define PHONEFEATURE_GETRING 0x00000400 -#define PHONEFEATURE_GETVOLUMEHANDSET 0x00000800 -#define PHONEFEATURE_GETVOLUMESPEAKER 0x00001000 -#define PHONEFEATURE_GETVOLUMEHEADSET 0x00002000 -#define PHONEFEATURE_SETBUTTONINFO 0x00004000 -#define PHONEFEATURE_SETDATA 0x00008000 -#define PHONEFEATURE_SETDISPLAY 0x00010000 -#define PHONEFEATURE_SETGAINHANDSET 0x00020000 -#define PHONEFEATURE_SETGAINSPEAKER 0x00040000 -#define PHONEFEATURE_SETGAINHEADSET 0x00080000 -#define PHONEFEATURE_SETHOOKSWITCHHANDSET 0x00100000 -#define PHONEFEATURE_SETHOOKSWITCHSPEAKER 0x00200000 -#define PHONEFEATURE_SETHOOKSWITCHHEADSET 0x00400000 -#define PHONEFEATURE_SETLAMP 0x00800000 -#define PHONEFEATURE_SETRING 0x01000000 -#define PHONEFEATURE_SETVOLUMEHANDSET 0x02000000 -#define PHONEFEATURE_SETVOLUMESPEAKER 0x04000000 -#define PHONEFEATURE_SETVOLUMEHEADSET 0x08000000 -#endif -#if (TAPI_CURRENT_VERSION >= 0x00030001) -#define PHONEFEATURE_GENERICPHONE 0x10000000 -#endif - -#define PHONEHOOKSWITCHDEV_HANDSET 0x00000001 -#define PHONEHOOKSWITCHDEV_SPEAKER 0x00000002 -#define PHONEHOOKSWITCHDEV_HEADSET 0x00000004 - -#define PHONEHOOKSWITCHMODE_ONHOOK 0x00000001 -#define PHONEHOOKSWITCHMODE_MIC 0x00000002 -#define PHONEHOOKSWITCHMODE_SPEAKER 0x00000004 -#define PHONEHOOKSWITCHMODE_MICSPEAKER 0x00000008 -#define PHONEHOOKSWITCHMODE_UNKNOWN 0x00000010 - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -#define PHONEINITIALIZEEXOPTION_USEHIDDENWINDOW 0x00000001 -#define PHONEINITIALIZEEXOPTION_USEEVENT 0x00000002 -#define PHONEINITIALIZEEXOPTION_USECOMPLETIONPORT 0x00000003 -#endif - -#define PHONELAMPMODE_DUMMY 0x00000001 -#define PHONELAMPMODE_OFF 0x00000002 -#define PHONELAMPMODE_STEADY 0x00000004 -#define PHONELAMPMODE_WINK 0x00000008 -#define PHONELAMPMODE_FLASH 0x00000010 -#define PHONELAMPMODE_FLUTTER 0x00000020 -#define PHONELAMPMODE_BROKENFLUTTER 0x00000040 -#define PHONELAMPMODE_UNKNOWN 0x00000080 - -#define PHONEPRIVILEGE_MONITOR 0x00000001 -#define PHONEPRIVILEGE_OWNER 0x00000002 - -#define PHONESTATE_OTHER 0x00000001 -#define PHONESTATE_CONNECTED 0x00000002 -#define PHONESTATE_DISCONNECTED 0x00000004 -#define PHONESTATE_OWNER 0x00000008 -#define PHONESTATE_MONITORS 0x00000010 -#define PHONESTATE_DISPLAY 0x00000020 -#define PHONESTATE_LAMP 0x00000040 -#define PHONESTATE_RINGMODE 0x00000080 -#define PHONESTATE_RINGVOLUME 0x00000100 -#define PHONESTATE_HANDSETHOOKSWITCH 0x00000200 -#define PHONESTATE_HANDSETVOLUME 0x00000400 -#define PHONESTATE_HANDSETGAIN 0x00000800 -#define PHONESTATE_SPEAKERHOOKSWITCH 0x00001000 -#define PHONESTATE_SPEAKERVOLUME 0x00002000 -#define PHONESTATE_SPEAKERGAIN 0x00004000 -#define PHONESTATE_HEADSETHOOKSWITCH 0x00008000 -#define PHONESTATE_HEADSETVOLUME 0x00010000 -#define PHONESTATE_HEADSETGAIN 0x00020000 -#define PHONESTATE_SUSPEND 0x00040000 -#define PHONESTATE_RESUME 0x00080000 -#define PHONESTATE_DEVSPECIFIC 0x00100000 -#define PHONESTATE_REINIT 0x00200000 -#define PHONESTATE_CAPSCHANGE 0x00400000 -#define PHONESTATE_REMOVED 0x00800000 - -#define PHONESTATUSFLAGS_CONNECTED 0x00000001 -#define PHONESTATUSFLAGS_SUSPENDED 0x00000002 - -#if (TAPI_CURRENT_VERSION >= 0x00020000) -typedef struct lineagentactivityentry_tag -{ - DWORD dwID; - DWORD dwNameSize; - DWORD dwNameOffset; -} LINEAGENTACTIVITYENTRY, *LPLINEAGENTACTIVITYENTRY; - -typedef struct lineagentactivitylist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEAGENTACTIVITYLIST, *LPLINEAGENTACTIVITYLIST; - -typedef struct lineagentcaps_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwAgentHandlerInfoSize; - DWORD dwAgentHandlerInfoOffset; - DWORD dwCapsVersion; - DWORD dwFeatures; - DWORD dwStates; - DWORD dwNextStates; - DWORD dwMaxNumGroupEntries; - DWORD dwAgentStatusMessages; - DWORD dwNumAgentExtensionIDs; - DWORD dwAgentExtensionIDListSize; - DWORD dwAgentExtensionIDListOffset; -#if (TAPI_CURRENT_VERSION >= 0x00020002) - GUID ProxyGUID; -#endif -} LINEAGENTCAPS, *LPLINEAGENTCAPS; - -typedef struct lineagentgroupentry_tag -{ - struct - { - DWORD dwGroupID1; - DWORD dwGroupID2; - DWORD dwGroupID3; - DWORD dwGroupID4; - } GroupID; - DWORD dwNameSize; - DWORD dwNameOffset; -} LINEAGENTGROUPENTRY, *LPLINEAGENTGROUPENTRY; - -typedef struct lineagentgrouplist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEAGENTGROUPLIST, *LPLINEAGENTGROUPLIST; - -typedef struct lineagentstatus_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwGroupListSize; - DWORD dwGroupListOffset; - DWORD dwState; - DWORD dwNextState; - DWORD dwActivityID; - DWORD dwActivitySize; - DWORD dwActivityOffset; - DWORD dwAgentFeatures; - DWORD dwValidStates; - DWORD dwValidNextStates; -} LINEAGENTSTATUS, *LPLINEAGENTSTATUS; - -typedef struct lineappinfo_tag -{ - DWORD dwMachineNameSize; - DWORD dwMachineNameOffset; - DWORD dwUserNameSize; - DWORD dwUserNameOffset; - DWORD dwModuleFilenameSize; - DWORD dwModuleFilenameOffset; - DWORD dwFriendlyNameSize; - DWORD dwFriendlyNameOffset; - DWORD dwMediaModes; - DWORD dwAddressID; -} LINEAPPINFO, *LPLINEAPPINFO; -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00020002) -typedef struct lineagententry_tag -{ - HAGENT hAgent; - DWORD dwNameSize; - DWORD dwNameOffset; - DWORD dwIDSize; - DWORD dwIDOffset; - DWORD dwPINSize; - DWORD dwPINOffset; -} LINEAGENTENTRY, *LPLINEAGENTENTRY; - -typedef struct lineagentlist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEAGENTLIST, *LPLINEAGENTLIST; - -typedef struct lineagentinfo_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwAgentState; - DWORD dwNextAgentState; - DWORD dwMeasurementPeriod; - CURRENCY cyOverallCallRate; - DWORD dwNumberOfACDCalls; - DWORD dwNumberOfIncomingCalls; - DWORD dwNumberOfOutgoingCalls; - DWORD dwTotalACDTalkTime; - DWORD dwTotalACDCallTime; - DWORD dwTotalACDWrapUpTime; -} LINEAGENTINFO, *LPLINEAGENTINFO; - -typedef struct lineagentsession_tag -{ - HAGENTSESSION hAgentSession; - HAGENT hAgent; - GUID GroupID; - DWORD dwWorkingAddressID; -} LINEAGENTSESSIONENTRY, *LPLINEAGENTSESSIONENTRY; - -typedef struct lineagentsessionlist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEAGENTSESSIONLIST, *LPLINEAGENTSESSIONLIST; - -typedef struct lineagentsessioninfo_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwAgentSessionState; - DWORD dwNextAgentSessionState; - DATE dateSessionStartTime; - DWORD dwSessionDuration; - DWORD dwNumberOfCalls; - DWORD dwTotalTalkTime; - DWORD dwAverageTalkTime; - DWORD dwTotalCallTime; - DWORD dwAverageCallTime; - DWORD dwTotalWrapUpTime; - DWORD dwAverageWrapUpTime; - CURRENCY cyACDCallRate; - DWORD dwLongestTimeToAnswer; - DWORD dwAverageTimeToAnswer; -} LINEAGENTSESSIONINFO, *LPLINEAGENTSESSIONINFO; - -typedef struct linequeueentry_tag -{ - DWORD dwQueueID; - DWORD dwNameSize; - DWORD dwNameOffset; -} LINEQUEUEENTRY, *LPLINEQUEUEENTRY; - -typedef struct linequeuelist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEQUEUELIST, *LPLINEQUEUELIST; - -typedef struct linequeueinfo_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwMeasurementPeriod; - DWORD dwTotalCallsQueued; - DWORD dwCurrentCallsQueued; - DWORD dwTotalCallsAbandoned; - DWORD dwTotalCallsFlowedIn; - DWORD dwTotalCallsFlowedOut; - DWORD dwLongestEverWaitTime; - DWORD dwCurrentLongestWaitTime; - DWORD dwAverageWaitTime; - DWORD dwFinalDisposition; -} LINEQUEUEINFO, *LPLINEQUEUEINFO; - -typedef struct lineproxyrequestlist_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwNumEntries; - DWORD dwListSize; - DWORD dwListOffset; -} LINEPROXYREQUESTLIST, *LPLINEPROXYREQUESTLIST; -#endif - -#if (TAPI_CURRENT_VERSION >= 0x00030000) -typedef struct linecallhubtrackinginfo_tag -{ - DWORD dwTotalSize; - DWORD dwNeededSize; - DWORD dwUsedSize; - DWORD dwAvailableTracking; - DWORD dwCurrentTracking; -} LINECALLHUBTRACKINGINFO, FAR *LPLINECALLHUBTRACKINGINFO; -#endif typedef struct lineaddresscaps_tag { DWORD dwTotalSize; @@ -1290,9 +589,9 @@ DWORD dwOpenMediaModes; DWORD dwNumActiveCalls; DWORD dwNumOnHoldCalls; - DWORD dwNumOnHoldPendingCalls; + DWORD dwNumOnHoldPendCalls; DWORD dwLineFeatures; - DWORD dwNumCallCompletion; + DWORD dwNumCallCompletions; DWORD dwRingMode; DWORD dwSignalLevel; DWORD dwBatteryLevel; @@ -1333,176 +632,17 @@ DWORD dwVolume; } LINEGENERATETONE, *LPLINEGENERATETONE; -#if (TAPI_CURRENT_VERSION >= 0x00020000) -typedef struct lineinitializeexparams_tag -{ +typedef struct lineinitializeexparams_tag { DWORD dwTotalSize; DWORD dwNeededSize; DWORD dwUsedSize; DWORD dwOptions; - union { HANDLE hEvent; HANDLE hCompletionPort; } Handles; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; DWORD dwCompletionKey; -} LINEINITIALIZEEXPARAMS, FAR *LPLINEINITIALIZEEXPARAMS; - -typedef struct linemessage_tag -{ - DWORD hDevice; - DWORD dwMessageID; - DWORD_PTR dwCallbackInstance; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; - DWORD_PTR dwParam3; -} LINEMESSAGE, FAR *LPLINEMESSAGE; - -typedef struct lineproxyrequest_tag -{ - DWORD dwSize; - DWORD dwClientMachineNameSize; - DWORD dwClientMachineNameOffset; - DWORD dwClientUserNameSize; - DWORD dwClientUserNameOffset; - DWORD dwClientAppAPIVersion; - DWORD dwRequestType; - union - { - struct - { - DWORD dwAddressID; - LINEAGENTGROUPLIST GroupList; - } SetAgentGroup; - struct - { - DWORD dwAddressID; - DWORD dwAgentState; - DWORD dwNextAgentState; - } SetAgentState; - struct - { - DWORD dwAddressID; - DWORD dwActivityID; - } SetAgentActivity; - struct - { - DWORD dwAddressID; - LINEAGENTCAPS AgentCaps; - } GetAgentCaps; - struct - { - DWORD dwAddressID; - LINEAGENTSTATUS AgentStatus; - } GetAgentStatus; - struct - { - DWORD dwAddressID; - DWORD dwAgentExtensionIDIndex; - DWORD dwSize; - BYTE Params[1]; - } AgentSpecific; - struct - { - DWORD dwAddressID; - LINEAGENTACTIVITYLIST ActivityList; - } GetAgentActivityList; - struct - { - DWORD dwAddressID; - LINEAGENTGROUPLIST GroupList; - } GetAgentGroupList; -#if (TAPI_CURRENT_VERSION >= 0x00020002) - struct - { - HAGENT hAgent; - DWORD dwAgentIDSize; - DWORD dwAgentIDOffset; - DWORD dwAgentPINSize; - DWORD dwAgentPINOffset; - } CreateAgent; - struct - { - HAGENT hAgent; - DWORD dwAgentState; - DWORD dwNextAgentState; - } SetAgentStateEx; - struct - { - HAGENT hAgent; - DWORD dwMeasurementPeriod; - } SetAgentMeasurementPeriod; - struct - { - HAGENT hAgent; - LINEAGENTINFO AgentInfo; - } GetAgentInfo; - struct - { - HAGENTSESSION hAgentSession; - DWORD dwAgentPINSize; - DWORD dwAgentPINOffset; - HAGENT hAgent; - GUID GroupID; - DWORD dwWorkingAddressID; - } CreateAgentSession; - struct - { - HAGENT hAgent; - LINEAGENTSESSIONLIST SessionList; - } GetAgentSessionList; - struct - { - HAGENTSESSION hAgentSession; - LINEAGENTSESSIONINFO SessionInfo; - } GetAgentSessionInfo; - struct - { - HAGENTSESSION hAgentSession; - DWORD dwAgentSessionState; - DWORD dwNextAgentSessionState; - } SetAgentSessionState; - struct - { - GUID GroupID; - LINEQUEUELIST QueueList; - } GetQueueList; - struct - { - DWORD dwQueueID; - DWORD dwMeasurementPeriod; - } SetQueueMeasurementPeriod; - struct - { - DWORD dwQueueID; - LINEQUEUEINFO QueueInfo; - } GetQueueInfo; - struct - { - LINEAGENTGROUPLIST GroupList; - } GetGroupList; -#endif - }; -} LINEPROXYREQUEST, *LPLINEPROXYREQUEST; - -typedef struct linereqmakecallW_tag -{ - WCHAR szDestAddress[TAPIMAXDESTADDRESSSIZE]; - WCHAR szAppName[TAPIMAXAPPNAMESIZE]; - WCHAR szCalledParty[TAPIMAXCALLEDPARTYSIZE]; - WCHAR szComment[TAPIMAXCOMMENTSIZE]; -} LINEREQMAKECALLW, FAR *LPLINEREQMAKECALLW; - -typedef struct linereqmediacallW_tag -{ - HWND hWnd; - WPARAM wRequestID; - WCHAR szDeviceClass[TAPIMAXDEVICECLASSSIZE]; - unsigned char ucDeviceID[TAPIMAXDEVICEIDSIZE]; - DWORD dwSize; - DWORD dwSecure; - WCHAR szDestAddress[TAPIMAXDESTADDRESSSIZE]; - WCHAR szAppName[TAPIMAXAPPNAMESIZE]; - WCHAR szCalledParty[TAPIMAXCALLEDPARTYSIZE]; - WCHAR szComment[TAPIMAXCOMMENTSIZE]; -} LINEREQMEDIACALLW, FAR *LPLINEREQMEDIACALLW; -#endif /* (TAPI_CURRENT_VERSION >= 0x00020000) */ +} LINEINITIALIZEEXPARAMS, *LPLINEINITIALIZEEXPARAMS; typedef struct linemediacontrolcallstate_tag { DWORD dwCallStates; @@ -1670,20 +810,6 @@ DWORD dwGetDataOffset; DWORD dwDevSpecificSize; DWORD dwDevSpecificOffset; -#if (TAPI_CURRENT_VERSION >= 0x00020000) - DWORD dwDeviceClassesSize; - DWORD dwDeviceClassesOffset; - DWORD dwPhoneFeatures; - DWORD dwSettableHandsetHookSwitchModes; - DWORD dwSettableSpeakerHookSwitchModes; - DWORD dwSettableHeadsetHookSwitchModes; - DWORD dwMonitoredHandsetHookSwitchModes; - DWORD dwMonitoredSpeakerHookSwitchModes; - DWORD dwMonitoredHeadsetHookSwitchModes; -#endif -#if (TAPI_CURRENT_VERSION >= 0x00020002) - GUID PermanentPhoneGuid; -#endif } PHONECAPS, *LPPHONECAPS; typedef struct phoneextensionid_tag { @@ -1774,6 +900,9 @@ DWORD WINAPI lineHandoff(HCALL,LPCSTR,DWORD); DWORD WINAPI lineHold(HCALL); DWORD WINAPI lineInitialize(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD); +LONG WINAPI lineInitializeExA(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); +LONG WINAPI lineInitializeExW(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCWSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); +#define lineInitializeEx WINELIB_NAME_AW(lineInitializeEx) DWORD WINAPI lineMakeCall(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineMonitorDigits(HCALL,DWORD); DWORD WINAPI lineMonitorMedia(HCALL,DWORD); Modified: trunk/reactos/include/psdk/winhttp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winhttp.h?rev…
============================================================================== --- trunk/reactos/include/psdk/winhttp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winhttp.h [iso-8859-1] Wed Jul 9 04:19:04 2008 @@ -58,9 +58,107 @@ #define WINHTTP_NO_REFERER NULL #define WINHTTP_DEFAULT_ACCEPT_TYPES NULL -#define WINHTTP_ERROR_BASE 12000 - -#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) +/* flags for WinHttp{Set/Query}Options */ +#define WINHTTP_FIRST_OPTION WINHTTP_OPTION_CALLBACK +#define WINHTTP_OPTION_CALLBACK 1 +#define WINHTTP_OPTION_RESOLVE_TIMEOUT 2 +#define WINHTTP_OPTION_CONNECT_TIMEOUT 3 +#define WINHTTP_OPTION_CONNECT_RETRIES 4 +#define WINHTTP_OPTION_SEND_TIMEOUT 5 +#define WINHTTP_OPTION_RECEIVE_TIMEOUT 6 +#define WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT 7 +#define WINHTTP_OPTION_HANDLE_TYPE 9 +#define WINHTTP_OPTION_READ_BUFFER_SIZE 12 +#define WINHTTP_OPTION_WRITE_BUFFER_SIZE 13 +#define WINHTTP_OPTION_PARENT_HANDLE 21 +#define WINHTTP_OPTION_EXTENDED_ERROR 24 +#define WINHTTP_OPTION_SECURITY_FLAGS 31 +#define WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT 32 +#define WINHTTP_OPTION_URL 34 +#define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36 +#define WINHTTP_OPTION_PROXY 38 +#define WINHTTP_OPTION_USER_AGENT 41 +#define WINHTTP_OPTION_CONTEXT_VALUE 45 +#define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47 +#define WINHTTP_OPTION_REQUEST_PRIORITY 58 +#define WINHTTP_OPTION_HTTP_VERSION 59 +#define WINHTTP_OPTION_DISABLE_FEATURE 63 +#define WINHTTP_OPTION_CODEPAGE 68 +#define WINHTTP_OPTION_MAX_CONNS_PER_SERVER 73 +#define WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER 74 +#define WINHTTP_OPTION_AUTOLOGON_POLICY 77 +#define WINHTTP_OPTION_SERVER_CERT_CONTEXT 78 +#define WINHTTP_OPTION_ENABLE_FEATURE 79 +#define WINHTTP_OPTION_WORKER_THREAD_COUNT 80 +#define WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT 81 +#define WINHTTP_OPTION_PASSPORT_COBRANDING_URL 82 +#define WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH 83 +#define WINHTTP_OPTION_SECURE_PROTOCOLS 84 +#define WINHTTP_OPTION_ENABLETRACING 85 +#define WINHTTP_OPTION_PASSPORT_SIGN_OUT 86 +#define WINHTTP_OPTION_PASSPORT_RETURN_URL 87 +#define WINHTTP_OPTION_REDIRECT_POLICY 88 +#define WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS 89 +#define WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE 90 +#define WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE 91 +#define WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE 92 +#define WINHTTP_OPTION_CONNECTION_INFO 93 +#define WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST 94 +#define WINHTTP_OPTION_SPN 96 +#define WINHTTP_OPTION_GLOBAL_PROXY_CREDS 97 +#define WINHTTP_OPTION_GLOBAL_SERVER_CREDS 98 +#define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99 +#define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100 +#define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101 +#define WINHTTP_LAST_OPTION WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS +#define WINHTTP_OPTION_USERNAME 0x1000 +#define WINHTTP_OPTION_PASSWORD 0x1001 +#define WINHTTP_OPTION_PROXY_USERNAME 0x1002 +#define WINHTTP_OPTION_PROXY_PASSWORD 0x1003 + +/* Options for WinHttpOpenRequest */ +#define WINHTTP_NO_REFERER NULL +#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL + +/* Options for WinHttpSendRequest */ +#define WINHTTP_NO_ADDITIONAL_HEADERS NULL +#define WINHTTP_NO_REQUEST_DATA NULL + +/* WinHTTP error codes */ +#define WINHTTP_ERROR_BASE 12000 +#define ERROR_WINHTTP_OUT_OF_HANDLES (WINHTTP_ERROR_BASE + 1) +#define ERROR_WINHTTP_TIMEOUT (WINHTTP_ERROR_BASE + 2) +#define ERROR_WINHTTP_INTERNAL_ERROR (WINHTTP_ERROR_BASE + 4) +#define ERROR_WINHTTP_INVALID_URL (WINHTTP_ERROR_BASE + 5) +#define ERROR_WINHTTP_UNRECOGNIZED_SCHEME (WINHTTP_ERROR_BASE + 6) +#define ERROR_WINHTTP_NAME_NOT_RESOLVED (WINHTTP_ERROR_BASE + 7) +#define ERROR_WINHTTP_INVALID_OPTION (WINHTTP_ERROR_BASE + 9) +#define ERROR_WINHTTP_OPTION_NOT_SETTABLE (WINHTTP_ERROR_BASE + 11) +#define ERROR_WINHTTP_SHUTDOWN (WINHTTP_ERROR_BASE + 12) +#define ERROR_WINHTTP_LOGIN_FAILURE (WINHTTP_ERROR_BASE + 15) +#define ERROR_WINHTTP_OPERATION_CANCELLED (WINHTTP_ERROR_BASE + 17) +#define ERROR_WINHTTP_INCORRECT_HANDLE_TYPE (WINHTTP_ERROR_BASE + 18) +#define ERROR_WINHTTP_INCORRECT_HANDLE_STATE (WINHTTP_ERROR_BASE + 19) +#define ERROR_WINHTTP_CANNOT_CONNECT (WINHTTP_ERROR_BASE + 29) +#define ERROR_WINHTTP_CONNECTION_ERROR (WINHTTP_ERROR_BASE + 30) +#define ERROR_WINHTTP_RESEND_REQUEST (WINHTTP_ERROR_BASE + 32) +#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED (WINHTTP_ERROR_BASE + 44) +#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN (WINHTTP_ERROR_BASE + 100) +#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND (WINHTTP_ERROR_BASE + 101) +#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND (WINHTTP_ERROR_BASE + 102) +#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN (WINHTTP_ERROR_BASE + 103) +#define ERROR_WINHTTP_HEADER_NOT_FOUND (WINHTTP_ERROR_BASE + 150) +#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE (WINHTTP_ERROR_BASE + 152) +#define ERROR_WINHTTP_INVALID_HEADER (WINHTTP_ERROR_BASE + 153) +#define ERROR_WINHTTP_INVALID_QUERY_REQUEST (WINHTTP_ERROR_BASE + 154) +#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS (WINHTTP_ERROR_BASE + 155) +#define ERROR_WINHTTP_REDIRECT_FAILED (WINHTTP_ERROR_BASE + 156) +#define ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT (WINHTTP_ERROR_BASE + 166) +#define ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT (WINHTTP_ERROR_BASE + 167) +#define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) +#define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) +#define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) +#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) typedef struct { @@ -152,7 +250,7 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,DWORD); +HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD);
16 years, 5 months
1
0
0
0
[pschweitzer] 34384: Fixed build
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Wed Jul 9 04:11:53 2008 New Revision: 34384 URL:
http://svn.reactos.org/svn/reactos?rev=34384&view=rev
Log: Fixed build Modified: trunk/reactos/dll/win32/ole32/compobj_private.h Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr…
============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Wed Jul 9 04:11:53 2008 @@ -43,7 +43,6 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); -DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); /* signal to stub manager that this is a rem unknown object */ #define MSHLFLAGSP_REMUNKNOWN 0x80000000
16 years, 5 months
1
0
0
0
[dreimer] 34383: Bug 3466: Korean translation of Roscalc by Sengyu Kim Bug 3468: Translate calc to norwegain by Lars Martin Bug 3470: Translate file charmap by Lars Martin Bug 3471: Translate file Remote desktop by Lars Martin Polish Shell32 Translation Update by Olaf Siejka
by dreimer@svn.reactos.org
Author: dreimer Date: Wed Jul 9 03:32:45 2008 New Revision: 34383 URL:
http://svn.reactos.org/svn/reactos?rev=34383&view=rev
Log: Bug 3466: Korean translation of Roscalc by Sengyu Kim Bug 3468: Translate calc to norwegain by Lars Martin Bug 3470: Translate file charmap by Lars Martin Bug 3471: Translate file Remote desktop by Lars Martin Polish Shell32 Translation Update by Olaf Siejka Added: trunk/reactos/base/applications/calc/lang/ko-KR.rc (with props) trunk/reactos/base/applications/calc/lang/nb-NO.rc (with props) trunk/reactos/base/applications/charmap/lang/nb-NO.rc (with props) trunk/reactos/base/applications/mstsc/lang/nb-NO.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Added: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -1,0 +1,367 @@ +/* + *Korean translation by manatails007(www.manatails007.org) Seungju Kim + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °è»ê±â" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Degrees",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Grads",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °è»ê±â" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °è»ê±â Á¤º¸" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS °è»ê±â",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "¹öÁ¯ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Carlo Bramini¿¡ ÀÇÇØ ¾²¿©Áü",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Statistics box" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ºÙ¿©³Ö±â\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀϹÝ", IDM_VIEW_STANDARD, CHECKED + MENUITEM "°øÇÐ", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Àüȯ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Grads\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_VIEW_GROUP, CHECKED + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç׸ñ", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS °è»ê±â Á¤º¸", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ºÙ¿©³Ö±â\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀϹÝ", IDM_VIEW_STANDARD, CHECKED + MENUITEM "°øÇÐ", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Àüȯ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_VIEW_GROUP, CHECKED + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç׸ñ", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS °è»ê±â Á¤º¸", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ºÙ¿©³Ö±â\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀϹÝ", IDM_VIEW_STANDARD, CHECKED + MENUITEM "°øÇÐ", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Àüȯ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_VIEW_GROUP, CHECKED + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç׸ñ", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "ReactOS °è»ê±â Á¤º¸", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou
can also get a translation of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/translations.html
" + IDS_MATH_ERROR "¿¡·¯" + IDS_QUICKHELP "ºü¸¥ µµ¿ò¸»" +END + Propchange: trunk/reactos/base/applications/calc/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/calc/lang/nb-NO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
============================================================================== --- trunk/reactos/base/applications/calc/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/calc/lang/nb-NO.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -1,0 +1,365 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Kalkulator" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Heks",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Des",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Tegn",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Grader",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radianer",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Gradienter",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Tilbake",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Kalkulator" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Tibake",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Om ReactOS kalkulator" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS kalkulator",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Versjon ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Laget av Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "statistikk boks" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Rediger" + BEGIN + MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vis" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Konvertering", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desimalt\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Oktalt\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binært\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Grader\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radianer\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradienter\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED + END + POPUP "Hjelp" + BEGIN + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om ReactOS kalkulator", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Rediger" + BEGIN + MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vis" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "konvertering", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Oktalt\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binært\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Tegn\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED + END + POPUP "Hjelp" + BEGIN + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Rediger" + BEGIN + MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vis" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "konvertering", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED + END + POPUP "Hjelp" + BEGIN + MENUITEM "Emner i hjelp", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS kalkulator er gratis pogramvare utgitt under GNU GPL lisensen.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu
kan også få en oversettelse av GNU GPL lisensen
here:\r\nhttp://www.gnu.org/licenses/translations.html
" + IDS_MATH_ERROR "Feil" + IDS_QUICKHELP "Rask hjelp" +END + Propchange: trunk/reactos/base/applications/calc/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res…
============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -46,6 +46,8 @@ #include "lang/de-DE.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/ko-KR.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/charmap/lang/nb-NO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
============================================================================== --- trunk/reactos/base/applications/charmap/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/charmap/lang/nb-NO.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -1,0 +1,35 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Tegnkart" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Skrift:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Hjelp", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Kopier følgende tegn:", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + //AUTOCHECKBOX "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Om Tegnkart" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Tegnkart v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "O&m..." +END Propchange: trunk/reactos/base/applications/charmap/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -16,6 +16,7 @@ #include "lang/it-IT.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/applications/mstsc/lang/nb-NO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la…
============================================================================== --- trunk/reactos/base/applications/mstsc/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/nb-NO.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -1,0 +1,63 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Pålogging innstillinger",IDC_STATIC,7,7,228,89 + GROUPBOX "Tilkobling innstillinger",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Skriv inn server adressen",IDC_STATIC,47,24,81,8 + LTEXT "Server:",IDC_STATIC,47,41,25,8 + LTEXT "Brukernavn:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Lagre",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Lagre som...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Åpne...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Lagre nåværende tilkoblingsinnstilling eller åpner lagret tilkobling",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Størrelse på eksternt skrivebord",IDC_STATIC,7,7,228,68 + GROUPBOX "Farger",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Velg størrelsen på det eksterne skrivebordet. Dra glidebryteren helt til høyre for å få fullskjermvisning.",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "OBS: Innstillingen på den eksterne datamaskinen kan overstyre denne innstillingen.",IDC_STATIC,56,143,165,18 + LTEXT "Mindre",IDC_STATIC,35,42,15,8 + LTEXT "Større",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remote Desktop Connection" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Koble til",IDOK,147,245,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "Generelt" + IDS_TAB_DISPLAY "Skjerm" + IDS_256COLORS "256 Farger" + IDS_HIGHCOLOR15 "32,768 Farger (15 bit)" + IDS_HIGHCOLOR16 "65,536 Farger (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Farger (24 bit)" + IDS_PIXEL "%lux%lu Piksler" + IDS_FULLSCREEN "Full skjerm" + IDS_BROWSESERVER "<Bla gjennom etter flere...>" + IDS_HEADERTEXT1 "Eksternt skrivebord" + IDS_HEADERTEXT2 "Koble til" +END Propchange: trunk/reactos/base/applications/mstsc/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs…
============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -22,6 +22,7 @@ #include "lang/it-IT.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-…
============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Jul 9 03:32:45 2008 @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * translation updated by Caemyr - Olaf Siejka (Jan,Mar,Apr 2008) + * translation updated by Caemyr - Olaf Siejka (Jan,Mar,Apr,Jul 2008) * Use ReactOS forum PM or IRC to contact me *
http://www.reactos.org
* IRC:
irc.freenode.net
#reactos-pl; @@ -686,11 +686,11 @@ IDS_LNK_FILE "Skrót" IDS_SYS_FILE "Plik systemowy" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" -END + IDS_OPEN_VERB "Otwórz" + IDS_RUNAS_VERB "Uruchom jako " + IDS_EDIT_VERB "Edytuj" + IDS_FIND_VERB "Wyszukaj" + IDS_PRINT_VERB "Drukuj" + IDS_PLAY_VERB "Odtwórz" + IDS_PREVIEW_VERB "Podgl¹d" +END
16 years, 5 months
1
0
0
0
[fireball] 34382: - Add CLSID_InProcFreeMarshaler
by fireball@svn.reactos.org
Author: fireball Date: Wed Jul 9 03:02:08 2008 New Revision: 34382 URL:
http://svn.reactos.org/svn/reactos?rev=34382&view=rev
Log: - Add CLSID_InProcFreeMarshaler Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=34…
============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Wed Jul 9 03:02:08 2008 @@ -122,3 +122,4 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
16 years, 5 months
1
0
0
0
[jimtabor] 34381: Need shared pointer to user when comparing thread info.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Wed Jul 9 02:23:02 2008 New Revision: 34381 URL:
http://svn.reactos.org/svn/reactos?rev=34381&view=rev
Log: Need shared pointer to user when comparing thread info. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Jul 9 02:23:02 2008 @@ -1300,18 +1300,20 @@ if (!pWnd) return Ret; - ti = pWnd->ti; - + ti = SharedPtrToUser(pWnd->ti); + if ( ti ) { if ( ti == GetW32ThreadInfo() ) { // We are current. + //FIXME("Current!\n"); if ( lpdwProcessId ) *lpdwProcessId = (DWORD)NtCurrentTeb()->Cid.UniqueProcess; Ret = (DWORD)NtCurrentTeb()->Cid.UniqueThread; } else { // Ask kernel for info. + //FIXME("Kernel call!\n"); if ( lpdwProcessId ) *lpdwProcessId = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID); Ret = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_THREAD_ID);
16 years, 5 months
1
0
0
0
[jimtabor] 34380: Cleanup headers for Prop.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Tue Jul 8 23:44:13 2008 New Revision: 34380 URL:
http://svn.reactos.org/svn/reactos?rev=34380&view=rev
Log: Cleanup headers for Prop. Modified: trunk/reactos/dll/win32/user32/windows/prop.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/prop.h trunk/reactos/subsystems/win32/win32k/ntuser/prop.c Modified: trunk/reactos/dll/win32/user32/windows/prop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] Tue Jul 8 23:44:13 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll * FILE: lib/user32/windows/input.c * PURPOSE: Input @@ -33,19 +32,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -typedef struct _PROPLISTITEM -{ - ATOM Atom; - HANDLE Data; -} PROPLISTITEM, *PPROPLISTITEM; - -typedef struct _PROPERTY -{ - LIST_ENTRY PropListEntry; - HANDLE Data; - ATOM Atom; -} PROPERTY, *PPROPERTY; #define ATOM_BUFFER_SIZE 256 Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 8 23:44:13 2008 @@ -359,6 +359,19 @@ #define SRV_EVENT_STATECHANGE 0x0020 #define SRV_EVENT_LOCATIONCHANGE 0x0040 #define SRV_EVENT_CREATE 0x8000 + +typedef struct _PROPLISTITEM +{ + ATOM Atom; + HANDLE Data; +} PROPLISTITEM, *PPROPLISTITEM; + +typedef struct _PROPERTY +{ + LIST_ENTRY PropListEntry; + HANDLE Data; + ATOM Atom; +} PROPERTY, *PPROPERTY; PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/prop.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/prop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/prop.h [iso-8859-1] Tue Jul 8 23:44:13 2008 @@ -1,12 +1,6 @@ #ifndef _WIN32K_PROP_H #define _WIN32K_PROP_H -typedef struct _PROPERTY -{ - LIST_ENTRY PropListEntry; - HANDLE Data; - ATOM Atom; -} PROPERTY, *PPROPERTY; #endif /* _WIN32K_PROP_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] Tue Jul 8 23:44:13 2008 @@ -32,14 +32,6 @@ #define NDEBUG #include <debug.h> -typedef struct _PROPLISTITEM -{ - ATOM Atom; - HANDLE Data; -} -PROPLISTITEM, *PPROPLISTITEM; - - /* STATIC FUNCTIONS **********************************************************/ /* FUNCTIONS *****************************************************************/
16 years, 5 months
1
0
0
0
← Newer
1
...
58
59
60
61
62
63
64
...
77
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Results per page:
10
25
50
100
200