Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[janderwald] 29720: - add joy.cpl and tapiui.dll to bootcd - patch by Cameron Gutman (aicommander[at]gmail[dot]com)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Oct 20 22:56:46 2007 New Revision: 29720 URL: http://svn.reactos.org/svn/reactos?rev=29720&view=rev Log: - add joy.cpl and tapiui.dll to bootcd - patch by Cameron Gutman (aicommander[at]gmail[dot]com) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 20 22:56:46 2007 @@ -115,6 +115,7 @@ dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 dll\cpl\input\input.dll 1 +dll\cpl\joy\joy.cpl 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 @@ -261,6 +262,7 @@ dll\win32\beepmidi\beepmidi.dll 1 dll\win32\shellext\deskadp\deskadp.dll 1 dll\win32\shellext\deskmon\deskmon.dll 1 +dll\win32\tapiui\tapiui.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1

16 years, 12 months

[weiden] 29719: tapiui.dll doesn't have an entry point

by weiden＠svn.reactos.org

Author: weiden Date: Sat Oct 20 22:34:56 2007 New Revision: 29719 URL: http://svn.reactos.org/svn/reactos?rev=29719&view=rev Log: tapiui.dll doesn't have an entry point Removed: trunk/reactos/dll/win32/tapiui/tapiui.c Modified: trunk/reactos/dll/win32/tapiui/tapiui.rbuild Removed: trunk/reactos/dll/win32/tapiui/tapiui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.c?… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.c (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.c (removed) @@ -1,29 +1,0 @@ -/* - * PROJECT: ReactOS Telephone API UI DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/tapiui/tapiui.c - * PURPOSE: Telephone API UI DLL - * COPYRIGHT: Dmitry Chapyshev <lentind(a)yandex.ru> - * - */ - -#include <windows.h> -#include "resource.h" - -static HINSTANCE hDllInstance; - -BOOL WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - hDllInstance = hinstDLL; - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} Modified: trunk/reactos/dll/win32/tapiui/tapiui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rb… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rbuild (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rbuild Sat Oct 20 22:34:56 2007 @@ -1,11 +1,8 @@ -<module name="tapiui" type="win32dll" baseaddress="${BASEADDRESS_TAPIUI}" installbase="system32" installname="tapiui.dll" unicode="true"> +<module name="tapiui" type="win32dll" baseaddress="${BASEADDRESS_TAPIUI}" entrypoint="0" installbase="system32" installname="tapiui.dll" unicode="true"> <include base="tapiui">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> - <library>ntdll</library> - <library>kernel32</library> - <file>tapiui.c</file> <file>tapiui.rc</file> </module>

16 years, 12 months

[fireball] 29718: - Use "windows" module to hold native dlls, which can be legally used in different operating systems (for now, it's mfc42.dll). Put it into reactos\modules\windows directory and "makex bootcd".

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 20 22:09:14 2007 New Revision: 29718 URL: http://svn.reactos.org/svn/reactos?rev=29718&view=rev Log: - Use "windows" module to hold native dlls, which can be legally used in different operating systems (for now, it's mfc42.dll). Put it into reactos\modules\windows directory and "makex bootcd". Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 20 22:09:14 2007 @@ -531,3 +531,6 @@ modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\wallpaper\lake.bmp 4 optional + +; Native libraries +modules\windows\mfc42.dll 1 optional

16 years, 12 months

[greatlrd] 29717: This header are need it for our owm dxg.h, This stuct can not be found in msdn. This struct are documented partly or full in Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw. I am great full to Alex to help figut and fill in the missing parts. Thank you.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Oct 20 22:03:36 2007 New Revision: 29717 URL: http://svn.reactos.org/svn/reactos?rev=29717&view=rev Log: This header are need it for our owm dxg.h, This stuct can not be found in msdn. This struct are documented partly or full in Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw. I am great full to Alex to help figut and fill in the missing parts. Thank you. Added: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (with props) Added: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h (added) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Sat Oct 20 22:03:36 2007 @@ -1,0 +1,125 @@ +// +// Surface Object Flags +// +#define DDPF_ALPHAPIXELS 0x0001 +#define DDPF_ALPHA 0x0002 +#define DDPF_FOURCC 0x0004 +#define DDPF_PALETTEINDEXED4 0x0008 +#define DDPF_PALETTEINDEXEDTO8 0x0010 +#define DDPF_PALETTEINDEXED8 0x0020 +#define DDPF_RGB 0x0040 +#define DDPF_COMPRESSED 0x0080 +#define DDPF_RGBTOYUV 0x0100 +#define DDPF_YUV 0x0200 +#define DDPF_ZBUFFER 0x0400 +#define DDPF_PALETTEINDEXED1 0x0800 +#define DDPF_PALETTEINDEXED2 0x1000 +#define DDPF_ZPIXELS 0x2000 + +// +// Surface Object +// +typedef struct _EDD_SURFACE +{ + // + // GDI Object Header + // + HANDLE hHmgr; + PVOID pEntry; + INT cExcLock; + HANDLE Tid; + + // + // Direct Draw Surface Data + // + DD_SURFACE_LOCAL ddsSurfaceLocal; + DD_SURCFACE_MORE ddsSurfaceMore; + DD_SURFACE_GLOBAL ddsSurfaceGlobal; + DD_SURFACE_INT ddsSurfaceInt; + + // + // Surface pointers + // + struct _EDD_SURFACE *peSurface_DdNext; + struct _EDD_SURFACE *peSurface_LockNext; + + // + // Unknown + // + ULONG field_C0; + + // + // Private Direct Draw Data + // + struct _EDD_DIRECTDRAW_GLOBAL* peDirectDrawGlobal; + struct _EDD_DIRECTDRAW_LOCAL* peDirectDrawLocal; + + // + // Flags + // + FLONG fl; + + // + // Surface Attributes + // + ULONG cLocks; + ULONG iVisRgnUniqueness; + BOOL bLost; + HANDLE hSecure; + HANDLE hdc; + HBITMAP hbmGdi; + + // + // Unknown + // + ULONG field_E8; + + // + // Surface Lock + // + ERECTL rclLock; + ULONG field_FC[2]; +} EDD_SURFACE, *PEDD_SURFACE; + + +typedef struct _EDD_DIRECTDRAW_GLOBAL +{ + PVOID dhpdev; + DWORD dwReserved1; + DWORD dwReserved2; + ULONG unk_000c[3]; + LONG cDriverReferences; + ULONG unk_01c[3]; + LONGLONG llAssertModeTimeout; + DWORD dwNumHeaps; + VIDEOMEMORY *pvmList; + DWORD dwNumFourCC; + PDWORD pdwFourCC; + DD_HHALINFO ddHalInfo; + ULONG unk_1e0[44]; + DD_CALLBACKS ddCallbacks; + DD_SURFACECALLBACKS ddSurfaceCallbacks; + DD_PALETTE_CALLBACKS ddPaletteCallbacks; + ULONG unk_314[48]; + D3DNTHAL_CALLBACKS d3dNtHalCallbacks; + ULONG unk_460[7]; + D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; + ULONG unk_498[18]; + DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; + ULONG unk_4ec[18]; + D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; + ULONG unk_54c[23]; + EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; + EDD_SURFACE* peSurface_LockList; + FLONG fl; + ULONG cSurfaceLocks; + PKEVENT pAssertModeEvent; + EDD_SURFACE *peSurfaceCurrent; + EDD_SURFACE *peSurfacePrimary; + BOOL bSuspended; + ULONG unk_5c8[12]; + RECTL rcbounds; + HDEV hDev; + ULONG unk_60c; +} EDD_DIRECTDRAW_GLOBAL, *PEDD_DIRECTDRAW_GLOBAL; + Propchange: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 12 months

[fireball] 29716: - Remove entrypoint="0" from DLLs which actually need their DllMain to be exported and run. Some of them are Wine-autosynced, so the offer is to alter winesync.cmd to remove "entrypoint="0" from autocreated .rbuild files.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 20 21:38:35 2007 New Revision: 29716 URL: http://svn.reactos.org/svn/reactos?rev=29716&view=rev Log: - Remove entrypoint="0" from DLLs which actually need their DllMain to be exported and run. Some of them are Wine-autosynced, so the offer is to alter winesync.cmd to remove "entrypoint="0" from autocreated .rbuild files. Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/win32/imm32/imm32.rbuild trunk/reactos/dll/win32/mlang/mlang.rbuild trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/dll/win32/usp10/usp10.rbuild Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum.rbuild (original) +++ trunk/reactos/dll/directx/devenum/devenum.rbuild Sat Oct 20 21:38:35 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="devenum" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true"> +<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true">  <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild Sat Oct 20 21:38:35 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dplayx" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true"> +<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true">  <importlibrary definition="dplayx.spec.def" /> <include base="dplayx">.</include> Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.rbuild (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild Sat Oct 20 21:38:35 2007 @@ -1,4 +1,4 @@ -<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true" entrypoint="0"> +<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true"> <importlibrary definition="imm32.spec.def" /> <include base="imm32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.rbui… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.rbuild (original) +++ trunk/reactos/dll/win32/mlang/mlang.rbuild Sat Oct 20 21:38:35 2007 @@ -1,4 +1,4 @@ -<module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true" entrypoint="0"> +<module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="mlang.spec.def" /> <include base="mlang">.</include> Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild Sat Oct 20 21:38:35 2007 @@ -1,4 +1,4 @@ -<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true" entrypoint="0"> +<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true"> <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbui… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (original) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Sat Oct 20 21:38:35 2007 @@ -1,4 +1,4 @@ -<module name="usp10" type="win32dll" entrypoint="0" installbase="system32" installname="usp10.dll" allowwarnings ="true"> +<module name="usp10" type="win32dll" installbase="system32" installname="usp10.dll" allowwarnings ="true"> <importlibrary definition="usp10.spec.def" /> <include base="usp10">.</include> <include base="ReactOS">include/reactos/wine</include>

16 years, 12 months

[greatlrd] 29715: Optimze : the NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateD3DBuffer , with the new optimze method. Add : doxgen tags for how NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateD3DBuffer works Add : a sort code for the DxEngDrv so we getting the driver functions in sorted list in DxDdStartupDxGraphics, this will be part of optimize the dx code in directx it will allow us call function with gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn instead first to search after it. Fix few bugs, a

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Oct 20 21:34:14 2007 New Revision: 29715 URL: http://svn.reactos.org/svn/reactos?rev=29715&view=rev Log: Optimze : the NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateD3DBuffer , with the new optimze method. Add : doxgen tags for how NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateD3DBuffer works Add : a sort code for the DxEngDrv so we getting the driver functions in sorted list in DxDdStartupDxGraphics, this will be part of optimize the dx code in directx it will allow us call function with gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn instead first to search after it. Fix few bugs, as well. rember u can not still build ReactX I have not commit thuse part yet. Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Sat Oct 20 21:34:14 2007 @@ -98,6 +98,9 @@ typedef DWORD (NTAPI *PGD_DXDDUPDATEOVERLAY)(HANDLE, HANDLE, PDD_UPDATEOVERLAYDATA); typedef DWORD (NTAPI *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAYPOSITIONDATA); +/* From eng.c */ +typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG); +typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); /* Standard macro */ #define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sat Oct 20 21:34:14 2007 @@ -16,19 +16,45 @@ #include <w32k.h> #include <debug.h> -/************************************************************************/ -/* NtGdiDdCanCreateD3DBuffer */ -/************************************************************************/ + +/*++ +* @name NtGdiDdCanCreateD3DBuffer +* @implemented +* +* The function NtGdiDdCanCreateD3DBuffer checks if you can create a +* surface for DirectX. It is redirected to dxg.sys. +* +* @param HANDLE hDirectDraw +* The handle we got from NtGdiDdCreateDirectDrawObject +* +* @param PDD_CANCREATESURFACEDATA puCanCreateSurfaceData +* This contains information to check if the driver can create the buffers, +* surfaces, textures and vertexes, and how many of each the driver can create. + +* +* @return +* Depending on if the driver supports this API or not, DDHAL_DRIVER_HANDLED +* or DDHAL_DRIVER_NOTHANDLED is returned. +* To check if the function has been successful, do a full check. +* A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED +* and puCanCreateSurfaceData->ddRVal is set to DD_OK. +* +* @remarks. +* dxg.sys NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface call are redirect to dxg.sys +* inside the dxg.sys they ar redirect to same functions. examine the driver list functions +* table, the memory address you will see they are pointed to same memory address. +* +* Before call to this api please set the puCanCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* +*--*/ + DWORD STDCALL NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, - PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -) -{ - PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCanCreateD3DBuffer, pfnDdCanCreateD3DBuffer); + PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) +{ + PGD_DXDDDESTROYD3DBUFFER pfnDdCanCreateD3DBuffer = gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn; if (pfnDdCanCreateD3DBuffer == NULL) { @@ -40,9 +66,40 @@ return pfnDdCanCreateD3DBuffer(hDirectDraw,puCanCreateSurfaceData); } -/************************************************************************/ -/* NtGdiD3dContextCreate */ -/************************************************************************/ +/*++ +* @name NtGdiD3dContextCreate +* @implemented +* +* The Function NtGdiDdCanCreateD3DBuffer check if you can create a +* surface for directx it redirect the call to dxg.sys. +* +* @param HANDLE hDirectDrawLocal +* The handle we got from NtGdiDdCreateDirectDrawObject +* +* @param HANDLE hSurfColor +* Handle to DD_SURFACE_LOCAL to be use as target rendring +* +* @param HANDLE hSurfZ +* Handle to a DD_SURFACE_LOCAL it is the Z deep buffer, accdoing MSDN if it set to NULL nothing should happen. +* +* @param D3DNTHAL_CONTEXTCREATEDATA* hSurfZ +* the buffer to create the context data +* +* @return +* DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED if the driver support this api. +* Todo full check if we sussess is to check the return value DDHAL_DRIVER_HANDLED +* puCanCreateSurfaceData->ddRVal are set to DD_OK. +* +* +* @remarks. +* dxg.sys NtGdiD3dContextCreate and NtGdiD3dContextCreate call are redirect to +* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they +* are diffent. +* +* Before call to this api please set the hSurfZ->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* +*--*/ BOOL STDCALL NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, @@ -50,15 +107,12 @@ HANDLE hSurfZ, D3DNTHAL_CONTEXTCREATEDATA* pdcci) { - PGD_D3DCONTEXTCREATE pfnD3dContextCreate = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dContextCreate, pfnD3dContextCreate); + PGD_DDCANCREATED3DBUFFER pfnD3dContextCreate = gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn; if (pfnD3dContextCreate == NULL) { DPRINT1("Warring no pfnD3dContextCreate"); - return DDHAL_DRIVER_NOTHANDLED; + return FALSE; } DPRINT1("Calling on dxg.sys D3dContextCreate"); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Oct 20 21:34:14 2007 @@ -26,16 +26,16 @@ NTSTATUS STDCALL DxDdStartupDxGraphics( ULONG ulc1, - PDRVENABLEDATA pDrved1, + PDRVENABLEDATA DxEngDrvOld, ULONG ulc2, - PDRVENABLEDATA pDrved2, - PULONG DDContext, + PDRVENABLEDATA DxgDrvOld, + PULONG DirectDrawContext, PEPROCESS Proc) { - DRVENABLEDATA EngDrv; - DRVENABLEDATA DXG_API; - - NTSTATUS Status = STATUS_DLL_NOT_FOUND; + DRVENABLEDATA DxEngDrv; + DRVENABLEDATA DxgDrv; + + NTSTATUS Status = STATUS_PROCEDURE_NOT_FOUND; /* FIXME setup of gaEngFuncs driver export list * but not in this api, we can add it here tempary until we figout where @@ -51,45 +51,57 @@ if (!ghDxGraphics) { DPRINT1("Warring no dxg.sys in ReactOS"); - return Status; - } - - /* import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */ - gpfnStartupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdStartupDxGraphics"); - gpfnCleanupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdCleanupDxGraphics"); - - if ((gpfnStartupDxGraphics) && - (gpfnCleanupDxGraphics)) - { - /* Setup driver data for activate the dx interface */ - EngDrv.iDriverVersion = DDI_DRIVER_VERSION_NT5_01; - EngDrv.pdrvfn = &gaEngFuncs; - EngDrv.c = gcEngFuncs; - - Status = gpfnStartupDxGraphics ( sizeof(DRVENABLEDATA), - &EngDrv, - sizeof(DRVENABLEDATA), - &DXG_API, - &gdwDirectDrawContext, - Proc ); - } - - /* check if we manger loading the data and execute the dxStartupDxGraphics and it susscess */ - if (!NT_SUCCESS(Status)) - { - gpfnStartupDxGraphics = NULL; - gpfnCleanupDxGraphics = NULL; - EngUnloadImage( ghDxGraphics); - ghDxGraphics = NULL; - DPRINT1("Warring no init of DirectX graphic interface"); + Status = STATUS_DLL_NOT_FOUND; } else { - gpDxFuncs = DXG_API.pdrvfn; - DPRINT1("DirectX interface is Activated"); - } - - /* return the status */ + /* import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */ + gpfnStartupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdStartupDxGraphics"); + gpfnCleanupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdCleanupDxGraphics"); + + if ((gpfnStartupDxGraphics) && + (gpfnCleanupDxGraphics)) + { + /* Setup driver data for activate the dx interface */ + DxEngDrv.iDriverVersion = DDI_DRIVER_VERSION_NT5_01; + DxEngDrv.pdrvfn = &gaEngFuncs; + DxEngDrv.c = gcEngFuncs; + + Status = gpfnStartupDxGraphics ( sizeof(DRVENABLEDATA), + &DxEngDrv, + sizeof(DRVENABLEDATA), + &DxgDrv, + &gdwDirectDrawContext, + Proc ); + } + + /* check if we manger loading the data and execute the dxStartupDxGraphics and it susscess */ + if (!NT_SUCCESS(Status)) + { + gpfnStartupDxGraphics = NULL; + gpfnCleanupDxGraphics = NULL; + EngUnloadImage( ghDxGraphics); + ghDxGraphics = NULL; + DPRINT1("Warring no init of DirectX graphic interface"); + } + else + { + /* Sort the drv functions list in index order, this allown us doing, smaller optimze + * in api that are redirect to dx.sys + */ + + PDRVFN lstDrvFN = DxgDrv.pdrvfn; + INT t; + for (t=0;t<=DXG_INDEX_DxDdIoctl;t++) + { + gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; + gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; + } + DPRINT1("DirectX interface is Activated"); + } + /* return the status */ + } + return Status; } Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Sat Oct 20 21:34:14 2007 @@ -33,7 +33,7 @@ if (pfnHeapVidMemAllocAligned == NULL) { DPRINT1("Warring no pfnHeapVidMemAllocAligned"); - return DDHAL_DRIVER_NOTHANDLED; + return NULL; } DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned"); @@ -56,11 +56,12 @@ if (pfnVidMemFree == NULL) { DPRINT1("Warring no pfnVidMemFree"); - return DDHAL_DRIVER_NOTHANDLED; } - - DPRINT1("Calling on dxg.sys pfnVidMemFree"); - return pfnVidMemFree(pvmh, ptr); + else + { + DPRINT1("Calling on dxg.sys pfnVidMemFree"); + pfnVidMemFree(pvmh, ptr); + } } /************************************************************************/

16 years, 12 months

[fireball] 29714: Dmitry Chapyshev <lentind@yandex.ru> - Fully implement tapiui.dll, compatible with Windows. - Icons come from SUSE's yast2-industrial; 203,202.ico and 301,302.bmp are done by me based on Tango.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 20 21:16:30 2007 New Revision: 29714 URL: http://svn.reactos.org/svn/reactos?rev=29714&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fully implement tapiui.dll, compatible with Windows. - Icons come from SUSE's yast2-industrial; 203,202.ico and 301,302.bmp are done by me based on Tango. Added: trunk/reactos/dll/win32/tapiui/ trunk/reactos/dll/win32/tapiui/lang/ trunk/reactos/dll/win32/tapiui/lang/en-US.rc (with props) trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/tapiui/res/ trunk/reactos/dll/win32/tapiui/res/201.ico (with props) trunk/reactos/dll/win32/tapiui/res/202.ico (with props) trunk/reactos/dll/win32/tapiui/res/203.ico (with props) trunk/reactos/dll/win32/tapiui/res/301.bmp (with props) trunk/reactos/dll/win32/tapiui/res/302.bmp (with props) trunk/reactos/dll/win32/tapiui/res/504.ico (with props) trunk/reactos/dll/win32/tapiui/resource.h (with props) trunk/reactos/dll/win32/tapiui/tapiui.c (with props) trunk/reactos/dll/win32/tapiui/tapiui.rbuild (with props) trunk/reactos/dll/win32/tapiui/tapiui.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=297… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Oct 20 21:16:30 2007 @@ -11,6 +11,7 @@ <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> Added: trunk/reactos/dll/win32/tapiui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/en-US.rc Sat Oct 20 21:16:30 2007 @@ -1,0 +1,446 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +101 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Dialing Rules" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "&Locations:", -1, 7, 35, 210, 8 + LTEXT "The list below displays the locations you have specified. Select the location from which you are dialing.", -1, 35, 12, 210, 16 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "&New...", 1030, 87, 155, 50, 14 + PUSHBUTTON "&Edit...", 1031, 141, 155, 50, 14 + PUSHBUTTON "&Delete", 1032, 195, 155, 50, 14 + LTEXT "Phone number will be dialed as:", 1052, 7, 181, 100, 8 + LTEXT "", 1053, 14, 195, 224, 16 +} + +102 DIALOG 0, 0, 252, 255 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +{ + ICON 202, 2000, 7, 7, 20, 20 + LTEXT "Location &name:", -1, 35, 12, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 9, 149, 14, ES_AUTOHSCROLL + LTEXT "Specify the location from which you will be dialing.", 2001, 7, 35, 238, 8 + LTEXT "Country/&region:", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Area &code:", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "Dialing rules", 2002, 7, 80, 238, 92 + LTEXT "When dialing from this location, use the following rules:", 2003, 14, 92, 224, 8 + LTEXT "To access an outside line for &local calls, dial:", -1, 14, 106, 170, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT "To access an outside line for long-&distance calls, dial:", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "Use this carri&er code to make long-distance calls:", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "Use this carrier code to make &international calls:", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "To disable call &waiting, dial:", 1035, 14, 175, 170, 10 + COMBOBOX 1013, 190, 174, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Dial using:", -1, 14, 193, 40, 8 + AUTORADIOBUTTON "&Tone", 1036, 58, 192, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Pulse", 1037, 112, 192, 50, 10, NOT WS_TABSTOP + LTEXT "Phone number will be dialed as:", 1052, 7, 219, 100, 8 + LTEXT "", 1053, 14, 232, 224, 16 +} + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Area Code Rules" +FONT 8, "MS Shell Dlg" +{ + LTEXT "An area code rule determines how phone numbers are dialed from your current area code to other area codes and within your area code.", 2000, 7, 7, 238, 16 + LTEXT "Area &code rules:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "&New...", 1030, 87, 145, 50, 14 + PUSHBUTTON "&Edit...", 1031, 141, 145, 50, 14 + PUSHBUTTON "&Delete", 1032, 195, 145, 50, 14 + GROUPBOX "Description", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +} + +104 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Calling Card" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Select the calling card you will use, or click New to add a different card.", 2000, 7, 7, 238, 8 + LTEXT "Card &Types:", -1, 7, 23, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "&New...", 1030, 87, 101, 50, 14 + PUSHBUTTON "&Edit...", 1031, 141, 101, 50, 14 + PUSHBUTTON "&Delete", 1032, 195, 101, 50, 14 + LTEXT "A&ccount number:", -1, 7, 127, 91, 8 + EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL + LTEXT "&Personal ID Number (PIN):", -1, 7, 145, 91, 8 + EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL + GROUPBOX "Access phone numbers for", 2001, 7, 158, 238, 53 + LTEXT "Long distance calls:", -1, 14, 172, 84, 8 + LTEXT "", 1042, 102, 172, 136, 8 + LTEXT "International calls:", -1, 14, 184, 84, 8 + LTEXT "", 1043, 102, 184, 136, 8 + LTEXT "Local calls:", -1, 14, 196, 84, 8 + LTEXT "", 1051, 102, 196, 136, 8 +} + +105 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +{ + ICON 203, 2000, 7, 7, 20, 20 + LTEXT "&Calling card name:", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "Account &number:", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "&Personal Identification Number (PIN):", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 79, 116, 14, ES_AUTOHSCROLL + LTEXT "This calling card will be used when:", 1056, 14, 117, 224, 8 + GROUPBOX "Calling card details", 2001, 7, 105, 238, 66 + LTEXT "", 1000, 22, 131, 216, 8 + LTEXT "", 1001, 22, 143, 216, 8 + LTEXT "", 1002, 22, 155, 216, 8 +} + +106 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Long Distance" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Access number for &long distance calls:", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Use the buttons below to enter the dialing steps for making long-distance calls. Enter these steps in the exact order as they appear on your calling card.", 2000, 7, 40, 238, 24 + LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Move &Up", 1022, 195, 83, 50, 14 + PUSHBUTTON "&Move Down", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Delete", 1024, 195, 119, 50, 14 + PUSHBUTTON "Access &Number", 1025, 7, 161, 90, 14 + PUSHBUTTON "A&ccount Number", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 +} + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "International" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Access number for &international calls:", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Use the buttons below to enter the dialing steps for making international calls. Enter these steps in the exact order as they appear on your calling card.", 2000, 7, 40, 244, 24 + LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Move &Up", 1022, 195, 83, 50, 14 + PUSHBUTTON "&Move Down", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Delete", 1024, 195, 119, 50, 14 + PUSHBUTTON "Access &Number", 1025, 7, 161, 90, 14 + PUSHBUTTON "A&ccount Number", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 +} + +108 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Local Calls" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Access number for &local calls:", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Use the buttons below to enter the dialing steps for making local calls. Enter these steps in the exact order as they appear on your calling card. To make local calls without using your calling card, leave this section blank.", 2000, 7, 40, 238, 24 + LTEXT "Calling ca&rd dialing steps:", -1, 7, 72, 238, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Move &Up", 1022, 195, 83, 50, 14 + PUSHBUTTON "&Move Down", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Delete", 1024, 195, 119, 50, 14 + PUSHBUTTON "Access &Number", 1025, 7, 161, 90, 14 + PUSHBUTTON "A&ccount Number", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "D&estination Number...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Wait for Prompt...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specify Digits...", 1021, 101, 197, 90, 14 +} + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "New Area Code Rule" +FONT 8, "MS Shell Dlg" +{ + LTEXT "This area code rule will only apply to calls made to the area code and prefix combination you specify below.", 2000, 7, 7, 238, 16 + LTEXT "Area code you are calling:", -1, 7, 31, 110, 8 + LTEXT "A&rea code:", -1, 7, 45, 36, 8 + EDITTEXT 1034, 46, 42, 50, 14, ES_AUTOHSCROLL + LTEXT "Specify the prefixes to be used for this area code rule.", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "&Include all the prefixes within this area code", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Include &only the prefixes in the list below:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "&Prefixes to include:", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "&Add...", 1005, 95, 128, 50, 14 + PUSHBUTTON "D&elete", 1024, 95, 146, 50, 14 + LTEXT "When dialing phone numbers that contain the prefixes above:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "&Dial:", 1012, 14, 198, 30, 12 + EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "Include the area &code", 1029, 14, 214, 85, 12 + DEFPUSHBUTTON "OK", 1, 141, 236, 50, 14 + PUSHBUTTON "Cancel", 2, 195, 236, 50, 14 + RTEXT "Area code", 2001, 133, 31, 51, 8 + LTEXT "Prefix", 2002, 200, 31, 45, 8 + CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 + CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 + RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 + GROUPBOX "Prefixes", -1, 7, 64, 238, 102 + GROUPBOX "Rules", -1, 7, 170, 238, 60 +} + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1003, 7, 7, 213, 8 + LTEXT "", 1039, 7, 23, 213, 8 + EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 + PUSHBUTTON "Cancel", 2, 170, 61, 50, 14 +} + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Wait for" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Select the type of prompt to wait for before continuing with the dialing sequence.", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "Wait for a &dial tone", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "Wait for a &voice message to complete", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "Wait for a specific length of &time:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + LTEXT "&seconds", -1, 58, 80, 187, 8 + EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 + DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 + PUSHBUTTON "Cancel", 2, 195, 103, 50, 14 +} + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Destination number" +FONT 8, "MS Shell Dlg" +{ + LTEXT "This step will place the destination number that you will be dialing into the calling card sequence. When dialing the destination number, which parts of the number do you want to dial?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "Dial the &country/region code", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "Dial the &area code", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "Dial the &number", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 + PUSHBUTTON "Cancel", 2, 195, 91, 50, 14 +} + +113 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "The following telephony providers are installed on this computer:", -1, 40, 12, 205, 8 + LTEXT "&Providers:", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "A&dd...", 1005, 87, 197, 50, 14 + PUSHBUTTON "&Remove", 1024, 141, 197, 50, 14 + PUSHBUTTON "&Configure...", 1031, 195, 197, 50, 14 +} + +114 DIALOG 20, 15, 252, 127 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Provider" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Select the provider you wish to install from the list below, and click Add.", 2000, 7, 7, 241, 8 + LTEXT "&Telephony providers:", -1, 7, 23, 144, 10 + LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&Add", 1005, 141, 106, 50, 14 + DEFPUSHBUTTON "Cancel", 2, 195, 106, 50, 14 +} + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Location Information" +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "Before you can make any phone or modem connections, Windows needs the following information about your current location.", 2000, 107, 15, 188, 25 + LTEXT "&What country/region are you in now?", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "What area &code (or city code) are you in now?", -1, 107, 73, 189, 10 + EDITTEXT 1034, 107, 87, 40, 12, ES_AUTOHSCROLL + LTEXT "If you need to specify a ca&rrier code, what is it?", -1, 107, 104, 189, 10 + EDITTEXT 1058, 106, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "If you dial a number to access an &outside line, what is it?", -1, 107, 136, 189, 10 + EDITTEXT 1010, 107, 149, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "The phone system at this location uses:", -1, 107, 167, 189, 10 + AUTORADIOBUTTON "&Tone dialing", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Pulse dialing", 1037, 175, 178, 57, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 + PUSHBUTTON "Cancel", 2, 246, 204, 50, 14 +} + +400 DIALOG 0, 0, 290, 151 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 + LTEXT "Before you can make any phone or modem connections, Windows needs the following information about your current location.", 2000, 95, 0, 188, 25 + LTEXT "&What country/region are you in now?", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "What area &code (or city code) are you in now?", -1, 95, 60, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "If you dial a number to access an &outside line, what is it?", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "The phone system at this location uses:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "&Tone dialing", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Pulse dialing", 1037, 155, 139, 55, 12, NOT WS_TABSTOP +} + +500 DIALOG 0, 0, 235, 88 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS Explorer" +FONT 8, "MS Shell Dlg" +{ + ICON 504, 501, 13, 14, 21, 20 + LTEXT "", 502, 47, 15, 180, 32 + AUTOCHECKBOX "&In the future, always trust this page", 503, 47, 47, 147, 12 + DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 + PUSHBUTTON "&Cancel", 506, 164, 65, 50, 14 +} + +STRINGTABLE +{ + 1 "Phone and Modem Options" + 2 "Configure dialing rules and properties for using your modem." + 3 "Location" + 4 "To create a new location, click New." + 5 "New Location" + 6 "Edit Location" + 7 "New Calling Card" + 8 "Edit Calling Card" + 9 "Area Code" + 10 "Prefixes" + 11 "Rule" + 12 "The character you entered is invalid.\n\nValid characters are 0 through 9, *, #, and comma." + 13 "The character you entered is invalid.\n\nValid characters are 0 through 9, *, #, space, and comma." + 14 "The character you entered is invalid.\n\nValid characters are 0 through 9." + 15 "The character you entered is invalid." + 16 "Dial %1" + 17 "Dial %1 plus area code" + 18 "Dial area code" + 19 "Dial number only" + 20 "All" + 21 "Selected" + 22 "Edit Area Code Rule" + 23 "Select a rule in the list above to view its description, or click New to add a rule." + 24 "Dial '%2' plus the area code before the number for all calls within the %1 area code." + 25 "Dial '%2' before the number for all calls within the %1 area code." + 26 "Dial the area code before the number for all calls within the %1 area code." + 27 "Dial only the number for all calls within the %1 area code." + 28 "Dial '%2' plus the area code before the number for calls within the %1 area code, containing the prefixes you specified." + 29 "Dial '%2' before the number for calls within the %1 area code, containing the prefixes you specified." + 30 "Dial the area code before the number for calls within the %1 area code, containing the prefixes you specified." + 31 "Dial only the number for calls within the %1 area code, containing the prefixes you specified." + 32 "Dial a '1' before calls within all other area codes, and include the area code for all prefixes." + 33 "Add Prefix" + 34 "Enter one or more prefixes separated by spaces or commas." + 35 "Specify Digits" + 36 "Enter one or more digits (including * and #) to be dialed." + 37 "You tried to enter an invalid character.\n\nValid characters are 0 thru 9 and space." + 38 "Wait for %1!d! seconds." + 39 "Dial the access number." + 40 "Dial the account number." + 41 "Dial the PIN number." + 42 "Wait for a dial tone." + 43 "Wait for a voice message to end." + 44 "Dial the country/region code, area code, and number." + 45 "Dial the country/region code and number." + 46 "Dial the area code and number." + 47 "Dial the country/region code." + 48 "Dial the area code." + 49 "Dial the number." + 50 "dialing long distance calls." + 51 "dialing international calls." + 52 "dialing local calls." + 53 "There are no rules defined for how this calling card should be used." + 54 "You must enter the long distance carrier code for this location." + 55 "You must enter a name for this location." + 56 "You must enter the area code for this location." + 57 "You must select the number to dial to disable call waiting." + 58 "You must select the country or region that you are calling from." + 59 "Missing Information" + 60 "The location name you have entered is already in use. Please enter a unique name." + 61 "This calling card is missing some required information. To use this card, click Edit to provide more information, or select a different card." + 62 "You must select a default calling card. Select a card from the list, or click New to create a new card." + 63 "You must enter the calling card name." + 64 "You must enter the account number." + 65 "You must enter the PIN number." + 66 "There are no rules defined for this calling card. To create a rule, select the Long Distance, International, or Local Calls tab." + 67 "Your long distance rule requires your calling card's long distance access number." + 68 "Your international rule requires your calling card's international access number." + 69 "Your local rule requires your calling card's local access number." + 70 "None" + 71 "Are you sure you want to remove the selected Telephony Service Provider?" + 72 "<no service provider is installed>" + 73 "You must enter the prefixes for which this rule applies." + 74 "&Digits:" + 75 "&Prefixes:" + 76 "You tried to enter an invalid character.\n\nValid characters are 0 thru 9, space, and comma." + 77 "Confirm Delete" + 78 "Are you sure you want to delete this location?" + 79 "Are you sure you want to delete this calling card?" + 80 "Are you sure you want to delete this area code rule?" + 81 "You must enter the digits to dial." + 82 "The calling card name you have entered is already in use. Please enter a unique name." + 83 "Windows needs telephone information about the location from which you will be dialing. If you cancel without providing this information, this program may not function correctly when dialing. In addition, some applications respond to your canceling this dialog box by immediately re-posting it.\nAre you sure you want to cancel?" + 84 "Confirm Cancel" + 85 "My Location" + 86 "<no service providers are available for installation>" + 87 "The character you entered is invalid.\n\nValid characters are 0 through 9, A through D, *, #, +, !, space, and comma." + 88 "You must enter the international carrier code for this location." + 89 "You must enter the carrier code for this location." + 90 "This page is attempting to make or monitor telephone calls or other multimedia connections on your computer.\nDo you want allow it to continue?" + 91 "This page is attempting to access directory information on your network.\nDo you want to allow it to continue?" + 92 "This page is attempting to access or change network conferencing information.\nDo you want to allow it to continue?" + 93 "This page is attempting to access or change registry information.\nDo you want to allow it to continue?" + 1064 "Phone And Modem control panel can not be opened. You may have a problem starting telephony service." + 1065 "Remove Provider" + 15800 "23" + 15801 "0,\"None (Direct Dial)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" + 15802 "1,\"AT&T Direct Dial via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" + 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" + 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" + 15805 "4,\"MCI Direct Dial via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" + 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" + 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" + 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" + 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" + 15810 "9,\"US Sprint Direct Dial via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" + 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" + 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" + 15813 "12,\"Calling Card via 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" + 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" + 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" + 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" + 15817 "16,\"CLEAR Communications (New Zealand)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" + 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" + 15819 "18,\"Global Card (Taiwan to USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" + 15820 "19,\"Telstra (Australia) via 1818 (voice)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" + 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" +} Propchange: trunk/reactos/dll/win32/tapiui/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc Sat Oct 20 21:16:30 2007 @@ -1,0 +1,446 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +101 DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Íàáîð íîìåðà" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "&Ðàçìåùåíèå:", -1, 7, 43, 210, 8 + LTEXT "Â ñïèñêå ñîäåðæàòñÿ óêàçàííûå ìåñòîïîëîæåíèÿ. Âûáåðèòå ìåñòî, èç êîòîðîãî ïðîèçâîäèòñÿ íàáîð íîìåðà.", -1, 35, 12, 210, 24 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 54, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñîçäàòü...", 1030, 87, 163, 50, 14 + PUSHBUTTON "&Èçìåíèòü...", 1031, 141, 163, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1032, 195, 163, 50, 14 + LTEXT "Íîìåð òåëåôîíà áóäåò íàáðàí êàê:", 1052, 7, 189, 121, 8 + LTEXT "", 1053, 14, 203, 224, 16 +} + +102 DIALOG 0, 0, 252, 255 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +{ + ICON 202, 2000, 7, 7, 21, 20 + LTEXT "&Èìÿ ìåñòîïîëîæåíèÿ:", -1, 35, 12, 79, 8, SS_CENTERIMAGE + EDITTEXT 1038, 118, 9, 127, 14, ES_AUTOHSCROLL + LTEXT "Âûáåðèòå ìåñòî, èç êîòîðîãî ïðîèçâîäèòñÿ íàáîð íîìåðà.", 2001, 7, 35, 238, 8 + LTEXT "&Ñòðàíà èëè ðåãèîí:", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Êîä &ãîðîäà:", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "Ïðàâèëà", 2002, 7, 80, 238, 92 + LTEXT "Ïðè íàáîðå íîìåðà èç ýòîãî ìåñòà:", 2003, 14, 92, 224, 8 + LTEXT " - äëÿ äîñòóïà &ê âíåøíåé ìåñòíîé ëèíèè, íàáèðàòü:", -1, 14, 106, 174, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT " - à äëÿ äîñòóïà ê âíåøíåé ìå&æäóíàðîäíîé ëèíèè:", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "Ä&ëÿ ìåæäóãîðîäíûõ çâîíêîâ èñïîëüçîâàòü êîä:", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "Äë&ÿ ìåæäóíàðîäíûõ çâîíêîâ èñïîëüçîâàòü êîä:", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "Êîä îòêë&þ÷åíèÿ ðåæèìà îïîâåùåíèÿ:", 1035, 14, 175, 170, 10 + COMBOBOX 1013, 190, 174, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Òèï íàáîðà íîìåðà:", -1, 14, 193, 70, 8 + AUTORADIOBUTTON "&òîíîâûé", 1036, 123, 192, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "èì&ïóëüñíûé", 1037, 177, 192, 54, 10, NOT WS_TABSTOP + LTEXT "Íîìåð òåëåôîíà áóäåò íàáðàí êàê:", 1052, 7, 219, 126, 8 + LTEXT "", 1053, 14, 232, 224, 16 +} + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Êîä ãîðîäà" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ïðàâèëî íàáîðà íîìåðà îïðåäåëÿåò ñïîñîá íàáîðà íîìåðîâ ñ òàêèì æå èëè äðóãèì êîäîì ãîðîäà.", 2000, 7, 7, 238, 16 + LTEXT "&Ïðàâèëà íàáîðà íîìåðà:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñîçäàòü...", 1030, 87, 145, 50, 14 + PUSHBUTTON "&Èçìåíèòü...", 1031, 141, 145, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1032, 195, 145, 50, 14 + GROUPBOX "Îïèñàíèå", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +} + +104 DIALOGEX 0, 0, 252, 234 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Òåëåôîííàÿ êàðòî÷êà" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Âûáåðèòå èñïîëüçóåìóþ òåëåôîííóþ êàðòî÷êó èëè íàæìèòå êíîïêó ""Ñîçäàòü"" äëÿ äîáàâëåíèÿ äðóãîé êàðòî÷êè.", 2000, 7, 7, 238, 8 + LTEXT "&Òèïû êàðòî÷åê:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 42, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñîçäàòü...", 1030, 87, 109, 50, 14 + PUSHBUTTON "&Èçìåíèòü...", 1031, 141, 109, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1032, 195, 109, 50, 14 + LTEXT "Ó÷åòíûé &íîìåð:", -1, 7, 135, 91, 8 + EDITTEXT 1018, 102, 133, 143, 12, ES_AUTOHSCROLL + LTEXT "&Ëè÷íûé PIN-êîä:", -1, 7, 153, 91, 8 + EDITTEXT 1019, 102, 151, 143, 12, ES_AUTOHSCROLL + GROUPBOX "Íàáèðàåìûå íîìåðà äëÿ", 2001, 7, 166, 238, 53 + LTEXT "ìåæäóãîðîäíûõ çâîíêîâ:", -1, 14, 180, 87, 8 + LTEXT "", 1042, 106, 180, 132, 8 + LTEXT "ìåæäóíàðîäíûõ çâîíêîâ:", -1, 14, 192, 88, 8 + LTEXT "", 1043, 106, 192, 132, 8 + LTEXT "ìåñòíûõ çâîíêîâ:", -1, 14, 204, 84, 8 + LTEXT "", 1051, 106, 204, 132, 8 +} + +105 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +{ + ICON 203, 2000, 7, 7, 21, 20 + LTEXT "&Èìÿ êàðòî÷êè:", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "Ó÷åòíûé &íîìåð:", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "&Ëè÷íûé PIN-êîä:", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 79, 116, 14, ES_AUTOHSCROLL + LTEXT "Ýòà êàðòî÷êà áóäåò èñïîëüçîâàòüñÿ ïðè:", 1056, 14, 117, 224, 8 + GROUPBOX "Èñïîëüçîâàòü êàðòî÷êè", 2001, 7, 105, 238, 66 + LTEXT "", 1000, 22, 131, 216, 8 + LTEXT "", 1001, 22, 143, 216, 8 + LTEXT "", 1002, 22, 155, 216, 8 +} + +106 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ìåæäóãîðîäíûå çâîíêè" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Íîìåð äëÿ âûõîäà íà ìåæäóãîðîäíóþ ëèíèþ:", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåæäóãîðîäíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå.", 2000, 7, 40, 238, 24 + LTEXT "&Øàãè íàáîðà íîìåðà ïðè èñïîëüçîâàíèè êàðòî÷êè:", -1, 7, 72, 174, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&âåðõ", 1022, 195, 83, 50, 14 + PUSHBUTTON "Âíè&ç", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1024, 195, 119, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïà", 1025, 7, 161, 90, 14 + PUSHBUTTON "Ó&÷åòíûé íîìåð", 1018, 101, 161, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 179, 90, 14 + PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 179, 90, 14 + PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 197, 90, 14 +} + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ìåæäóíàðîäíàÿ ñâÿçü" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Íîìåð äëÿ âûõîäà íà ìåæäóíàðîäíóþ ëèíèþ:", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåæäóíàðîäíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå.", 2000, 7, 40, 244, 24 + LTEXT "&Øàãè íàáîðà íîìåðà ïðè èñïîëüçîâàíèè êàðòî÷êè:", -1, 7, 72, 174, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&âåðõ", 1022, 195, 83, 50, 14 + PUSHBUTTON "Âíè&ç", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1024, 195, 119, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïà", 1025, 7, 161, 90, 14 + PUSHBUTTON "Ó&÷åòíûé íîìåð", 1018, 101, 161, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 179, 90, 14 + PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 179, 90, 14 + PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 197, 90, 14 +} + +108 DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ìåñòíûå çâîíêè" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Íîìåð äëÿ âûõîäà íà âíåøíþþ ëèíèþ:", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 132, 14, ES_AUTOHSCROLL + LTEXT "Óêàæèòå ïîñëåäîâàòåëüíîñòü âûõîäà íà ìåñòíóþ ëèíèþ. Ïîñëåäîâàòåëüíîñòü øàãîâ äîëæíà ñîâïàäàòü ñ ïðèâåäåííîé íà êàðòî÷êå. Äëÿ âûïîëíåíèÿ çâîíêîâ áåç èñïîëüçîâàíèÿ òåëåôîííîé êàðòî÷êè îñòàâüòå ïîëÿ ïóñòûìè.", 2000, 7, 40, 238, 32 + LTEXT "&Øàãè íàáîðà íîìåðà ïðè èñïîëüçîâàíèè êàðòî÷êè:", -1, 7, 80, 238, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 91, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&âåðõ", 1022, 195, 91, 50, 14 + PUSHBUTTON "Âíè&ç", 1023, 195, 109, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1024, 195, 127, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïà", 1025, 7, 169, 90, 14 + PUSHBUTTON "Ó&÷åòíûé íîìåð", 1018, 101, 169, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 187, 90, 14 + PUSHBUTTON "Â&ûçûâàåìûé íîìåð...", 1020, 101, 187, 90, 14 + PUSHBUTTON "Î&æèäàíèå...", 1017, 7, 205, 90, 14 + PUSHBUTTON "Ââ&åäèòå öèôðû...", 1021, 101, 205, 90, 14 +} + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Íîâîå ïðàâèëî íàáîðà íîìåðà" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ýòî ïðàâèëî áóäåò ïðèìåíÿòüñÿ òîëüêî ê çâîíêàì ñ óêàçàííûìè êîäîì ãîðîäà è ïðåôèêñîì.", 2000, 7, 7, 238, 16 + LTEXT "Èñïîëüçóåìûé êîä ãîðîäà:", -1, 7, 31, 122, 8 + LTEXT "Êîä &ãîðîäà:", -1, 7, 45, 41, 8 + EDITTEXT 1034, 50, 42, 50, 14, ES_AUTOHSCROLL + LTEXT "Ïðåôèêñû, èñïîëüçóåìûå ñ ýòèì êîäîì ãîðîäà.", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "&Âêëþ÷èòü âñå ïðåôèêñû â êîä ãîðîäà", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Â&êëþñ÷èòü òîëüêî ïðåôèêû èç ñïèñêà:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "Âê&ëþ÷àåìûå ïðåôèêñû:", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äîáàâèòü...", 1005, 95, 128, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1024, 95, 146, 50, 14 + LTEXT "Ïðè íàáîðå íîìåðîâ, ñîäåðæàùèõ óêàçàííûå ïðåôèêñû:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "Í&àáðàòü:", 1012, 14, 198, 46, 10 + EDITTEXT 1007, 62, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "Íà&áðàòü êîä ãîðîäà", 1029, 14, 214, 85, 12 + DEFPUSHBUTTON "OK", 1, 141, 236, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 195, 236, 50, 14 + RTEXT "Êîä ãîðîäà", 2001, 133, 31, 51, 8 + LTEXT "Ïðåôèêñ", 2002, 200, 31, 45, 8 + CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 + CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 + RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 + GROUPBOX "Ïðåôèêñû", -1, 7, 64, 238, 102 + GROUPBOX "Ïðàâèëà", -1, 7, 170, 238, 60 +} + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1003, 7, 7, 213, 8 + LTEXT "", 1039, 7, 23, 213, 8 + EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 170, 61, 50, 14 +} + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Îæèäàíèå" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Âûáåðèòå òèï îæèäàåìîãî ñèãíàëà ïåðåä ïðîäîëæåíèåì íàáîðà íîìåðà.", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "Æäàòü &ãóäêà", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "Æäàòü &çàâåðøåíèÿ ãîëîñîâîãî ñîîáùåíèÿ", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "Æäàòü &â òå÷åíèå:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + LTEXT "&ñåê.", -1, 58, 80, 187, 8 + EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 + DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 195, 103, 50, 14 +} + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Âûçûâàåìûé íîìåð" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Íà ýòîì øàãå òðåáóåòñÿ óêàçàòü ñïîñîá íàáîðà íîìåðà ïðè èñïîëüçîâàíèè òåëåôîííîé êàðòî÷êè. Íàáîð êàêèõ ÷àñòåé íîìåðà òðåáóåòñÿ ïðîèçâîäèòü?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "Íàáðàòü êîä &ñòðàíû/ðåãèîíà", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "Íàáðàòü êîä &ãîðîäà", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "Íàáðàòü &íîìåð", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 195, 91, 50, 14 +} + +113 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "Íà êîìïüþòåðå óñòàíîâëåíû ñëåäóþùèå ñëóæáû äîñòóïà ê òåëåôîíèè:", -1, 40, 12, 205, 16 + LTEXT "Ñ&ëóæáû äîñòóïà:", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "Äî&áàâèòü...", 1005, 87, 197, 50, 14 + PUSHBUTTON "&Óäàëèòü", 1024, 141, 197, 50, 14 + PUSHBUTTON "&Íàñòðîèòü...", 1031, 195, 197, 50, 14 +} + +114 DIALOG 20, 15, 252, 135 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêà ñëóæáû äîñòóïà" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Âûáåðèòå óñòàíàâëèâàåìóþ ñëóæáó äîñòóïà èç ñïèñêà è íàæìèòå êíîïêó ""Äîáàâèòü"".", 2000, 7, 7, 241, 16 + LTEXT "Ñ&ëóæáû äîñòóïà ê òåëåôîíèè:", -1, 7, 31, 155, 10 + LISTBOX 1055, 7, 42, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&Äîáàâèòü", 1005, 141, 114, 50, 14 + DEFPUSHBUTTON "Îòìåíà", 2, 195, 114, 50, 14 +} + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Ñâåäåíèÿ î ìåñòîíàõîæäåíèè" +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "Ïåðåä ñîçäàíèåì òåëåôîííîãî èëè ìîäåìíîãî ïîäêëþ÷åíèÿ òðåáóåòñÿ ââåñòè ñâåäåíèÿ î âàøåì òåêóùåì íàõîæäåíèè.", 2000, 107, 15, 188, 25 + LTEXT "&Ñòðàíà, ãäå âû ñåé÷àñ íàõîäèòåñü:", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Òåëåôîííûé êîä &ãîðîäà", -1, 107, 73, 189, 10 + EDITTEXT 1034, 107, 87, 40, 12, ES_AUTOHSCROLL + LTEXT "Êîä âûõîäà íà ëèíèþ ïîñòà&âùèêà óñëóã:", -1, 107, 104, 189, 10 + EDITTEXT 1058, 106, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Êîä âûõîäà íà ãîðîäêóþ ëèíèþ (äëÿ îôèñíûõ ÀÒÑ):", -1, 107, 136, 189, 10 + EDITTEXT 1010, 107, 149, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Òèï íàáîðà íîìåðà:", -1, 107, 167, 189, 10 + AUTORADIOBUTTON "&òîíîâûé íàáîð", 1036, 107, 178, 73, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&èìïóëüñíûé íàáîð", 1037, 192, 178, 80, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 + PUSHBUTTON "Îòìåíà", 2, 246, 204, 50, 14 +} + +400 DIALOG 0, 0, 290, 151 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 + LTEXT "Ïåðåä ñîçäàíèåì òåëåôîííîãî èëè ìîäåìíîãî ïîäêëþ÷åíèÿ òðåáóåòñÿ ââåñòè ñâåäåíèÿ â âàøåì òåêóùåì íàõîæäåíèè.", 2000, 95, 0, 188, 25 + LTEXT "&Ñòðàíà, ãäå âû ñåé÷àñ íàõîäèòåñü:", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Òåëåôîííûé êîä &ãîðîäà:", -1, 95, 60, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "&Êîä âûõîäà íà ãîðîäñêóþ ëèíèþ (äëÿ îôèñíûõ ÀÒÑ):", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Òèï íàáîðà íîìåðà:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "&òîíîâûé íàáîð", 1036, 95, 139, 67, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&èìïóëüñíûé íàáîð", 1037, 167, 139, 79, 12, NOT WS_TABSTOP +} + +500 DIALOG 0, 0, 235, 88 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îáîçðåâàòåëü ReactOS" +FONT 8, "MS Shell Dlg" +{ + ICON 504, 501, 13, 14, 21, 20 + LTEXT "", 502, 47, 15, 180, 32 + AUTOCHECKBOX "&Âñåãäà äîâåðÿòü ñîäåðæèìîìó ýòîé ñòðàíèöû", 503, 47, 47, 180, 12 + DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 + PUSHBUTTON "&Îòìåíà", 506, 164, 65, 50, 14 +} + +STRINGTABLE +{ + 1 "Òåëåôîí è ìîäåì" + 2 "Íàñòðîéêà ïðàâèë íàáîðà íîìåðà è èíûõ ïàðàìåòðîâ ïðè ðàáîòå ñ ìîäåìîì." + 3 "Ðàçìåùåíèå" + 4 "Äëÿ ñîçäàíèÿ íîâîãî ðàçìåùåíèÿ íàæìèòå êíîïêó ""Ñîçäàòü""." + 5 "Íîâîå ìåñòî" + 6 "Èçìåíåíèå ìåñòîíàõîæäåíèÿ" + 7 "Íîâàÿ êàðòî÷êà" + 8 "Èçìåíèòü òåëåôîííóþ êàðòî÷êó" + 9 "Êîä ãîðîäà" + 10 "Ïðåôèêñû" + 11 "Ïðàâèëî" + 12 "Ââåäåí íåäîïóñòèìûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9, *, # è çàïÿòàÿ." + 13 "Ââåäåí íåäîïóñòèìûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9, *, #, ïðîáåë è çàïÿòàÿ." + 14 "Ââåäåí íåäîïóñòèìûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9." + 15 "Ââåäåí íåäîïóñòèìûé ñèìâîë." + 16 "Íàáðàòü %1" + 17 "Íàáðàòü %1 è êîä ãîðîäà" + 18 "Íàáðàòü êîä ãîðîäà" + 19 "Íàáðàòü òîëüêî íîìåð" + 20 "Âñå" + 21 "Âûáðàííûé" + 22 "Èçìåíåíèå ïðàâèëà íàáîðà íîìåðà" + 23 "Âûáåðèòå ýëåìåíò ñïèñêà äëÿ ïðîñìîòðà åãî îïèñàíèÿ èëè íàæìèòå êíîïêó ""Ñîçäàòü"" äëÿ äîáàâëåíèÿ íîâîãî." + 24 "Íàáðàòü '%2' è êîä ãîðîäà ïåðåä íîìåðîì äëÿ âñåõ íîìåðîâ ñ êîäîì ãîðîäà %1." + 25 "Íàáðàòü '%2' ïåðåä íîìåðîì äëÿ âñåõ íîìåðîâ ñ êîäîì ãîðîäà %1." + 26 "Íàáðàòü êîä ãîðîäà ïåðåä íîìåðîì äëÿ âñåõ íîìåðîâ ñ êîäîì ãîðîäà %1." + 27 "Íàáðàòü òîëüêî íîìåð òåëåôîíà äëÿ âñåõ íîìåðîâ ñ êîäîì ãîðîäà %1." + 28 "Íàáðàòü '%2' è êîä ãîðîäà ïåðåä íîìåðîì äëÿ íîìåðîâ ñ êîäîì ãîðîäà %1, ñîäåðæàùèõ óêàçàííûå ïðåôèêñû." + 29 "Íàáðàòü '%2' ïåðåä íîìåðîì äëÿ íîìåðîâ ñ êîäîì ãîðîäà %1, ñîäåðæàùèõ óêàçàííûå ïðåôèêñû." + 30 "Íàáðàòü êîä ãîðîäà ïåðåä íîìåðîì äëÿ íîìåðîâ ñ êîäîì ãîðîäà %1, ñîäåðæàùèõ óêàçàííûå ïðåôèêñû." + 31 "Íàáðàòü òîëüêî íîìåð òåëåôîíà äëÿ íîìåðîâ ñ êîäîì ãîðîäà %1, ñîäåðæàùèõ óêàçàííûå ïðåôèêñû." + 32 "Íàáðàòü '1' ïåðåä íàáîðîì íîìåðà äëÿ âñåõ êîäîâ ãîðîäîâ, âêëþ÷àÿ êîä ãîðîäà äëÿ âñåõ ïðåôèêñîâ." + 33 "Äîáàâèòü ïðåôèêñ" + 34 "Ââåäèòå îäèí èëè íåñêîëüêî ïðåôèêñîâ ðàçäåëåííûõ ïðîáåëàìè èëè çàïÿòûìè." + 35 "Ââåäèòå öèôðû" + 36 "Ââåäèòå îäíó èëè íåñêîëüêî öèôð (à òàêæå * è #) êîòîðûå äîëæíû áûòü íàáðàíû." + 37 "Ââåäåí íåïðàâèëüíûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9 è ïðîáåë." + 38 "Îæèäàíèå %1!d! ñåê." + 39 "Íàáîð íîìåðà äîñòóïà." + 40 "Íàáîð íîìåðà ó÷åòíîé çàïèñè." + 41 "Íàáðàòü PIN-êîä." + 42 "Æäàòü ãóäêà." + 43 "Îæèäàíèå îêîí÷àíèÿ ãîëîñîâîãî ñîîáùåíèÿ." + 44 "Íàáðàòü êîä ñòðàíû/ðåãèîíà, êîä ãîðîäà è íîìåð." + 45 "Íàáðàòü êîä ñòðàíû/ðåãèîíà è íîìåð." + 46 "Íàáðàòü êîä ãîðîäà è íîìåð." + 47 "Íàáðàòü êîä ñòðàíû/ðåãèîíà." + 48 "Íàáðàòü êîä ãîðîäà." + 49 "Íàáîð íîìåðà." + 50 "íàáîðå ìåæäóãîðîäíûõ íîìåðîâ." + 51 "íàáîðå ìåæäóíàðîäíûõ íîìåðîâ." + 52 "íàáîðå ìåñòíûõ íîìåðîâ." + 53 "Ïðàâèëà íàáîðà íîìåðà äëÿ ýòîé êàðòî÷êè íå îïðåäåëåíû." + 54 "Íåîáõîäèìî ââåñòè êîä íîñèòåëÿ äëÿ ìåæäóãîðîäíûõ çâîíêîâ äëÿ ýòîãî ðàçìåùåíèÿ." + 55 "Íåîáõîäèìî ââåñòè èìÿ äëÿ ýòîãî ðàçìåùåíèÿ." + 56 "Íåîáõîäèìî ââåñòè êîä ãîðîäà äëÿ ýòîãî ðàçìåùåíèÿ." + 57 "Äëÿ îòêëþ÷åíèÿ ðåæèìà îïîâåùåíèÿ òðåáóåòñÿ ââåñòè íîìåð." + 58 "Íåîáõîäèìî âûáðàòü ñòðàíó èëè ðåãèîí èç êîòîðîãî ïðîèçâîäèòñÿ âûçîâ." + 59 "Ñâåäåíèÿ îòñóòñòâóþò" + 60 "Ââåäåííîå èìÿ ðàçìåùåíèÿ óæå èñïîëüçóåòñÿ. Ââåäèòå äðóãîå èìÿ." + 61 "Îòñóòñòâóþò íåîáõîäèìûå ñâåäåíèÿ äëÿ èñïîëüçîâàíèÿ ýòîé òåëåôîííîé êàðòî÷êè. Íàæìèòå êíîïêó ""Èçìåíèòü"" è óêàæèòå îòñóòñòâóþùèå ñâåäåíèÿ èëè âûáåðèòå äðóãóþ êàðòî÷êó." + 62 "Òðåáóåòñÿ óêàçàòü êàðòî÷êó, èñïîëüçóåìóþ ïî óìîë÷àíèþ. Âûáåðèòå êàðòî÷êó èç ñïèñêà èëè íàæìèòå êíîïêó ""Ñîçäàòü"" äëÿ äîáàâëåíèÿ íîâîé êàðòî÷êè." + 63 "Íåîáõîäèìî ââåñòè èìÿ òåëåôîííîé êàðòî÷êè." + 64 "Íåîáõîäèìî ââåñòè ó÷åòíûé íîìåð." + 65 "Íåîáõîäèìî ââåñòè PIN-êîä." + 66 "Ïðàâèëà íàáîðà íîìåðà äëÿ ýòîé êàðòî÷êè íå îïðåäåëåíû. Äëÿ ñîçäàíèÿ ïðàâèëà âûáåðèòå âêëàäêó ""Ìåæäóãîðîäíûé"", ""Ìåæäóíàðîäíûé"" èëè ""Ìåñòíûé""." + 67 "Ïðàâèëî äëÿ ìåæäóãîðîäíîãî çâîíêà òðåáóåò óêàçàíèÿ íîìåðà äîñòóïà." + 68 "Ïðàâèëî äëÿ ìåæäóíàðîäíîãî çâîíêà òðåáóåò óêàçàíèÿ íîìåðà äîñòóïà." + 69 "Ïðàâèëî äëÿ ìåñòíîãî çâîíêà òðåáóåò óêàçàíèÿ íîìåðà äîñòóïà." + 70 "Íåò" + 71 "Óäàëèòü âûáðàííîãî ïîñòàâùèêà óñëóã òåëåôîííîé ñëóæáû?" + 72 "<íåò óñòàíîâëåííûõ ïîñòàâùèêîâ óñëóã>" + 73 "Íåîáõîäèìî ââåñòè ïðåôèêñû, äëÿ êîòîðûõ ïðèìåíèìî ýòî ïðàâèëî." + 74 "&Öèôðû:" + 75 "&Ïðåôèêñû:" + 76 "Ââåäåí íåïðàâèëüíûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9, ïðîáåë è çàïÿòàÿ." + 77 "Ïîäòâåðæäåíèå óäàëåíèÿ" + 78 "Ïîäòâåðæäàåòå óäàëåíèå ýòîãî ðàçìåùåíèÿ?" + 79 "Ïîäòâåðæäàåòå óäàëåíèå ýòîé êàðòî÷êè?" + 80 "Ïîäòâåðæäàåòå óäàëåíèå ýòîãî ïðàâèëà?" + 81 "Íåîáõîäèìî ââåñòè íàáèðàåìûå öèôðû." + 82 "Ââåäåííîå èìÿ êàðòî÷êè óæå èñïîëüçóåòñÿ. Ââåäèòå äðóãîå èìÿ." + 83 "Òðåáóåòñÿ óêàçàíèå ñâåäåíèé î ìåñòîíàõîæäåíèè, îòêóäà ïðîèçâîäèòñÿ âûçîâ. Åñëè íå óêàçàòü ýòè ñâåäåíèÿ, äàííàÿ ïðîãðàììà ìîæåò íåïðàâèëüíî íàáèðàòü íîìåð. Êðîìå òîãî, íåêîòîðûå ïðèëîæåíèÿ îòâå÷àþò íà îòìåíó ââîäà äàííûõ ïîâòîðíîé èõ îòïðàâêîé.\nÎòìåíèòü ââîä äàííûõ?" + 84 "Ïîäòâåðæäåíèå îòìåíû" + 85 "Ìîå ðàçìåùåíèå" + 86 "<îòñóòñòâóþò ïîñòàâùèêè ñëóæá äîñòóïà äëÿ óñòàíîâêè>" + 87 "Ââåäåí íåäîïóñòèìûé ñèìâîë.\n\nÄîïóñòèìûìè ñèìâîëàìè ÿâëÿþòñÿ öèôðû îò 0 äî 9, áóêâû îò A äî D, *, #, +, !, ïðîáåë è çàïÿòàÿ." + 88 "Íåîáõîäèìî ââåñòè êîä íîñèòåëÿ äëÿ ìåæäóíàðîäíûõ çâîíêîâ äëÿ ýòîãî ðàçìåùåíèÿ." + 89 "Íåîáõîäèìî ââåñòè êîä íîñèòåëÿ äëÿ ýòîãî ðàçìåùåíèÿ." + 90 "Ñ ýòîé ñòðàíèöû ïðîèçâåäåíà ïîïûòêà ïðîèçâåñòè âûçîâ èëè íàáëþäàòü çà âûçîâàìè, ïðîèçâîäèìûìè íà ýòîì êîìïüþòåðå.\nÏðîäîëæèòü âûïîëíåíèå?" + 91 "Ñ ýòîé ñòðàíèöû ïðîèçâåäåíà ïîïûòêà ïîëó÷èòü äîñòóï ê èíôîðìàöèè êàòàëîãà ñåòè.\nÏðîäîëæèòü âûïîëíåíèå?" + 92 "Ñ ýòîé ñòðàíèöû ïðîèçâåäåíà ïîïûòêà ïîëó÷èòü äîñòóï èëè èçìåíèòü èíôîðìàöèþ î ñåòåâûõ êîíôåðåíöèÿõ.\nÏðîäîëæèòü âûïîëíåíèå?" + 93 "Ñ ýòîé ñòðàíèöû ïðîèçâåäåíà ïîïûòêà ïîëó÷èòü äîñòóï èëè èçìåíèòü èíôîðìàöèþ â ðååñòðå.\nÐàçðåøèòü è ïðîäîëæèòü âûïîëíåíèå?" + 1064 "Íå óäàëîñü îòêðûòü ïàíåëü óïðàâëåíèÿ òåëåôîíîì è ìîäåìîì. Âîçìîæíû ïðîáëåìû ñ çàïóñêîì ïðèëîæåíèÿ." + 1065 "Óäàëåííûé ïîñòàâùèê" + 15800 "23" + 15801 "0,\"Íå èñïîëüçóåòñÿ\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" + 15802 "1,\"Ïðÿìîé êàíàë AT&T ÷åðåç 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" + 15803 "2,\"AT&T ÷åðåç 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" + 15804 "3,\"AT&T ÷åðåç 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" + 15805 "4,\"Ïðÿìîé êàíàë MCI ÷åðåç 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" + 15806 "5,\"MCI ÷åðåç 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" + 15807 "6,\"MCI ÷åðåç 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" + 15808 "7,\"MCI ÷åðåç 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" + 15809 "8,\"MCI ÷åðåç 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" + 15810 "9,\"Ïðÿìîé êàíàë US Sprint ÷åðåç 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" + 15811 "10,\"US Sprint ÷åðåç 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" + 15812 "11,\"US Sprint ÷åðåç 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" + 15813 "12,\"Òåëåôîííàÿ êàðòî÷êà ÷åðåç 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" + 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" + 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" + 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" + 15817 "16,\"CLEAR Communications (Íîâàÿ Çåëàíäèÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" + 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" + 15819 "18,\"Global Card (Òàéâàíü - ÑØÀ)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" + 15820 "19,\"Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ãîëîñîì)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15821 "20,\"Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ôàêñ)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15822 "21,\"Optus (Àâñòðàëèÿ) ÷åðåç 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" + 15823 "22,\"Optus (Àâñòðàëèÿ) ÷åðåç 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" +} Propchange: trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/tapiui/res/201.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/201.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/201.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/res/202.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/202.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/202.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/res/203.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/203.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/203.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/res/301.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/301.b… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/301.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/res/302.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/302.b… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/302.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/res/504.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/res/504.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/tapiui/res/504.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/tapiui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/resource.… ============================================================================== --- trunk/reactos/dll/win32/tapiui/resource.h (added) +++ trunk/reactos/dll/win32/tapiui/resource.h Sat Oct 20 21:16:30 2007 @@ -1,0 +1,12 @@ +#ifndef __NETID_RESOURCE_H +#define __NETID_RESOURCE_H + +#define IDI_PHONE 201 +#define IDI_LOCATION 202 +#define IDI_CARD 203 +#define IDI_SEC 504 + +#define IDB_RADIO 301 +#define IDB_WIZARD 302 + +#endif /* __NETID_RESOURCE_H */ Propchange: trunk/reactos/dll/win32/tapiui/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/tapiui/tapiui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.c?… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.c (added) +++ trunk/reactos/dll/win32/tapiui/tapiui.c Sat Oct 20 21:16:30 2007 @@ -1,0 +1,29 @@ +/* + * PROJECT: ReactOS Telephone API UI DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/tapiui/tapiui.c + * PURPOSE: Telephone API UI DLL + * COPYRIGHT: Dmitry Chapyshev <lentind(a)yandex.ru> + * + */ + +#include <windows.h> +#include "resource.h" + +static HINSTANCE hDllInstance; + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/tapiui/tapiui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/tapiui/tapiui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rb… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rbuild (added) +++ trunk/reactos/dll/win32/tapiui/tapiui.rbuild Sat Oct 20 21:16:30 2007 @@ -1,0 +1,11 @@ +<module name="tapiui" type="win32dll" baseaddress="${BASEADDRESS_TAPIUI}" installbase="system32" installname="tapiui.dll" unicode="true"> + <include base="tapiui">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <file>tapiui.c</file> + <file>tapiui.rc</file> +</module> Propchange: trunk/reactos/dll/win32/tapiui/tapiui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rc (added) +++ trunk/reactos/dll/win32/tapiui/tapiui.rc Sat Oct 20 21:16:30 2007 @@ -1,0 +1,20 @@ +#include <windows.h> +#include <reactos/resource.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Telephone API UI DLL\0" +#define REACTOS_STR_INTERNAL_NAME "tapiui\0" +#define REACTOS_STR_ORIGINAL_FILENAME "tapiui.dll\0" +#include <reactos/version.rc> + +IDI_PHONE ICON "res/201.ico" +IDI_LOCATION ICON "res/202.ico" +IDI_CARD ICON "res/203.ico" +IDI_SEC ICON "res/504.ico" + +IDB_RADIO BITMAP "res/301.bmp" +IDB_WIZARD BITMAP "res/302.bmp" + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Propchange: trunk/reactos/dll/win32/tapiui/tapiui.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sat Oct 20 21:16:30 2007 @@ -253,6 +253,9 @@ <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory> +<directory name="tapiui"> + <xi:include href="tapiui/tapiui.rbuild" /> +</directory> <directory name="twain_32"> <xi:include href="twain_32/twain_32.rbuild" /> </directory>

16 years, 12 months

[ekohl] 29713: Make it UNICODE-safe.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 20 19:03:15 2007 New Revision: 29713 URL: http://svn.reactos.org/svn/reactos?rev=29713&view=rev Log: Make it UNICODE-safe. Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/misc.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sat Oct 20 19:03:15 2007 @@ -72,20 +72,20 @@ { LCID Lcid; TCHAR Lang[1024]; - int Index; + INT Index; - Lcid = wcstoul(lpLanguage, NULL, 16); + Lcid = _tcstoul(lpLanguage, NULL, 16); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); - Index = (int) SendMessage(hLanguageList, - CB_ADDSTRING, - 0, - (LPARAM)Lang); + Index = (INT)SendMessage(hLanguageList, + CB_ADDSTRING, + 0, + (LPARAM)Lang); SendMessage(hLanguageList, - CB_SETITEMDATA, - Index, - (LPARAM)Lcid); + CB_SETITEMDATA, + Index, + (LPARAM)Lcid); return TRUE; } @@ -96,13 +96,14 @@ CreateLanguagesList(HWND hWnd) { TCHAR LangSel[256]; + hLanguageList = hWnd; EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); LoadString(hApplet, IDS_SELECTED_LANGUAGE, LangSel, - sizeof(LangSel) / sizeof(TCHAR)); + 256); SendMessage(hLanguageList, CB_SELECTSTRING, @@ -119,7 +120,7 @@ LoadString(hApplet, IDS_SELECTED_LAYOUT, Layout, - sizeof(Layout) / sizeof(TCHAR)); + 256); SendMessage(hWnd, CB_SELECTSTRING, (WPARAM) -1, Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 20 19:03:15 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes"> <importlibrary definition="input.def" /> <include base="input">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Sat Oct 20 19:03:15 2007 @@ -21,6 +21,4 @@ IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" IDI_INFO_ICO ICON "resources/information.ico" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/input/misc.c (original) +++ trunk/reactos/dll/cpl/input/misc.c Sat Oct 20 19:03:15 2007 @@ -43,7 +43,7 @@ CreateKeyboardLayoutList(HWND hWnd) { TCHAR Layout[256]; - int Index; + INT Index; UINT loIndex; for (loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++) @@ -51,12 +51,12 @@ LoadString(hApplet, loIndex, Layout, - sizeof(Layout) / sizeof(TCHAR)); + 256); - if (strlen((char*)Layout) > 0) + if (_tcslen(Layout) > 0) { Index = (int) SendMessage(hWnd, - CB_INSERTSTRING, + CB_ADDSTRING, 0, (LPARAM)Layout); Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sat Oct 20 19:03:15 2007 @@ -46,10 +46,14 @@ CreateDefaultLangList(HWND hWnd) { HKEY hKey; - char szPreload[BUFSIZE],szCount[BUFSIZE],Lang[BUFSIZE]; - DWORD dwBufLen = BUFSIZE, dwBufCLen = BUFSIZE, cValues; + TCHAR szPreload[BUFSIZE]; + TCHAR szCount[BUFSIZE]; + TCHAR Lang[BUFSIZE]; + DWORD dwBufLen; + DWORD dwBufCLen; + DWORD cValues; LONG lRet; - int Count; + INT Count; LCID Lcid; if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) @@ -63,13 +67,17 @@ { for (Count = 0; Count < cValues; Count++) { - szCount[0] = '\0'; + szCount[0] = TEXT('\0'); + + dwBufCLen = BUFSIZE; lRet = RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); - sprintf(szCount,"%d",Count + 1); + _stprintf(szCount,TEXT("%d"),Count + 1); + + dwBufLen = BUFSIZE; RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); - Lcid = wcstoul((LPTSTR)szPreload, NULL, 16); + Lcid = _tcstoul(szPreload, NULL, 16); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); SendMessage(hWnd,

16 years, 12 months

[dreimer] 29712: Readd chdefdir due to popular Demand :-)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 20 18:50:27 2007 New Revision: 29712 URL: http://svn.reactos.org/svn/reactos?rev=29712&view=rev Log: Readd chdefdir due to popular Demand :-) Added: trunk/tools/RosBE-Windows/Root/chdefdir.cmd (contents, props changed) - copied, changed from r27861, trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sat Oct 20 18:50:27 2007 @@ -27,6 +27,8 @@ echo. echo scut - Define, Remove, Switch and Default to Shortcutted echo Source-Directories. + echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one + echo Session. echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. echo clean [logs] - Fully clean the ReactOS source directory and/or @@ -64,6 +66,15 @@ echo Fully clean the ReactOS source directory. echo. echo logs - Removes all build logs in the RosBE-Logs directory. + goto :EOF +) +if "%1" == "chdefdir" ( + echo Usage: chdefdir [OPTIONS] + echo Reconfigures the Default Source Folder for one Session. Exiting + echo sets RosBE back to the Default. + echo. + echo default - Sets back to the Default Source Folder without a restart + echo of RosBE. goto :EOF ) if "%1" == "help" ( Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sat Oct 20 18:50:27 2007 @@ -8,3 +8,4 @@ SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $* +CHDEFDIR = "%_ROSBE_BASEDIR%\chdefdir.cmd" $* Copied: trunk/tools/RosBE-Windows/Root/chdefdir.cmd (from r27861, trunk/tools/RosBE-Windows/Root/chdefdir.cmd) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Sat Oct 20 18:50:27 2007 @@ -1,40 +1,40 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory -:: FILE: Root/chdefdir.cmd -:: PURPOSE: Tool to change the Default Work Dir in RosBE. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -title Change the Default Dir... - -if /I "%1"=="" ( - goto :DEF -) -if /I "%1"=="default" ( - set _ROSSOURCEDIR=%_ROSSRCDIRBCK% -) else ( - set _ROSSOURCEDIR=%1 -) -goto :END - -:DEF - -echo in a Path to use RosBE in or "default" to revert to Default Dir: -SET /P XY= - -if /I "%XY%"=="" ( - goto :END -) -if /I "%XY%"=="default" ( - set _ROSSOURCEDIR=%_ROSSRCDIRBCK% -) else ( - set _ROSSOURCEDIR=%XY% -) -goto :END - -:END -title ReactOS Build Environment %_VER% -cd "%_ROSSOURCEDIR%" +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/chdefdir.cmd +:: PURPOSE: Tool to change the Default Work Dir in RosBE. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title Change the Default Dir... + +if /I "%1"=="" ( + goto :DEF +) +if /I "%1"=="default" ( + set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% +) else ( + set _ROSBE_ROSSOURCEDIR=%1 +) +goto :END + +:DEF + +echo Type in a Path to use RosBE in or "default" to revert to Default Dir: +SET /P XY= + +if /I "%XY%"=="" ( + goto :END +) +if /I "%XY%"=="default" ( + set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% +) else ( + set _ROSBE_ROSSOURCEDIR=%XY% +) +goto :END + +:END +title ReactOS Build Environment %_VER% +cd /D "%_ROSBE_ROSSOURCEDIR%" Propchange: trunk/tools/RosBE-Windows/Root/chdefdir.cmd ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 12 months

[dreimer] 29711: Small modification to guarantee that it runs the way it should on ALL PCs, not only mine.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 20 18:26:48 2007 New Revision: 29711 URL: http://svn.reactos.org/svn/reactos?rev=29711&view=rev Log: Small modification to guarantee that it runs the way it should on ALL PCs, not only mine. Modified: trunk/tools/RosBE-Windows/Root/options.cmd Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Sat Oct 20 18:26:48 2007 @@ -11,4 +11,6 @@ title Options "%_ROSBE_BASEDIR%\options.exe" +ECHO Press any Button to reset RosBE with the new Settings. +pause "%_ROSBE_BASEDIR%\RosBE.cmd"

16 years, 12 months

← Newer
1
...
29
30
31
32
33
34
35
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007