Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 18337: Restart the device after its installation
by hpoussin＠svn.reactos.com 08 Oct '05

08 Oct '05

Restart the device after its installation Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-08 15:20:13 UTC (rev 18336) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-08 15:52:14 UTC (rev 18337) @@ -24,22 +24,14 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" +#include <windows.h> #include "setupapi.h" #include "wine/debug.h" #include "wine/unicode.h" #include "cfgmgr32.h" #include "initguid.h" -#include "winioctl.h" -#include "rpc.h" -#include "rpcdce.h" +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include "setupapi_private.h" @@ -4790,15 +4782,18 @@ goto cleanup; } - /* Load the driver/call AddDevice */ - FIXME("FIXME: Load the driver/call AddDevice\n"); + /* Start the device */ + if (!RebootRequired && !(Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) + { + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + NTSTATUS Status; + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, DevInfo->DeviceName); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + ret = NT_SUCCESS(Status); + } + else + ret = TRUE; - /* Send IRP_MN_START_DEVICE if needed */ - //if (!RebootRequired && !(Flags & (DI_NEEDRESTART | DI_NEEDREBOOT | DI_DONOTCALLCONFIGMG))) - FIXME("FIXME: Send IRP_MN_START_DEVICE\n"); - - ret = TRUE; - cleanup: /* End of installation */ if (hClassKey != INVALID_HANDLE_VALUE)

1 0

[hpoussin] 18336: Update section names
by hpoussin＠svn.reactos.com 08 Oct '05

08 Oct '05

Update section names Add a upper filter serenum for serial ports Modified: trunk/reactos/media/inf/mouse.inf Modified: trunk/reactos/media/inf/ports.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-10-08 14:47:25 UTC (rev 18335) +++ trunk/reactos/media/inf/mouse.inf 2005-10-08 15:20:13 UTC (rev 18336) @@ -9,7 +9,7 @@ Class = Mouse ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/19/1999,5.00.2157.1 +DriverVer = 10/08/2005,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -61,7 +61,7 @@ ;----------------------------- SERIAL DRIVER ---------------------------- [Serial_Inst.NT] -CopyFiles = Serial_CopyFiles, Mouclass_CopyFiles +CopyFiles = Serial_CopyFiles.NT, Mouclass_CopyFiles.NT [Serial_CopyFiles.NT] sermouse.sys @@ -80,7 +80,7 @@ ;------------------------------ PS/2 DRIVER ----------------------------- [PS2_Inst.NT] -CopyFiles = PS2_CopyFiles, Mouclass_CopyFiles +CopyFiles = PS2_CopyFiles.NT, Mouclass_CopyFiles.NT AddReg = PS2_AddReg [PS2_CopyFiles.NT] @@ -105,7 +105,7 @@ ;---------------------------- HID MOUSE DRIVER -------------------------- [HID_Inst.NT] -CopyFiles = HID_CopyFiles, Mouclass_CopyFiles +CopyFiles = HID_CopyFiles.NT, Mouclass_CopyFiles.NT [HID_CopyFiles] mouhid.sys _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-10-08 14:47:25 UTC (rev 18335) +++ trunk/reactos/media/inf/ports.inf 2005-10-08 15:20:13 UTC (rev 18336) @@ -9,7 +9,7 @@ Class = Ports ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/19/1999,5.00.2157.1 +DriverVer = 10/08/2005,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -38,6 +38,12 @@ serial.sys serenum.sys +[ComPort_Inst.NT.HW] +AddReg = ComPort_AddReg.NT + +[ComPort_AddReg.NT] +HKR, , "UpperFilters", 0x00010000, "serenum" + [ComPort_Inst.NT.Services] AddService = serial, 0x00000002, serial_Service_Inst AddService = serenum, , serenum_Service_Inst

1 0

[hpoussin] 18335: NtPlugPlayControl: Implement PlugPlayControlResetDevice case
by hpoussin＠svn.reactos.com 08 Oct '05

08 Oct '05

NtPlugPlayControl: Implement PlugPlayControlResetDevice case Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-10-08 13:57:36 UTC (rev 18334) +++ trunk/reactos/include/ndk/cmtypes.h 2005-10-08 14:47:25 UTC (rev 18335) @@ -65,7 +65,8 @@ PlugPlayControlProperty = 0x0A, PlugPlayControlGetRelatedDevice = 0x0C, PlugPlayControlDeviceStatus = 0x0E, - PlugPlayControlGetDeviceDepth + PlugPlayControlGetDeviceDepth, + PlugPlayControlResetDevice = 0x14 } PLUGPLAY_CONTROL_CLASS; typedef enum _PLUGPLAY_BUS_CLASS @@ -362,12 +363,18 @@ } PLUGPLAY_CONTROL_STATUS_DATA, *PPLUGPLAY_CONTROL_STATUS_DATA; /* Class 0x0F */ -typedef struct _PLUGPLAY_CONTOL_DEPTH_DATA +typedef struct _PLUGPLAY_CONTROL_DEPTH_DATA { UNICODE_STRING DeviceInstance; ULONG Depth; } PLUGPLAY_CONTROL_DEPTH_DATA, *PPLUGPLAY_CONTROL_DEPTH_DATA; +/* Class 0x14 */ +typedef struct _PLUGPLAY_CONTROL_RESET_DEVICE_DATA +{ + UNICODE_STRING DeviceInstance; +} PLUGPLAY_CONTROL_RESET_DEVICE_DATA, *PPLUGPLAY_CONTROL_RESET_DEVICE_DATA; + typedef struct _PLUGPLAY_BUS_TYPE { PLUGPLAY_BUS_CLASS BusClass; _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-10-08 13:57:36 UTC (rev 18334) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-10-08 14:47:25 UTC (rev 18335) @@ -304,6 +304,22 @@ PUNICODE_STRING RegistryPath); +/* pnpmgr.c */ + +PDEVICE_NODE +FASTCALL +IopGetDeviceNode(PDEVICE_OBJECT DeviceObject); + +NTSTATUS +IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, + PVOID Context); + +NTSTATUS +IopActionInitChildServices(PDEVICE_NODE DeviceNode, + PVOID Context, + BOOLEAN BootDrivers); + + /* pnproot.c */ NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-08 13:57:36 UTC (rev 18334) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-08 14:47:25 UTC (rev 18335) @@ -562,7 +562,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; + DeviceNode = IopGetDeviceNode(DeviceObject); DepthData->Depth = DeviceNode->Level; @@ -572,6 +572,38 @@ } +static NTSTATUS +IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_NODE DeviceNode; + NTSTATUS Status; + + DPRINT("IopResetDevice() called\n"); + DPRINT("Device name: %wZ\n", &ResetDeviceData->DeviceInstance); + + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&ResetDeviceData->DeviceInstance); + if (DeviceObject == NULL) + return STATUS_NO_SUCH_DEVICE; + + DeviceNode = IopGetDeviceNode(DeviceObject); + + /* FIXME: we should stop the device, before starting it again */ + + /* Start the device */ + IopDeviceNodeClearFlag(DeviceNode, DNF_DISABLED); + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent, FALSE); + + ObDereferenceObject(DeviceObject); + + return Status; +} + + /* * NtPlugPlayControl * @@ -698,6 +730,11 @@ return STATUS_INVALID_PARAMETER; return IopGetDeviceDepth((PPLUGPLAY_CONTROL_DEPTH_DATA)Buffer); + case PlugPlayControlResetDevice: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)) + return STATUS_INVALID_PARAMETER; + return IopResetDevice((PPLUGPLAY_CONTROL_RESET_DEVICE_DATA)Buffer); + default: return STATUS_NOT_IMPLEMENTED; }

1 0

[greatlrd] 18334: prepare for dsound add MAXWAVEDRIVERS and remove #ifdef _WINESRC_from WAVE_DIRECTSOUND
by greatlrd＠svn.reactos.com 08 Oct '05

08 Oct '05

prepare for dsound add MAXWAVEDRIVERS and remove #ifdef _WINESRC_from WAVE_DIRECTSOUND Modified: trunk/reactos/w32api/include/mmddk.h _____ Modified: trunk/reactos/w32api/include/mmddk.h --- trunk/reactos/w32api/include/mmddk.h 2005-10-08 13:45:19 UTC (rev 18333) +++ trunk/reactos/w32api/include/mmddk.h 2005-10-08 13:57:36 UTC (rev 18334) @@ -29,6 +29,9 @@ #include <mmsystem.h> #include <winbase.h> +/* Maxium drivers */ +#define MAXWAVEDRIVERS 10 + #define MAX_MIDIINDRV (16) /* For now I'm making 16 the maximum number of midi devices one can * have. This should be more than enough for everybody. But as a purist, @@ -459,10 +462,10 @@ void WINAPI mmTaskYield(void); HANDLE WINAPI mmGetCurrentTask(void); -#ifdef __WINESRC__ + #define WAVE_DIRECTSOUND 0x0080 -#endif + #include <poppack.h> #endif /* __MMDDK_H */

1 0

[gvg] 18333: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Aric Stewart <aric(a)codeweavers.com> - Add the GUID for Patch files so that they can be opened as well. Looks like the database structure is pretty much the same. - Implement MsiReinstallFeature. - Be sure to null terminate the string in MsiGetProductInfoA after the W->A conversion using MsiGetProductInfoW if there is space. - Added stub implementations for MsiEnumPatchesA/W. Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .dbg.c files. - Use a more portable scheme for storing the name of a critical section. - Get rid of a couple of non-portable long long constants. - Fixed memory leak introduced in previous change. - Avoid non-portable va_list manipulations. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Jan Van Buggenhout <Chipzz(a)ULYSSIS.Org> - implement stubs for MsiSequence[AW]. Dmitry Timoshkov <dmitry(a)codeweavers.com> - COLOR_3DFACE is a better choice for the dialog background. - Fix the usage of COLOR_xxx constants in the place of the window's class hbrBackground. Mike McCormack <mike(a)codeweavers.com> - Stub implementation of the RemoveIniValues action. - Fix various memory leaks. - Simplify the ProcessComponents action a little. - Make build_icon_path return the path directly. - Implement MsiSequenceA/W. - Simplify the InstallValidate action a little. - Added memory allocation inline functions (part 2). - Fix a bug in a previous patch spotted by Dieter Komendera. - Convert progids to a standard list. - convert verbs into a standard list - remove limitation of 100 verbs - use pointers to verbs rather than indexes - Rename load_dynamic_property and remove its unused 3rd argument. - Create a macro to write a value to a subkey. - Use the new msi_reg_set* macros where possible. - Create a macro function to write registry values. - fix a bug introduced by the progid list conversion - make a fixme a little less alarmist - Add objects to lists at the right time. - Fix some simple memory leaks. - Fix an error introduced when converting dialog lists to standard lists. - Added memory allocation inline functions (part 1). - Make sure not to free a a pointer that has been modified. Check that the text identifier doesn't contain invalid characters. - Don't quote numbers in a query, as it doesn't parse correctly. - Read the MaskEdit template from the correct db field. - Don't create MSI handles unless we have to pass one through the API. - Convert the list of dialog controls to a standard list. - Deformat all dialog text strings before using them. - Load riched20.dll on demand, and unload it after it's used (based on a patch by Rob Shearman). - Make sure to release the package we grabbed on the error path. - Fix and test MsiViewGetColumnInfo and binary fields. - Skip dash characters in the PIDMask for a MaskedEdit control. - Don't refcount tables. - Fix an uninitialized variable problem. - Fix memory leaks in the table code. - Fix memory leaks. - Remove some unused values in the object header. - Fill out the stubs for MsiApplyTransformA/W a bit more. - Fix various query related memory leaks. - Make sure to set the minimum size before allocating string table memory. - Don't include the terminating nul in the length in MsiSummaryInfoGetPropertyW. - fix MsiSummaryInfoGetProperty to return ERROR_MORE_DATA if the buffer is too small (based on a patch by Aric Stewart) - add a test case to show correct behaviour - Create a function to determine the table's row size and use it. Fix a memory leak in the table code. - Eliminate fixed length buffers from the MSIFEATURE structure. - Fix more fixed length buffers. - Reduce the indent level of a function. - Allocate memory rather than using fixed length buffers. - Remove an unnecessary level of indent. - Keep temporary files in a seperate list. - Rename ACTION_DoTopLevelINSTALL to MSI_InstallPackage, remove its duplicate 4th parameter. Split the code to copy a package into a separate function. - Avoid fixed length buffers for conditions. - Fix a memory leak. - Create a function to read a property as an integer. - Make some fixme messages less alarmist. - Fix if's that are followed by semicolons. - Add some more action stubs, remove forward declarations. - Eliminate yet more fixed length buffers. - Convert RunningActions array into a list. - Split command line parsing from MSI_InstallPackage into a separate function. - Move a fixed size buffer to the heap. - Fix memory leaks in custom actions. - Make a macro function for unimplemented actions. Add some more unimplemented action stubs. - Make load_string_table return the string table. - Stub implementation of the IsolateComponents action. - Convert the list of tables to a standard list. - Add a stub implementation of the BindImage action. - Avoid UpdateWindow, it causes trouble with WS_EX_TRANSPARENT. - Stub implementation of the PatchFiles action. - Fix another memory leak. - Add the progress control. - Stub implementation of the MoveFiles action. - Avoid using static variables in the InstallFiles action. - Take advantage of the msi_get_deformatted_field function to simplify some code. - Improve a fixme message a little. - Skip the first character of a font identifier if it's \ or &. - Make sure not to access invalid components or features. - Fix the handling of MsiGetTargetPath args (with test case). - Fix the handling of MsiDoAction args (with test case). - Fixes for MsiGetSourcePath parameter handling. - Load a table's column information separately from the table itself. - Handle copying of the install package to a temporary file in one place only. - Implement MsiGetShortcutTargetA. - Fix the stub for MsiConfigureFeature. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> - Added Finnish resources. Modified: trunk/reactos/lib/msi/action.c Modified: trunk/reactos/lib/msi/action.h Modified: trunk/reactos/lib/msi/appsearch.c Modified: trunk/reactos/lib/msi/classes.c Modified: trunk/reactos/lib/msi/cond.tab.c Modified: trunk/reactos/lib/msi/cond.tab.h Modified: trunk/reactos/lib/msi/cond.y Modified: trunk/reactos/lib/msi/create.c Modified: trunk/reactos/lib/msi/custom.c Modified: trunk/reactos/lib/msi/database.c Modified: trunk/reactos/lib/msi/delete.c Modified: trunk/reactos/lib/msi/dialog.c Modified: trunk/reactos/lib/msi/distinct.c Modified: trunk/reactos/lib/msi/events.c Modified: trunk/reactos/lib/msi/files.c Modified: trunk/reactos/lib/msi/format.c Modified: trunk/reactos/lib/msi/handle.c Modified: trunk/reactos/lib/msi/helpers.c Modified: trunk/reactos/lib/msi/insert.c Modified: trunk/reactos/lib/msi/install.c Modified: trunk/reactos/lib/msi/msi.c Modified: trunk/reactos/lib/msi/msi.rc Modified: trunk/reactos/lib/msi/msi.spec Added: trunk/reactos/lib/msi/msi_Bg.rc Modified: trunk/reactos/lib/msi/msi_En.rc Added: trunk/reactos/lib/msi/msi_Fi.rc Added: trunk/reactos/lib/msi/msi_No.rc Modified: trunk/reactos/lib/msi/msi_Ru.rc Modified: trunk/reactos/lib/msi/msipriv.h Modified: trunk/reactos/lib/msi/msiquery.c Modified: trunk/reactos/lib/msi/order.c Modified: trunk/reactos/lib/msi/package.c Modified: trunk/reactos/lib/msi/preview.c Modified: trunk/reactos/lib/msi/record.c Modified: trunk/reactos/lib/msi/registry.c Modified: trunk/reactos/lib/msi/select.c Modified: trunk/reactos/lib/msi/source.c Modified: trunk/reactos/lib/msi/sql.tab.c Modified: trunk/reactos/lib/msi/sql.tab.h Modified: trunk/reactos/lib/msi/sql.y Modified: trunk/reactos/lib/msi/string.c Modified: trunk/reactos/lib/msi/suminfo.c Modified: trunk/reactos/lib/msi/table.c Modified: trunk/reactos/lib/msi/update.c Modified: trunk/reactos/lib/msi/upgrade.c Modified: trunk/reactos/lib/msi/version.rc Modified: trunk/reactos/lib/msi/where.c Modified: trunk/reactos/w32api/include/msiquery.h _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2005-10-08 13:34:21 UTC (rev 18332) +++ trunk/reactos/lib/msi/action.c 2005-10-08 13:45:19 UTC (rev 18333) @@ -55,36 +55,6 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI); -/* - * action handlers - */ -typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); - -static UINT ACTION_LaunchConditions(MSIPACKAGE *package); -static UINT ACTION_CostInitialize(MSIPACKAGE *package); -static UINT ACTION_CreateFolders(MSIPACKAGE *package); -static UINT ACTION_CostFinalize(MSIPACKAGE *package); -static UINT ACTION_FileCost(MSIPACKAGE *package); -static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package); -static UINT ACTION_InstallInitialize(MSIPACKAGE *package); -static UINT ACTION_InstallValidate(MSIPACKAGE *package); -static UINT ACTION_ProcessComponents(MSIPACKAGE *package); -static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package); -static UINT ACTION_RegisterUser(MSIPACKAGE *package); -static UINT ACTION_CreateShortcuts(MSIPACKAGE *package); -static UINT ACTION_PublishProduct(MSIPACKAGE *package); -static UINT ACTION_WriteIniValues(MSIPACKAGE *package); -static UINT ACTION_SelfRegModules(MSIPACKAGE *package); -static UINT ACTION_PublishFeatures(MSIPACKAGE *package); -static UINT ACTION_RegisterProduct(MSIPACKAGE *package); -static UINT ACTION_InstallExecute(MSIPACKAGE *package); -static UINT ACTION_InstallFinalize(MSIPACKAGE *package); -static UINT ACTION_ForceReboot(MSIPACKAGE *package); -static UINT ACTION_ResolveSource(MSIPACKAGE *package); -static UINT ACTION_ExecuteAction(MSIPACKAGE *package); -static UINT ACTION_RegisterFonts(MSIPACKAGE *package); -static UINT ACTION_PublishComponents(MSIPACKAGE *package); - /* * consts and values used */ @@ -262,89 +232,15 @@ {'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t', 'S','t','r','i','n','g','s',0}; +/* action handlers */ +typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); + struct _actions { LPCWSTR action; STANDARDACTIONHANDLER handler; }; -static struct _actions StandardActions[] = { - { szAllocateRegistrySpace, NULL}, - { szAppSearch, ACTION_AppSearch }, - { szBindImage, NULL}, - { szCCPSearch, NULL}, - { szCostFinalize, ACTION_CostFinalize }, - { szCostInitialize, ACTION_CostInitialize }, - { szCreateFolders, ACTION_CreateFolders }, - { szCreateShortcuts, ACTION_CreateShortcuts }, - { szDeleteServices, NULL}, - { szDisableRollback, NULL}, - { szDuplicateFiles, ACTION_DuplicateFiles }, - { szExecuteAction, ACTION_ExecuteAction }, - { szFileCost, ACTION_FileCost }, - { szFindRelatedProducts, ACTION_FindRelatedProducts }, - { szForceReboot, ACTION_ForceReboot }, - { szInstallAdminPackage, NULL}, - { szInstallExecute, ACTION_InstallExecute }, - { szInstallExecuteAgain, ACTION_InstallExecute }, - { szInstallFiles, ACTION_InstallFiles}, - { szInstallFinalize, ACTION_InstallFinalize }, - { szInstallInitialize, ACTION_InstallInitialize }, - { szInstallSFPCatalogFile, NULL}, - { szInstallValidate, ACTION_InstallValidate }, - { szIsolateComponents, NULL}, - { szLaunchConditions, ACTION_LaunchConditions }, - { szMigrateFeatureStates, NULL}, - { szMoveFiles, NULL}, - { szMsiPublishAssemblies, NULL}, - { szMsiUnpublishAssemblies, NULL}, - { szInstallODBC, NULL}, - { szInstallServices, NULL}, - { szPatchFiles, NULL}, - { szProcessComponents, ACTION_ProcessComponents }, - { szPublishComponents, ACTION_PublishComponents }, - { szPublishFeatures, ACTION_PublishFeatures }, - { szPublishProduct, ACTION_PublishProduct }, - { szRegisterClassInfo, ACTION_RegisterClassInfo }, - { szRegisterComPlus, NULL}, - { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo }, - { szRegisterFonts, ACTION_RegisterFonts }, - { szRegisterMIMEInfo, ACTION_RegisterMIMEInfo }, - { szRegisterProduct, ACTION_RegisterProduct }, - { szRegisterProgIdInfo, ACTION_RegisterProgIdInfo }, - { szRegisterTypeLibraries, ACTION_RegisterTypeLibraries }, - { szRegisterUser, ACTION_RegisterUser}, - { szRemoveDuplicateFiles, NULL}, - { szRemoveEnvironmentStrings, NULL}, - { szRemoveExistingProducts, NULL}, - { szRemoveFiles, NULL}, - { szRemoveFolders, NULL}, - { szRemoveIniValues, NULL}, - { szRemoveODBC, NULL}, - { szRemoveRegistryValues, NULL}, - { szRemoveShortcuts, NULL}, - { szResolveSource, ACTION_ResolveSource}, - { szRMCCPSearch, NULL}, - { szScheduleReboot, NULL}, - { szSelfRegModules, ACTION_SelfRegModules }, - { szSelfUnregModules, NULL}, - { szSetODBCFolders, NULL}, - { szStartServices, NULL}, - { szStopServices, NULL}, - { szUnpublishComponents, NULL}, - { szUnpublishFeatures, NULL}, - { szUnregisterClassInfo, NULL}, - { szUnregisterComPlus, NULL}, - { szUnregisterExtensionInfo, NULL}, - { szUnregisterFonts, NULL}, - { szUnregisterMIMEInfo, NULL}, - { szUnregisterProgIdInfo, NULL}, - { szUnregisterTypeLibraries, NULL}, - { szValidateProductID, NULL}, - { szWriteEnvironmentStrings, NULL}, - { szWriteIniValues, ACTION_WriteIniValues }, - { szWriteRegistryValues, ACTION_WriteRegistryValues}, - { NULL, NULL}, -}; +static struct _actions StandardActions[]; /******************************************************** @@ -399,7 +295,7 @@ MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); msiobj_release(&row->hdr); - HeapFree(GetProcessHeap(),0,deformated); + msi_free(deformated); } static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, @@ -431,15 +327,90 @@ msiobj_release(&row->hdr); } +static int msi_get_property_int( MSIPACKAGE *package, LPCWSTR prop, int def ) +{ + LPWSTR str = msi_dup_property( package, prop ); + int val = str ? atoiW( str ) : def; + msi_free( str ); + return val; +} + +static UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) +{ + LPCWSTR ptr,ptr2; + BOOL quote; + DWORD len; + LPWSTR prop = NULL, val = NULL; + + if (!szCommandLine) + return ERROR_SUCCESS; + + ptr = szCommandLine; + + while (*ptr) + { + if (*ptr==' ') + { + ptr++; + continue; + } + + TRACE("Looking at %s\n",debugstr_w(ptr)); + + ptr2 = strchrW(ptr,'='); + if (!ptr2) + { + ERR("command line contains unknown string : %s\n", debugstr_w(ptr)); + break; + } + + quote = FALSE; + + len = ptr2-ptr; + prop = msi_alloc((len+1)*sizeof(WCHAR)); + memcpy(prop,ptr,len*sizeof(WCHAR)); + prop[len]=0; + ptr2++; + + len = 0; + ptr = ptr2; + while (*ptr && (quote || (!quote && *ptr!=' '))) + { + if (*ptr == '"') + quote = !quote; + ptr++; + len++; + } + + if (*ptr2=='"') + { + ptr2++; + len -= 2; + } + val = msi_alloc((len+1)*sizeof(WCHAR)); + memcpy(val,ptr2,len*sizeof(WCHAR)); + val[len] = 0; + + if (lstrlenW(prop) > 0) + { + TRACE("Found commandline property (%s) = (%s)\n", + debugstr_w(prop), debugstr_w(val)); + MSI_SetPropertyW(package,prop,val); + } + msi_free(val); + msi_free(prop); + } + + return ERROR_SUCCESS; +} + /**************************************************** * TOP level entry points *****************************************************/ -UINT ACTION_DoTopLevelINSTALL(MSIPACKAGE *package, LPCWSTR szPackagePath, - LPCWSTR szCommandLine, LPCWSTR msiFilePath) +UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, + LPCWSTR szCommandLine ) { - DWORD sz; - WCHAR buffer[10]; UINT rc; BOOL ui = FALSE; static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; @@ -448,13 +419,11 @@ MSI_SetPropertyW(package, szAction, szInstall); - package->script = HeapAlloc(GetProcessHeap(),0,sizeof(MSISCRIPT)); + package->script = msi_alloc(sizeof(MSISCRIPT)); memset(package->script,0,sizeof(MSISCRIPT)); package->script->InWhatSequence = SEQUENCE_INSTALL; - package->msiFilePath= strdupW(msiFilePath); - if (szPackagePath) { LPWSTR p, check, path; @@ -469,94 +438,31 @@ } else { - HeapFree(GetProcessHeap(),0,path); - path = HeapAlloc(GetProcessHeap(),0,MAX_PATH*sizeof(WCHAR)); + msi_free(path); + path = msi_alloc(MAX_PATH*sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH,path); strcatW(path,cszbs); } - check = load_dynamic_property(package, cszSourceDir,NULL); + check = msi_dup_property( package, cszSourceDir ); if (!check) MSI_SetPropertyW(package, cszSourceDir, path); - else - HeapFree(GetProcessHeap(), 0, check); - - HeapFree(GetProcessHeap(), 0, path); + msi_free(check); + msi_free(path); } - if (szCommandLine) - { - LPWSTR ptr,ptr2; - ptr = (LPWSTR)szCommandLine; - - while (*ptr) - { - WCHAR *prop = NULL; - WCHAR *val = NULL; + msi_parse_command_line( package, szCommandLine ); - TRACE("Looking at %s\n",debugstr_w(ptr)); - - ptr2 = strchrW(ptr,'='); - if (ptr2) - { - BOOL quote=FALSE; - DWORD len = 0; - - while (*ptr == ' ') ptr++; - len = ptr2-ptr; - prop = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); - memcpy(prop,ptr,len*sizeof(WCHAR)); - prop[len]=0; - ptr2++; - - len = 0; - ptr = ptr2; - while (*ptr && (quote || (!quote && *ptr!=' '))) - { - if (*ptr == '"') - quote = !quote; - ptr++; - len++; - } - - if (*ptr2=='"') - { - ptr2++; - len -= 2; - } - val = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); - memcpy(val,ptr2,len*sizeof(WCHAR)); - val[len] = 0; - - if (strlenW(prop) > 0) - { - TRACE("Found commandline property (%s) = (%s)\n", - debugstr_w(prop), debugstr_w(val)); - MSI_SetPropertyW(package,prop,val); - } - HeapFree(GetProcessHeap(),0,val); - HeapFree(GetProcessHeap(),0,prop); - } - ptr++; - } - } - - sz = 10; - if (MSI_GetPropertyW(package,szUILevel,buffer,&sz) == ERROR_SUCCESS) + if ( msi_get_property_int(package, szUILevel, 0) >= INSTALLUILEVEL_REDUCED ) { - if (atoiW(buffer) >= INSTALLUILEVEL_REDUCED) + package->script->InWhatSequence |= SEQUENCE_UI; + rc = ACTION_ProcessUISequence(package); + ui = TRUE; + if (rc == ERROR_SUCCESS) { - package->script->InWhatSequence |= SEQUENCE_UI; - rc = ACTION_ProcessUISequence(package); - ui = TRUE; - if (rc == ERROR_SUCCESS) - { - package->script->InWhatSequence |= SEQUENCE_EXEC; - rc = ACTION_ProcessExecSequence(package,TRUE); - } + package->script->InWhatSequence |= SEQUENCE_EXEC; + rc = ACTION_ProcessExecSequence(package,TRUE); } - else - rc = ACTION_ProcessExecSequence(package,FALSE); } else rc = ACTION_ProcessExecSequence(package,FALSE); @@ -692,6 +598,40 @@ return rc; } +UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ) +{ + MSIQUERY * view; + UINT r; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','%','s','`', + ' ','W','H','E','R','E',' ', + '`','S','e','q','u','e','n','c','e','`',' ', + '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', + '`','S','e','q','u','e','n','c','e','`',0}; + iterate_action_param iap; + + /* + * FIXME: probably should be checking UILevel in the + * ACTION_PerformUIAction/ACTION_PerformAction + * rather than saving the UI level here. Those + * two functions can be merged too. + */ + iap.package = package; + iap.UI = TRUE; + + TRACE("%p %s %i\n", package, debugstr_w(szTable), iSequenceMode ); + + r = MSI_OpenQuery( package->db, &view, query, szTable ); + if (r == ERROR_SUCCESS) + { + r = MSI_IterateRecords( view, NULL, ITERATE_Actions, &iap ); + msiobj_release(&view->hdr); + } + + return r; +} + static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) { MSIQUERY * view; @@ -818,7 +758,7 @@ } else { - FIXME("UNHANDLED Standard Action %s\n",debugstr_w(action)); + FIXME("unhandled standard action %s\n",debugstr_w(action)); *rc = ERROR_SUCCESS; } } @@ -868,7 +808,7 @@ if (!handled) { - FIXME("UNHANDLED MSI ACTION %s\n",debugstr_w(action)); + FIXME("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } @@ -892,7 +832,7 @@ if (!handled) { - FIXME("UNHANDLED MSI ACTION %s\n",debugstr_w(action)); + FIXME("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } @@ -939,7 +879,7 @@ folder->State = 3; - HeapFree(GetProcessHeap(),0,full_path); + msi_free(full_path); return ERROR_SUCCESS; } @@ -971,34 +911,22 @@ static MSICOMPONENT* load_component( MSIRECORD * row ) { MSICOMPONENT *comp; - DWORD sz; - comp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MSICOMPONENT) ); + comp = msi_alloc_zero( sizeof(MSICOMPONENT) ); if (!comp) return comp; /* fill in the data */ - sz = IDENTIFIER_SIZE; - MSI_RecordGetStringW(row,1,comp->Component,&sz); + comp->Component = load_dynamic_stringW( row, 1 ); - TRACE("Loading Component %s\n", - debugstr_w(comp->Component)); + TRACE("Loading Component %s\n", debugstr_w(comp->Component)); - sz = 0x100; - if (!MSI_RecordIsNull(row,2)) - MSI_RecordGetStringW(row,2,comp->ComponentId,&sz); - - sz = IDENTIFIER_SIZE; - MSI_RecordGetStringW(row,3,comp->Directory,&sz); - + comp->ComponentId = load_dynamic_stringW( row, 2 ); + comp->Directory = load_dynamic_stringW( row, 3 ); comp->Attributes = MSI_RecordGetInteger(row,4); + comp->Condition = load_dynamic_stringW( row, 5 ); + comp->KeyPath = load_dynamic_stringW( row, 6 ); - sz = 0x100; - MSI_RecordGetStringW(row,5,comp->Condition,&sz); - - sz = IDENTIFIER_SIZE; - MSI_RecordGetStringW(row,6,comp->KeyPath,&sz); - comp->Installed = INSTALLSTATE_ABSENT; comp->Action = INSTALLSTATE_UNKNOWN; comp->ActionRequest = INSTALLSTATE_UNKNOWN; @@ -1017,7 +945,7 @@ { ComponentList *cl; - cl = HeapAlloc( GetProcessHeap(), 0, sizeof (*cl) ); + cl = msi_alloc( sizeof (*cl) ); if ( !cl ) return ERROR_NOT_ENOUGH_MEMORY; cl->component = comp; @@ -1084,7 +1012,6 @@ { MSIPACKAGE* package = (MSIPACKAGE*)param; MSIFEATURE* feature; - DWORD sz; static const WCHAR Query1[] = {'S','E','L','E','C','T',' ', '`','C','o','m','p','o','n','e','n','t','_','`', @@ -1098,38 +1025,25 @@ /* fill in the data */ - feature = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (MSIFEATURE) ); + feature = msi_alloc_zero( sizeof (MSIFEATURE) ); if (!feature) return ERROR_NOT_ENOUGH_MEMORY; list_init( &feature->Components ); - sz = IDENTIFIER_SIZE; - MSI_RecordGetStringW(row,1,feature->Feature,&sz); + feature->Feature = load_dynamic_stringW( row, 1 ); TRACE("Loading feature %s\n",debugstr_w(feature->Feature)); - sz = IDENTIFIER_SIZE; - if (!MSI_RecordIsNull(row,2)) - MSI_RecordGetStringW(row,2,feature->Feature_Parent,&sz); + feature->Feature_Parent = load_dynamic_stringW( row, 2 ); + feature->Title = load_dynamic_stringW( row, 3 ); + feature->Description = load_dynamic_stringW( row, 4 ); - sz = 0x100; - if (!MSI_RecordIsNull(row,3)) - MSI_RecordGetStringW(row,3,feature->Title,&sz); - - sz = 0x100; - if (!MSI_RecordIsNull(row,4)) - MSI_RecordGetStringW(row,4,feature->Description,&sz); - if (!MSI_RecordIsNull(row,5)) feature->Display = MSI_RecordGetInteger(row,5); feature->Level= MSI_RecordGetInteger(row,6); - - sz = IDENTIFIER_SIZE; - if (!MSI_RecordIsNull(row,7)) - MSI_RecordGetStringW(row,7,feature->Directory,&sz); - + feature->Directory = load_dynamic_stringW( row, 7 ); feature->Attributes = MSI_RecordGetInteger(row,8); feature->Installed = INSTALLSTATE_ABSENT; @@ -1161,7 +1075,7 @@ /* fill in the data */ - file = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (MSIFILE) ); + file = msi_alloc_zero( sizeof (MSIFILE) ); if (!file) return ERROR_NOT_ENOUGH_MEMORY; @@ -1185,7 +1099,6 @@ file->Attributes = MSI_RecordGetInteger( row, 7 ); file->Sequence = MSI_RecordGetInteger( row, 8 ); - file->Temporary = FALSE; file->State = 0; TRACE("File Loaded (%s)\n",debugstr_w(file->File)); @@ -1277,11 +1190,11 @@ ui_actionstart(package, action); TRACE("Executing Action (%s)\n",debugstr_w(action)); rc = ACTION_PerformAction(package, action, TRUE); - HeapFree(GetProcessHeap(),0,package->script->Actions[script][i]); + msi_free(package->script->Actions[script][i]); if (rc != ERROR_SUCCESS) break; } - HeapFree(GetProcessHeap(),0,package->script->Actions[script]); + msi_free(package->script->Actions[script]); package->script->ActionCount[script] = 0; package->script->Actions[script] = NULL; @@ -1316,7 +1229,7 @@ TRACE("Working to load %s\n",debugstr_w(dir)); - folder = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (MSIFOLDER) ); + folder = msi_alloc_zero( sizeof (MSIFOLDER) ); if (!folder) return NULL; @@ -1360,7 +1273,7 @@ if (targetdir) { TRACE(" TargetDefault = %s\n",debugstr_w(targetdir)); - HeapFree(GetProcessHeap(),0, folder->TargetDefault); + msi_free( folder->TargetDefault); folder->TargetDefault = strdupW(targetdir); } @@ -1370,7 +1283,7 @@ folder->SourceDefault = strdupW(shortname); else if (targetdir) folder->SourceDefault = strdupW(targetdir); - HeapFree(GetProcessHeap(), 0, ptargetdir); + msi_free(ptargetdir); TRACE(" SourceDefault = %s\n", debugstr_w( folder->SourceDefault )); parent = MSI_RecordGetString(row,2); @@ -1384,7 +1297,7 @@ ERR("failed to load parent folder %s\n", debugstr_w(parent)); } - folder->Property = load_dynamic_property( package, dir, NULL ); + folder->Property = msi_dup_property( package, dir ); msiobj_release(&row->hdr); @@ -1439,56 +1352,52 @@ INSTALLSTATE state) { static const WCHAR all[]={'A','L','L',0}; - LPWSTR override = NULL; - BOOL rc = FALSE; + LPWSTR override; MSIFEATURE *feature; - override = load_dynamic_property(package, property, NULL); - if (override) + override = msi_dup_property( package, property ); + if (!override) + return FALSE; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - rc = TRUE; - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + if (strcmpiW(override,all)==0) { - if (strcmpiW(override,all)==0) + feature->ActionRequest= state; + feature->Action = state; + } + else + { + LPWSTR ptr = override; + LPWSTR ptr2 = strchrW(override,','); + + while (ptr) { - feature->ActionRequest= state; - feature->Action = state; - } - else - { - LPWSTR ptr = override; - LPWSTR ptr2 = strchrW(override,','); - - while (ptr) + if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) + || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) { - if ((ptr2 && - strncmpW(ptr,feature->Feature, ptr2-ptr)==0) - || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) - { - feature->ActionRequest= state; - feature->Action = state; - break; - } - if (ptr2) - { - ptr=ptr2+1; - ptr2 = strchrW(ptr,','); - } - else - break; + feature->ActionRequest= state; + feature->Action = state; + break; } + if (ptr2) + { + ptr=ptr2+1; + ptr2 = strchrW(ptr,','); + } + else + break; } } - HeapFree(GetProcessHeap(),0,override); } + msi_free(override); - return rc; + return TRUE; } static UINT SetFeatureStates(MSIPACKAGE *package) { - LPWSTR level; - INT install_level; + int install_level; static const WCHAR szlevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szAddLocal[] = @@ -1504,14 +1413,7 @@ TRACE("Checking Install Level\n"); - level = load_dynamic_property(package,szlevel,NULL); - if (level) - { - install_level = atoiW(level); - HeapFree(GetProcessHeap(), 0, level); - } - else - install_level = 1; + install_level = msi_get_property_int( package, szlevel, 1 ); /* ok hereis the _real_ rub * all these activation/deactivation things happen in order and things @@ -1659,7 +1561,7 @@ load_folder(package,name); path = resolve_folder(package,name,FALSE,TRUE,NULL); TRACE("resolves to %s\n",debugstr_w(path)); - HeapFree( GetProcessHeap(), 0, path); + msi_free(path); return ERROR_SUCCESS; } @@ -1736,81 +1638,74 @@ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - MSICOMPONENT* comp = NULL; + MSICOMPONENT* comp = file->Component; + LPWSTR p; - comp = file->Component; - - if (file->Temporary == TRUE) + if (!comp) continue; - if (comp) - { - LPWSTR p; + /* calculate target */ + p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); - /* calculate target */ - p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); + msi_free(file->TargetPath); - HeapFree(GetProcessHeap(),0,file->TargetPath); + TRACE("file %s is named %s\n", + debugstr_w(file->File),debugstr_w(file->FileName)); - TRACE("file %s is named %s\n", - debugstr_w(file->File),debugstr_w(file->FileName)); + file->TargetPath = build_directory_name(2, p, file->FileName); - file->TargetPath = build_directory_name(2, p, file->FileName); + msi_free(p); - HeapFree(GetProcessHeap(),0,p); + TRACE("file %s resolves to %s\n", + debugstr_w(file->File),debugstr_w(file->TargetPath)); - TRACE("file %s resolves to %s\n", - debugstr_w(file->File),debugstr_w(file->TargetPath)); + if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) + { + file->State = 1; + comp->Cost += file->FileSize; + continue; + } - if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) - { - file->State = 1; - comp->Cost += file->FileSize; - } - else - { - if (file->Version) - { - DWORD handle; - DWORD versize; - UINT sz; - LPVOID version; - static const WCHAR name[] = - {'\\',0}; - static const WCHAR name_fmt[] = - {'%','u','.','%','u','.','%','u','.','%','u',0}; - WCHAR filever[0x100]; - VS_FIXEDFILEINFO *lpVer; + if (file->Version) + { + DWORD handle; + DWORD versize; + UINT sz; + LPVOID version; + static const WCHAR name[] = + {'\\',0}; + static const WCHAR name_fmt[] = + {'%','u','.','%','u','.','%','u','.','%','u',0}; + WCHAR filever[0x100]; + VS_FIXEDFILEINFO *lpVer; - TRACE("Version comparison.. \n"); - versize = GetFileVersionInfoSizeW(file->TargetPath,&handle); - version = HeapAlloc(GetProcessHeap(),0,versize); - GetFileVersionInfoW(file->TargetPath, 0, versize, version); + TRACE("Version comparison.. \n"); + versize = GetFileVersionInfoSizeW(file->TargetPath,&handle); + version = msi_alloc(versize); + GetFileVersionInfoW(file->TargetPath, 0, versize, version); - VerQueryValueW(version, (LPWSTR)name, (LPVOID*)&lpVer, &sz); + VerQueryValueW(version, (LPWSTR)name, (LPVOID*)&lpVer, &sz); - sprintfW(filever,name_fmt, - HIWORD(lpVer->dwFileVersionMS), - LOWORD(lpVer->dwFileVersionMS), - HIWORD(lpVer->dwFileVersionLS), - LOWORD(lpVer->dwFileVersionLS)); + sprintfW(filever,name_fmt, + HIWORD(lpVer->dwFileVersionMS), + LOWORD(lpVer->dwFileVersionMS), + HIWORD(lpVer->dwFileVersionLS), + LOWORD(lpVer->dwFileVersionLS)); - TRACE("new %s old %s\n", debugstr_w(file->Version), - debugstr_w(filever)); - if (strcmpiW(filever,file->Version)<0) - { - file->State = 2; - FIXME("cost should be diff in size\n"); - comp->Cost += file->FileSize; - } - else - file->State = 3; - HeapFree(GetProcessHeap(),0,version); - } - else - file->State = 3; + TRACE("new %s old %s\n", debugstr_w(file->Version), + debugstr_w(filever)); + if (strcmpiW(filever,file->Version)<0) + { + file->State = 2; + FIXME("cost should be diff in size\n"); + comp->Cost += file->FileSize; } - } + else + file->State = 3; + msi_free(version); + } + else + file->State = 3; } TRACE("Evaluating Condition Table\n"); @@ -1826,7 +1721,7 @@ TRACE("Enabling or Disabling Components\n"); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->Condition[0]) + if (comp->Condition) { if (MSI_EvaluateConditionW(package, comp->Condition) == MSICONDITION_FALSE) @@ -1839,11 +1734,10 @@ MSI_SetPropertyW(package,szCosting,szOne); /* set default run level if not set */ - level = load_dynamic_property(package,szlevel,NULL); + level = msi_dup_property( package, szlevel ); if (!level) MSI_SetPropertyW(package,szlevel, szOne); - else - HeapFree(GetProcessHeap(),0,level); + msi_free(level); ACTION_UpdateInstallStates(package); @@ -1875,7 +1769,7 @@ else *size = strlenW(ptr)/2; - data = HeapAlloc(GetProcessHeap(),0,*size); + data = msi_alloc(*size); byte[0] = '0'; byte[1] = 'x'; @@ -1900,7 +1794,7 @@ data[count] = (BYTE)strtol(byte,NULL,0); count ++; } - HeapFree(GetProcessHeap(),0,deformated); + msi_free(deformated); TRACE("Data %li bytes(%i)\n",*size,count); } @@ -1913,7 +1807,7 @@ *type=REG_DWORD; *size = sizeof(DWORD); - data = HeapAlloc(GetProcessHeap(),0,*size); + data = msi_alloc(*size); p = deformated; if (*p == '-') p++; @@ -1930,7 +1824,7 @@ *(LPDWORD)data = d; TRACE("DWORD %li\n",*(LPDWORD)data); - HeapFree(GetProcessHeap(),0,deformated); + msi_free(deformated); } } else @@ -2032,7 +1926,7 @@ case -1: { static const WCHAR szALLUSER[] = {'A','L','L','U','S','E','R','S',0}; - LPWSTR all_users = load_dynamic_property(package, szALLUSER, NULL); + LPWSTR all_users = msi_dup_property( package, szALLUSER ); if (all_users && all_users[0] == '1') { root_key = HKEY_LOCAL_MACHINE; @@ -2043,7 +1937,7 @@ root_key = HKEY_CURRENT_USER; szRoot = szHCU; } - HeapFree(GetProcessHeap(),0,all_users); + msi_free(all_users); } break; case 0: root_key = HKEY_CLASSES_ROOT; @@ -2069,18 +1963,18 @@ deformat_string(package, key , &deformated); size = strlenW(deformated) + strlenW(szRoot) + 1; - uikey = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + uikey = msi_alloc(size*sizeof(WCHAR)); strcpyW(uikey,szRoot); strcatW(uikey,deformated); if (RegCreateKeyW( root_key, deformated, &hkey)) { ERR("Could not create key %s\n",debugstr_w(deformated)); - HeapFree(GetProcessHeap(),0,deformated); - HeapFree(GetProcessHeap(),0,uikey); + msi_free(deformated); + msi_free(uikey); return ERROR_SUCCESS; } - HeapFree(GetProcessHeap(),0,deformated); + msi_free(deformated); value = MSI_RecordGetString(row,5); if (value) @@ -2136,9 +2030,9 @@ ui_actiondata(package,szWriteRegistryValues,uirow); msiobj_release( &uirow->hdr ); - HeapFree(GetProcessHeap(),0,value_data); - HeapFree(GetProcessHeap(),0,deformated); - HeapFree(GetProcessHeap(),0,uikey); + msi_free(value_data); + msi_free(deformated); + msi_free(uikey); return ERROR_SUCCESS; } @@ -2185,47 +2079,25 @@ '`','R','e','g','i','s','t','r','y','`',0}; UINT rc; MSIQUERY * view; - MSIRECORD * row = 0; MSIFEATURE *feature; MSIFILE *file; - TRACE(" InstallValidate \n"); + TRACE("InstallValidate\n"); rc = MSI_DatabaseOpenViewW(package->db, q1, &view); - if (rc != ERROR_SUCCESS) - return ERROR_SUCCESS; - - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) + if (rc == ERROR_SUCCESS) { - MSI_ViewClose(view); - msiobj_release(&view->hdr); - return rc; + MSI_IterateRecords( view, &progress, NULL, package ); + msiobj_release( &view->hdr ); + total += progress * REG_PROGRESS_VALUE; } - while (1) - { - rc = MSI_ViewFetch(view,&row); [truncated at 1000 lines; 19151 more skipped]

1 0

[gvg] 18332: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Bg.rc Modified: trunk/reactos/lib/mpr/mpr_Cs.rc Modified: trunk/reactos/lib/mpr/mpr_De.rc Modified: trunk/reactos/lib/mpr/mpr_En.rc Modified: trunk/reactos/lib/mpr/mpr_Es.rc Modified: trunk/reactos/lib/mpr/mpr_Fr.rc Modified: trunk/reactos/lib/mpr/mpr_It.rc Modified: trunk/reactos/lib/mpr/mpr_Ja.rc Modified: trunk/reactos/lib/mpr/mpr_Nl.rc Added: trunk/reactos/lib/mpr/mpr_No.rc Modified: trunk/reactos/lib/mpr/mpr_Pt.rc Modified: trunk/reactos/lib/mpr/mpr_Ru.rc Modified: trunk/reactos/lib/mpr/mpr_Sv.rc Modified: trunk/reactos/lib/mpr/mpr_main.c Modified: trunk/reactos/lib/mpr/version.rc _____ Modified: trunk/reactos/lib/mpr/mpr.rc --- trunk/reactos/lib/mpr/mpr.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,37 +1,39 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "mprres.h" - -#include "version.rc" - -#include "mpr_Cs.rc" -#include "mpr_De.rc" -#include "mpr_En.rc" -#include "mpr_Es.rc" -#include "mpr_Fr.rc" -#include "mpr_It.rc" -#include "mpr_Ja.rc" -#include "mpr_Nl.rc" -#include "mpr_Pt.rc" -#include "mpr_Ru.rc" -#include "mpr_Sv.rc" +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "mprres.h" + +#include "version.rc" + +#include "mpr_Bg.rc" +#include "mpr_Cs.rc" +#include "mpr_De.rc" +#include "mpr_En.rc" +#include "mpr_Es.rc" +#include "mpr_Fr.rc" +#include "mpr_It.rc" +#include "mpr_Ja.rc" +#include "mpr_Nl.rc" +#include "mpr_No.rc" +#include "mpr_Pt.rc" +#include "mpr_Ru.rc" +#include "mpr_Sv.rc" _____ Copied: trunk/reactos/lib/mpr/mpr_Bg.rc (from rev 18331, vendor/wine/dlls/mpr/current/mpr_Bg.rc) Property changes on: trunk/reactos/lib/mpr/mpr_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mpr/mpr_Cs.rc --- trunk/reactos/lib/mpr/mpr_Cs.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Cs.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,26 +1,26 @@ -/* - * Czech MPR dll resources - * Copyright (C) 2004 Juan Lang - * Copyright (C) 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Celß sÝ?" -} +/* + * Czech MPR dll resources + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2004 David Kredba + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Celß sÝ?" +} _____ Modified: trunk/reactos/lib/mpr/mpr_De.rc --- trunk/reactos/lib/mpr/mpr_De.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_De.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Henning Gerhardt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Gesamtes Netzwerk" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Netzwerkkennung eingeben" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Bereich", -1, 40, 46, 50, 10 */ - LTEXT "Benutzername", -1, 40, 66, 50, 10 - LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * + * Copyright (C) 2004 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Gesamtes Netzwerk" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Netzwerkkennung eingeben" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Bereich", -1, 40, 46, 50, 10 */ + LTEXT "Benutzername", -1, 40, 66, 50, 10 + LTEXT "Kennwort", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_En.rc --- trunk/reactos/lib/mpr/mpr_En.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_En.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Entire Network" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Enter Network Password" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Please enter your username and password:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "User", -1, 40, 66, 50, 10 - LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Entire Network" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Enter Network Password" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Please enter your username and password:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "User", -1, 40, 66, 50, 10 + LTEXT "Password", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_Es.rc --- trunk/reactos/lib/mpr/mpr_Es.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Es.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll Spanish resources - * - * Copyright (C) 2004, 2005 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Toda la red" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Introduzca contrase±a de red" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Por favor, introduzca su nombre de usuario y contrase±a:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usuario", -1, 40, 66, 50, 10 - LTEXT "Contrase±a", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Guardar esta contrase±a (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll Spanish resources + * + * Copyright (C) 2004, 2005 JosÚ Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Toda la red" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Introduzca contrase±a de red" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, introduzca su nombre de usuario y contrase±a:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Usuario", -1, 40, 66, 50, 10 + LTEXT "Contrase±a", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Guardar esta contrase±a (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_Fr.rc --- trunk/reactos/lib/mpr/mpr_Fr.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Fr.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,47 +1,47 @@ -/* - * MPR dll resources - * French language support - * - * Copyright (C) 2005 Jonathan Ernst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Le rÚseau entier" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entrez le mot de passe rÚseau" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 40, 66, 50, 10 - LTEXT "Mot de passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Enregistrer ce mot de passe (risquÚ)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * French language support + * + * Copyright (C) 2005 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Le rÚseau entier" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Entrez le mot de passe rÚseau" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Utilisateur", -1, 40, 66, 50, 10 + LTEXT "Mot de passe", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risquÚ)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_It.rc --- trunk/reactos/lib/mpr/mpr_It.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_It.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,26 +1,26 @@ -/* - * MPR dll Italian resources - * - * Copyright 2004 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Tutta la rete" -} +/* + * MPR dll Italian resources + * + * Copyright 2004 Ivan Leo Puoti + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Tutta la rete" +} _____ Modified: trunk/reactos/lib/mpr/mpr_Ja.rc --- trunk/reactos/lib/mpr/mpr_Ja.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Ja.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,26 +1,26 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "âlâbâgâÅü[âNæSæ?" -} +/* + * MPR dll resources + * + * Copyright (C) 2004 Hajime Segawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "âlâbâgâÅü[âNæSæ?" +} _____ Modified: trunk/reactos/lib/mpr/mpr_Nl.rc --- trunk/reactos/lib/mpr/mpr_Nl.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Nl.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,26 +1,26 @@ -/* - * Dutch resources for MPR - * - * Copyright (C) 2004 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Gehele netwerk" -} +/* + * Dutch resources for MPR + * + * Copyright (C) 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Gehele netwerk" +} _____ Copied: trunk/reactos/lib/mpr/mpr_No.rc (from rev 18331, vendor/wine/dlls/mpr/current/mpr_No.rc) Property changes on: trunk/reactos/lib/mpr/mpr_No.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mpr/mpr_Pt.rc --- trunk/reactos/lib/mpr/mpr_Pt.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Pt.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Marcelo Duarte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Toda a rede" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entre a senha da rede" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Por favor, entre como o nome de usu?írio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usu?írio", -1, 40, 66, 50, 10 - LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * + * Copyright (C) 2004 Marcelo Duarte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Toda a rede" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Entre a senha da rede" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, entre como o nome de usu?írio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Usu?írio", -1, 40, 66, 50, 10 + LTEXT "Senha", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_Ru.rc --- trunk/reactos/lib/mpr/mpr_Ru.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Ru.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll resources - * - * Copyright (C) 2005 Mikhail Y. Zvyozdochkin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "?± ±Õ?³" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?ÔÕõÞ?Õ ÐÕ?ÕÔ¯Ú ¤Ó¯Ù³" -FONT 8, "MS Shell Dlg" -{ - LTEXT "¤¯µÓÙ¾Ú±?Ó, ÔÔÕõÞ?Õ ?Ó°Þ Þý Þ ´Ó¯Ù³:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "¤¯Û±Þ-±ÕÔÕ", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "?ý ´¯Ù³þ¯ÔÓ?ÕÙ ", -1, 40, 66, 50, 10 - LTEXT "¤Ó¯Ù³", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Ð¯§ÓÝÞ?³ ´Ó¯Ù³ (ÝÕßÕþ¯´Ó±Ý¯)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll resources + * + * Copyright (C) 2005 Mikhail Y. Zvyozdochkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "?± ±Õ?³" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?ÔÕõÞ?Õ ÐÕ?ÕÔ¯Ú ¤Ó¯Ù³" +FONT 8, "MS Shell Dlg" +{ + LTEXT "¤¯µÓÙ¾Ú±?Ó, ÔÔÕõÞ?Õ ?Ó°Þ Þý Þ ´Ó¯Ù³:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "¤¯Û±Þ-±ÕÔÕ", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "?ý ´¯Ù³þ¯ÔÓ?ÕÙ ", -1, 40, 66, 50, 10 + LTEXT "¤Ó¯Ù³", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Ð¯§ÓÝÞ?³ ´Ó¯Ù³ (ÝÕßÕþ¯´Ó±Ý¯)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/mpr/mpr_Sv.rc --- trunk/reactos/lib/mpr/mpr_Sv.rc 2005-10-08 13:28:54 UTC (rev 18331) +++ trunk/reactos/lib/mpr/mpr_Sv.rc 2005-10-08 13:34:21 UTC (rev 18332) @@ -1,46 +1,46 @@ -/* - * MPR dll Swedish resources - * - * Copyright (C) 2005 Andreas Bjerkeholt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Hela nõtverket" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ange nõtverksl÷senord" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ange ditt anvõndarnamn och l÷senord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Anvõndare", -1, 40, 66, 50, 10 - LTEXT "L÷senord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Spara detta l÷senord (Osõkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} +/* + * MPR dll Swedish resources + * + * Copyright (C) 2005 Andreas Bjerkeholt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Hela nõtverket" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ange nõtverksl÷senord" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ange ditt anvõndarnamn och l÷senord:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Anvõndare", -1, 40, 66, 50, 10 + LTEXT "L÷senord", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Spara detta l÷senord (Osõkert)", IDC_SAVEPASSWORD, [truncated at 1000 lines; 78 more skipped]

1 0

[gvg] 18331: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .spec.c files. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Kevin Koltzau <kevin(a)plop.org> - Fix warnings in 64bit. Mike McCormack <mike(a)codeweavers.com> - Fix gcc 4.0 warnings. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translations. Marcus Meissner <meissner(a)suse.de> - PrintDlg16: Copy back the Flags, nFromPage, nToPage and nCopies struct members after the print dialog finishes. Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> - Bring Finnish resources up to date. Modified: trunk/reactos/lib/comdlg32/cdlg32.c Added: trunk/reactos/lib/comdlg32/cdlg_Bg.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc Modified: trunk/reactos/lib/comdlg32/colordlg.c Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/fontdlg.c Modified: trunk/reactos/lib/comdlg32/printdlg.c Modified: trunk/reactos/lib/comdlg32/printdlg16.c Modified: trunk/reactos/lib/comdlg32/rsrc.rc _____ Modified: trunk/reactos/lib/comdlg32/cdlg32.c --- trunk/reactos/lib/comdlg32/cdlg32.c 2005-10-08 13:24:27 UTC (rev 18330) +++ trunk/reactos/lib/comdlg32/cdlg32.c 2005-10-08 13:28:54 UTC (rev 18331) @@ -158,7 +158,7 @@ if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES) COMDLG32_TlsIndex = TlsAlloc(); if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) - TlsSetValue(COMDLG32_TlsIndex, (void *)err); + TlsSetValue(COMDLG32_TlsIndex, (LPVOID)(DWORD_PTR)err); else FIXME("No Tls Space\n"); } @@ -176,7 +176,7 @@ DWORD WINAPI CommDlgExtendedError(void) { if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) - return (DWORD)TlsGetValue(COMDLG32_TlsIndex); + return (DWORD_PTR)TlsGetValue(COMDLG32_TlsIndex); else return 0; /* we never set an error, so there isn't one */ } _____ Copied: trunk/reactos/lib/comdlg32/cdlg_Bg.rc (from rev 18330, vendor/wine/dlls/commdlg/current/cdlg_Bg.rc) Property changes on: trunk/reactos/lib/comdlg32/cdlg_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc --- trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-10-08 13:24:27 UTC (rev 18330) +++ trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-10-08 13:28:54 UTC (rev 18331) @@ -1,5 +1,6 @@ /* * Copyright 1995 Jukka Iivonen + * Copyright 2005 Kimmo Myllyvirta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,19 +29,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Hakemistot:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Luettele tiedostot tyypeittõin:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Asemat:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Avaa", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Avaa", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ohje", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Vain luku", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -50,19 +51,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Hakemistot:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Tallenna tiedosto &muodossa:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Asemat:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Tallenna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Tallenna", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ohje", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Vain luku", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -73,19 +74,19 @@ { LTEXT "Kirjoitin:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Tulostusalue", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Kaikki", 1056, 16, 45, 60, 12 - RADIOBUTTON "&Valinta", 1057, 16, 60, 60, 12 - RADIOBUTTON "&Sivut", 1058, 16, 75, 60, 12 - DEFPUSHBUTTON "Tulosta", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Asetukset", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Tulostusalue", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Kaikki", rad1, 16, 45, 60, 12 + RADIOBUTTON "&Valinta", rad2, 16, 60, 60, 12 + RADIOBUTTON "&Sivut", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "Tulosta", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Asetukset", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Mistõ:", 1090, 60, 80, 30, 9 LTEXT "Mi&hin:", 1091, 120, 80, 30, 9 LTEXT "&Tulostustarkkuus:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Tulosta t&iedostoon", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Tiivistetty", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Tulosta t&iedostoon", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Tiivistetty", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -94,24 +95,24 @@ CAPTION "Kirjoittimen asetukset" FONT 8, "MS Shell Dlg" { - GROUPBOX "Kirjoitin", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "O&letuskirjoitin", 1056, 16, 20, 80, 12 + GROUPBOX "Kirjoitin", grp1, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "O&letuskirjoitin", rad1, 16, 20, 80, 12 LTEXT "[ei valittu]", 1088, 35, 35, 120, 9 - RADIOBUTTON "&Erityinen kirjoitin", 1057, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + RADIOBUTTON "&Erityinen kirjoitin", rad2, 16, 50, 80, 12 + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Asetukset...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Suunta", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Pysty", 1058, 50, 100, 40, 12 - RADIOBUTTON "&Vaaka", 1059, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paperi", 1074, 120, 85, 180, 50, BS_GROUPBOX + PUSHBUTTON "&Asetukset...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Suunta", grp2, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "&Pysty", rad3, 50, 100, 40, 12 + RADIOBUTTON "&Vaaka", rad4, 50, 115, 40, 12 + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Paperi", grp3, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Koko:", 1089, 130, 95, 30, 9 LTEXT "Lõ&hde:", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } @@ -120,24 +121,24 @@ CAPTION "Fontit" FONT 8, "MS Shell Dlg" { - LTEXT "&Fontti:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Fontti:", stc1 ,6,3,40,9 + COMBOBOX cmb1,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Fonttit&yyli:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Fonttit&yyli:", stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Koko:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Koko:", stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "Peruuta",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "&Sovella", 1026,218,40,40,14,WS_GROUP - PUSHBUTTON "&Ohje" , 1038,218,57,40,14,WS_GROUP - GROUPBOX "Efektit",1072,6,72,84,34,WS_GROUP - CHECKBOX "Yli&viivattu", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "V&õri:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + PUSHBUTTON "Peruuta", IDCANCEL,218,23,40,14,WS_GROUP + PUSHBUTTON "&Ota kõytt÷÷n", psh3,218,40,40,14,WS_GROUP + PUSHBUTTON "&Ohje" , pshHelp,218,57,40,14,WS_GROUP + GROUPBOX "Efektit", grp1,6,72,84,34,WS_GROUP + CHECKBOX "Yli&viivattu", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "A&lleviivattu", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "V&õri:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Nõyte",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE @@ -152,9 +153,9 @@ CAPTION "Võri" FONT 8, "MS Shell Dlg" { - LTEXT "Pe&rusvõrit:", 1088, 4, 4, 140, 10 + LTEXT "Pe&rusvõrit:", 1088, 4, 4, 140, 10 LTEXT "&Muokatut võrit:", 1089, 4, 106, 140, 10 - LTEXT "Võri|&Tasainen", 1090, 150, 151, 48, 10 + LTEXT "Võri|&Tasainen", 1090, 150, 151, 48, 10 LTEXT "&Pun:", 726 /*1094*/,249,126,24,10 EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Vihr:",727/*1095*/,249,140,24,10 @@ -172,11 +173,11 @@ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "Ok", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "S&ulje", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "O&hje", 1038,100,166, 44, 14 - PUSHBUTTON "&Lisõõ võri", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "M&õõrittele võri >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Ok", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "S&ulje", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "O&hje", pshHelp,100,166, 44, 14 + PUSHBUTTON "&Lisõõ võri", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "M&õõrittele võri >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -187,15 +188,16 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Etsittõvõ:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Koko sana", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Kirjaink&oko", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Suunta", 1072, 107, 26, 68, 28 - CONTROL "&Yl÷s", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Alas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Koko sana", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kirjaink&oko", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suunta", grp1, 107, 26, 68, 28 + CONTROL "&Yl÷s", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 30, 12 + CONTROL "&Alas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 38, 30, 12 + DEFPUSHBUTTON "Etsi &seuraava", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Peruuta", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "O&hje", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Peruuta", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "O&hje", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,14 +207,260 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Etsittõvõ:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Ko&rvattava:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Koko sana", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Kirjaink&oko", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Koko sana", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kirjaink&oko", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "Etsi &seuraava", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Korv&aa", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Korvaa ka&ikki", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "S&ulje", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "O&hje", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Korv&aa", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Korvaa ka&ikki", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "S&ulje", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "O&hje", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } + +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Tulosta" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Peruuta", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "Oh&je", pshHelp, 50, 161, 48,14, WS_GROUP + + GROUPBOX "Tulostin", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "&Tulosta tiedostoon", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,207,70,70,12 + PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nimi:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Tila:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tyyppi:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Sijainti:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Kommentti:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Kopioita", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Kopioiden &mõõrõ:", stc5,168,108,68,8 + ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&Kokoa", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "Tulosta alueelta", grp1, 8,92, 144,64, WS_GROUP + CONTROL "K&aikki", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Sivut", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&Valinta", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 70,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "M&istõ:", stc2, 48,124, 20,8 + RTEXT "Mi&hin:", stc3, 98,124, 20,8 +} + +PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Tulostuksen Asetukset" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP + PUSHBUTTON "Peruuta",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "Verkko...", psh5, 284,156,48,14 */ + + GROUPBOX "Tulostin", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Ominaisuudet", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Nimi:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Tila:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tyyppi:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Sijainti:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Kommentti:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Paperi", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&Koko:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&Lõhde:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "Suunta", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&Pysty", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "V&aaka", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sivun Asetukset" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Paperi", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Koko:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Sy÷tt÷:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Asento", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "P&ysty", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "V&aaka", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Reunat", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Vasen:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Oikea:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Vasen:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Pohja:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Peruuta", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "T&ulostin...", psh3, 184, 220, 48, 14 +END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Avaa" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Kansiosta:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "&Nimi:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "&Tyyppi:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "Avaa vain &lukuoikeuksilla",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&Avaa", IDOK,222,110,50,14 + PUSHBUTTON "Peruuta", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Ohje", pshHelp,222,145,50,14 +} + +STRINGTABLE DISCARDABLE +{ + IDS_ABOUTBOX "&Tietoja FolderPicker Test:stõ" + IDS_DOCUMENTFOLDERS "Dokumenttikansiot" + IDS_PERSONAL "Omat Dokumentit" + IDS_FAVORITES "Suosikit" + IDS_PATH "Jõrjestelmõkansio" + IDS_DESKTOP "Ty÷p÷ytõ" + IDS_FONTS "Fontit" + IDS_MYCOMPUTER "Oma Tietokone" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SYSTEMFOLDERS "Jõrjestemõkansiot" + IDS_LOCALHARDRIVES "Paikalliset kiintolevyt" + IDS_FILENOTFOUND "Tiedostoa ei l÷ydy" + IDS_VERIFYFILE "Varmista, ettõ tiedoston nimi on oikein" + IDS_CREATEFILE "Tiedostoa ei ole olemassa\nHaluatko luoda tiedoston" + IDS_OVERWRITEFILE "Tiedosto on jo olemassa.\nHaluatko ylikirjoitaa sen?" + IDS_INVALID_FILENAME_TITLE "Kansio sisõltõõ epõkelpoja merkkejõ" + IDS_INVALID_FILENAME "Tiedoston nimi ei voi sisõltõõ nõitõ merkkejõ: \n / : < > |" + IDS_PATHNOTEXISTING "Kansiota ei ole" + IDS_FILENOTEXISTING "Tiedostoa ei ole" +} + +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Kansio Yl÷spõin" + IDS_NEWFOLDER "Luo Uusi Kansio" + IDS_LISTVIEW "Lista" + IDS_REPORTVIEW "Tiedot" + IDS_TODESKTOP "Selaa Ty÷p÷ytõõ" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Tulosta" + + PD32_VALUE_UREADABLE "Lukukelvoton merkintõ" + PD32_INVALID_PAGE_RANGE "Arvo ei ole paperien mõõrõn alueella.\nAnna arvo võliltõ %d ja %d." + PD32_FROM_NOT_ABOVE_TO "Alukuarvo ei voi olla suurempi kuin loppuarvo." + PD32_MARGINS_OVERLAP "Marginaalit ovat põõllekõin tai ulkona paperin alueelta.\nMõõritõ marginaalit uudestaan." + PD32_NR_OF_COPIES_EMPTY "Kopioiden mõõrõ tõytyy antaa." + PD32_TOO_LARGE_COPIES "Tulostin ei tue nõin montaa kopiota. \nValitse arvo võliltõ 1 ja %d." + PD32_PRINT_ERROR "Tulostinvirhe." + PD32_NO_DEFAULT_PRINTER "Oletustulostinta ei ole mõõritetty." + PD32_CANT_FIND_PRINTER "Tulostinta ei l÷ydy." + PD32_OUT_OF_MEMORY "Muisti loppu." + PD32_GENERIC_ERROR "Virhe." + PD32_DRIVER_UNKNOWN "Tuntematon tulostinajuri." + + PD32_DEFAULT_PRINTER "Oletustulostin; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "Jonossa on %d dokumenttia" + PD32_MARGINS_IN_INCHES "Marginaalit [inches]" + PD32_MARGINS_IN_MILIMETERS "Marginaalit [mm]" + PD32_MILIMETERS "mm" + + PD32_PRINTER_STATUS_READY "Valmis" + PD32_PRINTER_STATUS_PAUSED "Pysõytetty; " + PD32_PRINTER_STATUS_ERROR "Virhe; " + PD32_PRINTER_STATUS_PENDING_DELETION "Tuhoutumassa; " + PD32_PRINTER_STATUS_PAPER_JAM "Paperitukos; " + PD32_PRINTER_STATUS_PAPER_OUT "Paperi loppu; " + PD32_PRINTER_STATUS_MANUAL_FEED "Sy÷tõ paperi kõsin; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Ongelma paperin kanssa; " + PD32_PRINTER_STATUS_OFFLINE "Ei yhteyttõ tulostimeen; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Toiminnassa; " + PD32_PRINTER_STATUS_BUSY "Varattu; " + PD32_PRINTER_STATUS_PRINTING "Tulostaa; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Ei saatavilla; " + PD32_PRINTER_STATUS_WAITING "Odottaa; " + PD32_PRINTER_STATUS_PROCESSING "Kõsitellõõn; " + PD32_PRINTER_STATUS_INITIALIZING "Alustetaan; " + PD32_PRINTER_STATUS_WARMING_UP "Lõmmitetõõn; " + PD32_PRINTER_STATUS_TONER_LOW "Võriaine võhissõ; " + PD32_PRINTER_STATUS_NO_TONER "Ei võriõainetta; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Kõyttõjõn keskeyttõmõ; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Muisti loppu; " + PD32_PRINTER_STATUS_DOOR_OPEN "Tulostimen kansi on auki; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Tulostinpalvelin tuntematon; " + PD32_PRINTER_STATUS_POWER_SAVE "Virransõõst÷tila; " +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "Musta" + IDS_COLOR_MAROON "Kastanjanruskea" + IDS_COLOR_GREEN "Vihreõ" + IDS_COLOR_OLIVE "Oliivinvihreõ" + IDS_COLOR_NAVY "Laivastonsininen" + IDS_COLOR_PURPLE "Purppura" + IDS_COLOR_TEAL "Turkoosi" + IDS_COLOR_GRAY "Harmaa" + IDS_COLOR_SILVER "Hopea" + IDS_COLOR_RED "Punainen" + IDS_COLOR_LIME "Vaaleanvihreõ" + IDS_COLOR_YELLOW "Keltainen" + IDS_COLOR_BLUE "Sininen" + IDS_COLOR_FUCHSIA "Tummanpunainen" + IDS_COLOR_AQUA "Vaaleanturkoosi" + IDS_COLOR_WHITE "Valkoinen" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Valitse fontin koko võliltõ %d ja %d pistettõ." + IDS_SAVE_BUTTON "&Tallenna" + IDS_SAVE_IN "&Kansioon:" + IDS_SAVE "Tallenna" + IDS_SAVE_AS "Tallenna nimellõ" + IDS_OPEN_FILE "Avaa Tiedosto" +} _____ Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc --- trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-10-08 13:24:27 UTC (rev 18330) +++ trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-10-08 13:28:54 UTC (rev 18331) @@ -1,5 +1,5 @@ /* - * Copyright 1994 Dag Asheim + * Copyright 2005 Alexander N. S°rnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,131 +20,164 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "?pne" FONT 8, "MS Shell Dlg" { - LTEXT "&Filnavn:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LTEXT "Fil&navn:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Kataloger:", -1, 110, 6, 92, 9 + LTEXT "&Kateloger:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Kataloger:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "?pne", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Vis filer av &typen:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Stasjoner:", 1091, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "?pne", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hjelp", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Sk&rivebeskyttet", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Lagre som ..." +CAPTION "Lagre som . . ." FONT 8, "MS Shell Dlg" { - LTEXT "&Filnavn:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LTEXT "Fil&navn:", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Kataloger:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Kataloger:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Lagre som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Vis filer av &typen:", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Stasjoner:", 1091, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Lagre som", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hjelp", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Sk&rivebeskyttet", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Skriv" +CAPTION "Skriv ut" FONT 8, "MS Shell Dlg" { LTEXT "Skriver:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Skriv del", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Alle", 1056, 16, 45, 60, 12 - RADIOBUTTON "&Markert", 1057, 16, 60, 60, 12 - RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12 - DEFPUSHBUTTON "Skriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "UtskriftsomrÕde", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Alt", rad1, 16, 45, 60, 12 + RADIOBUTTON "M&erket omrÕde", rad2, 16, 60, 60, 12 + RADIOBUTTON "&Sider", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "Skriv ut", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Opp&sett", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Fra:", 1090, 60, 80, 30, 9 LTEXT "&Til:", 1091, 120, 80, 30, 9 LTEXT "&Utskriftskvalitet:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "&Skriv til fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Sammentrykket", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Skriv til fi&l", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kondensert", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Skriveoppsett" +CAPTION "Utskriftsinnstillinger" FONT 8, "MS Shell Dlg" { - GROUPBOX "Skriver", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "&Standardskriver", 1056, 16, 20, 80, 12 - LTEXT "[ingen]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Spesifikk &skriver", 1057, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + GROUPBOX "Skriver", grp1, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "Stan&dardskriver", rad1, 16, 20, 80, 12 + LTEXT "(Ingen)", 1088, 35, 35, 120, 9 + RADIOBUTTON "S&pesifik skriver", rad2, 16, 50, 80, 12 + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Portrett", 1058, 50, 100, 40, 12 - RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "&St°rrelse", 1089, 130, 95, 30, 9 + PUSHBUTTON "Opp&sett", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Orientering", grp2, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "&StÕende", rad3, 50, 100, 40, 12 + RADIOBUTTON "&Liggende", rad4, 50, 115, 40, 12 + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Papir", grp3, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "St°rr&else", 1089, 130, 95, 30, 9 LTEXT "&Kilde", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } -CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Font" +CAPTION "Skrift" FONT 8, "MS Shell Dlg" { - LTEXT "Font:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Skrift:",stc1 ,6,3,40,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "Skriftst&il:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&St°rrelse:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Bruk", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hjelp" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Effekter",grp1,6,72,84,34,WS_GROUP + CHECKBOX "Gjennomstre&ket", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Understreket", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Farge:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "ForhÕndsvisning",grp2,98,72,120,36,WS_GROUP + CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Skr&ipt:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 185 +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Farge" FONT 8, "MS Shell Dlg" { - LTEXT "&Grunnleggende farger:", 1088, 6, 6, 40, 9 - LTEXT "&Egendefinerte farger:", 1089, 6, 126, 40, 9 - LTEXT "&Ensfarget", 1090, 100, 146, 40, 9 - LTEXT "&Int:", 1091, 150, 126, 40, 9 - LTEXT "&Met:", 1092, 150, 146, 40, 9 - LTEXT "&Lum:", 1093, 150, 166, 40, 9 - LTEXT "&R°d:", 1094, 150, 126, 40, 9 - LTEXT "&Gr°nn:", 1095, 150, 146, 40, 9 - LTEXT "&BlÕ:", 1096, 150, 166, 40, 9 - DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Legg til egendefinert farge", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Fjern egendefinerte farger", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Basisfarger:", 1088, 4, 4, 140, 10 + LTEXT "&Egendefinerte farger:", 1089, 4, 106, 140, 10 + LTEXT "Farge | Sol&id", 1090, 150, 151, 48, 10 + LTEXT "&R°d:", 726 /*1094*/,249,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Gr°nn:",727/*1095*/,249,140,24,10 + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&BlÕ:",728 /*1096*/,249,154,24,10 + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nyanse:" ,723 /*1091*/,202,126,22,10 + EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Metning:" ,724 /*1092*/,202,140,22,10 + EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 + EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Hjelp", pshHelp,100,166, 44, 14 + PUSHBUTTON "Legg til i egendefinerte f&arger", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definer egendefinerte farger >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -153,33 +186,282 @@ CAPTION "Finn" FONT 8, "MS Shell Dlg" { - LTEXT "&Finn hva:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Skill pÕ store/smÕ bokstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", 1072, 107, 26, 68, 28 - CONTROL "&Opp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hjelp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "Fi&nn:", -1, 4, 8, 42, 8 + EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Skill &mellom store/smÕ bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 107, 26, 68, 28 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + + DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hjelp", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Bytt" +CAPTION "Erstatt" FONT 8, "MS Shell Dlg" { - LTEXT "&Finn hva:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Bytt med:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Skill pÕ store/smÕ bokstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Bytt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Bytt alt", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hjelp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "Fi&nn:", -1, 4, 9, 48, 8 + EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Erstatt med:", -1, 4, 26, 48, 8 + EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Skill mellom store og smÕ bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "E&rsatt", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Erstatt &alle", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hjelp", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } + + +PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Skriv ut" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "&Hjelp", pshHelp, 50, 161, 48,14, WS_GROUP + + GROUPBOX "Skriver", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "Skriv ti&l fil", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Navn:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Tullestatus", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Tulletype", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Hvor:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Tulleplassering", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Kommentar:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Tullekommentar", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Kopier", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Antall &kopier:",stc5,168,108,68,8 + ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "S&orter", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "UtskriftsomrÕde", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&Alt", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Sider", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&Merket omrÕde", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "&Fra:", stc2, 52,124, 20,8 + RTEXT "&Til:", stc3, 100,124, 16,8 +} + +PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP | DS_3DLOOK +CAPTION "Utskriftoppsett" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "Nettverk . . .", psh5, 284,156,48,14 */ + + GROUPBOX "Skriver", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Egenskaper", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&Navn:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Tullestatus", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Tulletype", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Plassering:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Tulleplassering", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Kommentar:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Tullekommentar", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Papir", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&St°rrelse:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&Kilde:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "Orientering", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "S&tÕende", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "&Liggende", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sideoppsett" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&St°rrelse:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "Sku&ff:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Orientering", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "S&tÕende", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Liggende", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Rammer", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "V&enstre:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "H°y&re:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "T&opp:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Bunn:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Sk&river . . .", psh3, 184, 220, 48, 14 +END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "?pne" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Se &i:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "Fil&navn:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "Fil&type:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "?pne som sk&rivebeskyttet",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&?pne", IDOK,222,110,50,14 + PUSHBUTTON "Avbryt", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Hjelp", pshHelp,222,145,50,14 +} + +STRINGTABLE DISCARDABLE +{ + IDS_ABOUTBOX "Om k&atalogvelger-test" + IDS_DOCUMENTFOLDERS "Dokumentmapper" + IDS_PERSONAL "Mine dokumenter" + IDS_FAVORITES "Mine favoritter" + IDS_PATH "Systemsti" + IDS_DESKTOP "Skrivebord" + IDS_FONTS "Skrifter" + IDS_MYCOMPUTER "Min datamaskin" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SYSTEMFOLDERS "Systemkataloger" + IDS_LOCALHARDRIVES "Lokale harddisker" + IDS_FILENOTFOUND "Fant ikke filen" + IDS_VERIFYFILE "Kontroller at filnavnet som ble oppgitt er korrekt" + IDS_CREATEFILE "Filen finnes ikke.\nSkal den opprettes?" + IDS_OVERWRITEFILE "Filen finnes fra f°r.\nSkal den overskrives?" + IDS_INVALID_FILENAME_TITLE "Ugyldige tegn i filnavnet" + IDS_INVALID_FILENAME "Et filnavn kan ikke inneholder f°lgende tegn:\n / : < > |" + IDS_PATHNOTEXISTING "Stien finnes ikke" + IDS_FILENOTEXISTING "Filen finnes ikke" +} + +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Opp ett nivÕ" + IDS_NEWFOLDER "Lag ny katalog" + IDS_LISTVIEW "Liste" + IDS_REPORTVIEW "Detaljer" + IDS_TODESKTOP "Bla til skrivebordet" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Skriv ut" + + PD32_VALUE_UREADABLE "Uleselig oppf°ring" [truncated at 1000 lines; 197 more skipped]

1 0

[gvg] 18330: Use Wine solution for MRU problem, which is slightly different from the
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Use Wine solution for MRU problem, which is slightly different from the solution which was implemented in ReactOS Modified: trunk/reactos/lib/comctl32/comctl32undoc.c _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 13:20:03 UTC (rev 18329) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 13:24:27 UTC (rev 18330) @@ -685,8 +685,8 @@ datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, (LPBYTE)mp->realMRU, &datasize))) { - /* not present - set size to 2 (will become 0 later) */ - datasize = 2; + /* not present - set size to 1 (will become 0 later) */ + datasize = 1; *mp->realMRU = 0; } else @@ -694,7 +694,7 @@ TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); - mp->cursize = datasize / sizeof(WCHAR) - 1; + mp->cursize = datasize - 1; /* datasize now has number of items in the MRUList */ /* get actual values for each entry */

1 0

[gvg] 18329: Sync to Wine-20050930:
by gvg＠svn.reactos.com 08 Oct '05

08 Oct '05

Sync to Wine-20050930: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Fixed inconsistency in LISTVIEW_DUMP macro. Robert Shearman <rob(a)codeweavers.com> - Add support for navigating a toolbar with the arrow keys. - Fix WrapToolbar in the case of no parent window. - Use the newly added NMTBINITCUSTOMIZE for sending the TBN_INITCUSTOMIZE so that it is safe on 64-bit platforms. Aric Stewart <aric(a)codeweavers.com> - Reading the MRUlist using the W functions we need to divide the size by sizeof(WCHAR) to get the count of characters. Alexandre Julliard <julliard(a)winehq.org> - Specify 64-bit integers as double instead of long long in spec files so that we get the correct number of arguments. - We are no longer generating .dbg.c files. Milko Krachounov <milko(a)3mhz.net> - Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw, shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui, setupapi, wininet, regedit, uninstaller, notepad, winecfg and winhelp. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Call SetDIBits with a proper DC in order to set bitmap bits. Mike McCormack <mike(a)codeweavers.com> - Fix if's that are followed by semicolons. Alexander N. Sørnes <alex(a)thehandofagony.com> - Added Norwegian translation of comctl32 and shell32. Marcus Meissner <marcus(a)jet.franken.de> - The last argument to MultiByteToWideChar is wide character count and not the buffer size in bytes. Fixed all places where it was wrong. Frank Richter <frank.richter(a)gmail.com> - Unregister theming subclasses at comctl32 shutdown; should fix reported re-registration errors. Jason Edmeades <us(a)edmeades.me.uk> - Fix some off by one calculations in the comboboxex functions, and handle an out of range positive index the same as windows + unit test case. Modified: trunk/reactos/include/wine/commctrl.h Modified: trunk/reactos/lib/comctl32/animate.c Modified: trunk/reactos/lib/comctl32/comboex.c Modified: trunk/reactos/lib/comctl32/comctl32.h Modified: trunk/reactos/lib/comctl32/comctl32.spec Modified: trunk/reactos/lib/comctl32/comctl32undoc.c Added: trunk/reactos/lib/comctl32/comctl_Bg.rc Modified: trunk/reactos/lib/comctl32/comctl_Cn.rc Modified: trunk/reactos/lib/comctl32/comctl_Cs.rc Modified: trunk/reactos/lib/comctl32/comctl_De.rc Modified: trunk/reactos/lib/comctl32/comctl_En.rc Modified: trunk/reactos/lib/comctl32/comctl_Es.rc Modified: trunk/reactos/lib/comctl32/comctl_Fr.rc Modified: trunk/reactos/lib/comctl32/comctl_It.rc Modified: trunk/reactos/lib/comctl32/comctl_Ja.rc Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc Modified: trunk/reactos/lib/comctl32/comctl_Nl.rc Added: trunk/reactos/lib/comctl32/comctl_No.rc Modified: trunk/reactos/lib/comctl32/comctl_Pl.rc Modified: trunk/reactos/lib/comctl32/comctl_Pt.rc Modified: trunk/reactos/lib/comctl32/comctl_Ru.rc Modified: trunk/reactos/lib/comctl32/comctl_Si.rc Modified: trunk/reactos/lib/comctl32/comctl_Th.rc Modified: trunk/reactos/lib/comctl32/comctl_Uk.rc Modified: trunk/reactos/lib/comctl32/commctrl.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/rsrc.rc Modified: trunk/reactos/lib/comctl32/theming.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/treeview.c Modified: trunk/reactos/w32api/include/commctrl.h _____ Modified: trunk/reactos/include/wine/commctrl.h --- trunk/reactos/include/wine/commctrl.h 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/include/wine/commctrl.h 2005-10-08 13:20:03 UTC (rev 18329) @@ -50,6 +50,8 @@ #define TB_UNKWN463 (WM_USER+99) #define TB_UNKWN464 (WM_USER+100) +#define TBN_WRAPHOTITEM (TBN_FIRST-24) /* this is undocumented and the name is a guess */ + #define RBBS_USECHEVRON 0x00000200 #define RBHT_CHEVRON 0x0008 #define RBN_CHEVRONPUSHED (RBN_FIRST-10) @@ -82,4 +84,19 @@ '_','D','r','a','g','L','i','s','t','M','s','g',0 }; #endif +/* these are undocumented and the names are guesses */ +typedef struct +{ + NMHDR hdr; + HWND hwndDialog; +} NMTBINITCUSTOMIZE; + +typedef struct +{ + NMHDR hdr; + INT idNew; + INT iDirection; /* left is -1, right is 1 */ + DWORD dwReason; /* HICF_* */ +} NMTBWRAPHOTITEM; + #endif /* __WINE_COMMCTRL_H */ _____ Modified: trunk/reactos/lib/comctl32/animate.c --- trunk/reactos/lib/comctl32/animate.c 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/animate.c 2005-10-08 13:20:03 UTC (rev 18329) @@ -252,15 +252,12 @@ static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) { - void* pBitmapData = NULL; - LPBITMAPINFO pBitmapInfo = NULL; - + void *pBitmapData; + LPBITMAPINFO pBitmapInfo; HDC hdcMem; HBITMAP hbmOld; - int nOffsetX = 0; int nOffsetY = 0; - int nWidth; int nHeight; @@ -289,11 +286,11 @@ infoPtr->hbmPrevFrame=CreateCompatibleBitmap(hDC, nWidth,nHeight ); } - SetDIBits(hDC, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, (LPBITMAPINFO)pBitmapInfo, DIB_RGB_COLORS); - hdcMem = CreateCompatibleDC(hDC); hbmOld = SelectObject(hdcMem, infoPtr->hbmPrevFrame); + SetDIBits(hdcMem, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, pBitmapInfo, DIB_RGB_COLORS); + /* * we need to get the transparent color even without ACS_TRANSPARENT, * because the style can be changed later on and the color should always _____ Modified: trunk/reactos/lib/comctl32/comboex.c --- trunk/reactos/lib/comctl32/comboex.c 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comboex.c 2005-10-08 13:20:03 UTC (rev 18329) @@ -473,7 +473,7 @@ CBE_ITEMDATA *item; INT i; - if ((index > infoPtr->nb_items) || (index < -1)) + if ((index >= infoPtr->nb_items) || (index < -1)) return 0; if (index == -1) return infoPtr->edit; @@ -509,7 +509,7 @@ TRACE("(index=%d)\n", index); /* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < 0)) return CB_ERR; + if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR; /* doing this will result in WM_DELETEITEM being issued */ @@ -527,7 +527,7 @@ TRACE("(...)\n"); /* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < -1)) return FALSE; + if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE; /* if the item is the edit control and there is no edit control, skip */ if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; @@ -587,7 +587,7 @@ /* get real index of item to insert */ index = cit->iItem; if (index == -1) index = infoPtr->nb_items; - if (index > infoPtr->nb_items) index = infoPtr->nb_items; + if (index > infoPtr->nb_items) return -1; /* get zero-filled space and chain it in */ if(!(item = (CBE_ITEMDATA *)Alloc (sizeof(*item)))) return -1; @@ -740,7 +740,7 @@ if (TRACE_ON(comboex)) COMBOEX_DumpInput (cit); /* if item number requested does not exist then return failure */ - if ((index > infoPtr->nb_items) || (index < -1)) return FALSE; + if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE; /* if the item is the edit control and there is no edit control, skip */ if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; _____ Modified: trunk/reactos/lib/comctl32/comctl32.h --- trunk/reactos/lib/comctl32/comctl32.h 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl32.h 2005-10-08 13:20:03 UTC (rev 18329) @@ -250,6 +250,7 @@ } extern void THEMING_Initialize(void); +extern void THEMING_Uninitialize(void); extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM); extern void THEMING_SetSubclassData(HWND, ULONG_PTR); _____ Modified: trunk/reactos/lib/comctl32/comctl32.spec --- trunk/reactos/lib/comctl32/comctl32.spec 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl32.spec 2005-10-08 13:20:03 UTC (rev 18329) @@ -15,7 +15,7 @@ 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long long long long) + 14 stdcall LBItemFromPt(long double long) 15 stdcall DrawInsert(long long long) 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) 17 stdcall InitCommonControls() _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 13:20:03 UTC (rev 18329) @@ -579,7 +579,7 @@ if (!stringW) return -1; - MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); + MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len/sizeof(WCHAR)); ret = AddMRUData(hList, stringW, len); Free(stringW); return ret; @@ -689,6 +689,8 @@ datasize = 2; *mp->realMRU = 0; } + else + datasize /= sizeof(WCHAR); TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); _____ Copied: trunk/reactos/lib/comctl32/comctl_Bg.rc (from rev 18327, vendor/wine/dlls/comctl32/current/comctl_Bg.rc) Property changes on: trunk/reactos/lib/comctl32/comctl_Bg.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/comctl32/comctl_Cn.rc --- trunk/reactos/lib/comctl32/comctl_Cn.rc 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl_Cn.rc 2005-10-08 13:20:03 UTC (rev 18329) @@ -1,90 +1,90 @@ -/* - * Copyright 2002 Tisheng Chen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "?¶ðÈ " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?ÀÂ¿", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "?í¤¹", IDCANCEL,58,122,50,14 - PUSHBUTTON "ËªË?(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "?´Í·", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< ?¤Ê??¢(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "¤?Ê??¢(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "¢ß?°", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "?í¤¹", IDCANCEL,178,138,50,14 - PUSHBUTTON "?´Í·", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÎÈÂ¿ÊÕ?ñ¥??©" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?Ï?i(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "ÍÏÍ?(&e)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "?´Í·(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "?¤Êã(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "¤?Êã(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "??Ë??ñ¥??©???Ñ(&V):", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "?Ý?Ë(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- ?¥?²(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "Á?Ã??ñ¥??©???Ñ(&T):", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "?Ï?i" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "ÀÍ©¶À¹" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} - -#pragma code_page(default) +/* + * Copyright 2002 Tisheng Chen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "?¶ðÈ " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "?ÀÂ¿", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "?í¤¹", IDCANCEL,58,122,50,14 + PUSHBUTTON "ËªË?(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "?´Í·", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< ?¤Ê??¢(&B)", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "¤?Ê??¢(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "¢ß?°", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "?í¤¹", IDCANCEL,178,138,50,14 + PUSHBUTTON "?´Í·", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÎÈÂ¿ÊÕ?ñ¥??©" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "?Ï?i(&C)", IDCANCEL,308,6,44,14 + PUSHBUTTON "ÍÏÍ?(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "?´Í·(&H)", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "?¤Êã(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "¤?Êã(&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "??Ë??ñ¥??©???Ñ(&V):", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "?Ý?Ë(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- ?¥?²(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Á?Ã??ñ¥??©???Ñ(&T):", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "?Ï?i" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Today:" + IDM_GOTODAY "Go to today" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "ÀÍ©¶À¹" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "None" +} + +#pragma code_page(default) _____ Modified: trunk/reactos/lib/comctl32/comctl_Cs.rc --- trunk/reactos/lib/comctl32/comctl_Cs.rc 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl_Cs.rc 2005-10-08 13:20:03 UTC (rev 18329) @@ -1,90 +1,90 @@ -/* - * Copyright 1999 Eric Kohl - * - * Czech resources for comctl32 - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Storno", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Pou¥Ýt", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Nßpovýda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Pr¨vodce" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Zpýt", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Dal?Ý >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "DokonÞit", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Storno", IDCANCEL,178,138,50,14 - PUSHBUTTON "Nßpovýda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "NastavenÝ panelu" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Zav°Ýt", IDCANCEL,308,6,44,14 - PUSHBUTTON "&V²chozÝ", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Nßpovýda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "&Dol¨", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "D&ostupnß tlaÞÝtka:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "P°id&at ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&TlaÞÝtka panelu:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Zav°Ýt" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Dnes:" - IDM_GOTODAY "Jdi na dne?ek" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "OddýlovaÞ" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "«ßdn²" -} +/* + * Copyright 1999 Eric Kohl + * + * Czech resources for comctl32 + * Copyright 2004 David Kredba + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Vlastnosti " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Storno", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Pou¥Ýt", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Nßpovýda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Pr¨vodce" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Zpýt", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Dal?Ý >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "DokonÞit", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Storno", IDCANCEL,178,138,50,14 + PUSHBUTTON "Nßpovýda", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "NastavenÝ panelu" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zav°Ýt", IDCANCEL,308,6,44,14 + PUSHBUTTON "&V²chozÝ", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Nßpovýda", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Dol¨", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "D&ostupnß tlaÞÝtka:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "P°id&at ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&TlaÞÝtka panelu:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zav°Ýt" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Dnes:" + IDM_GOTODAY "Jdi na dne?ek" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "OddýlovaÞ" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "«ßdn²" +} _____ Modified: trunk/reactos/lib/comctl32/comctl_De.rc --- trunk/reactos/lib/comctl32/comctl_De.rc 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl_De.rc 2005-10-08 13:20:03 UTC (rev 18329) @@ -1,87 +1,87 @@ -/* - * Copyright 2000 Uwe Bonnes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Schlie?en" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Heute:" - IDM_GOTODAY "Gehe zu Heute" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Trennzeichen" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Keiner" -} - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften f³r " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Zur³ck", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 - PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbar einrichten" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Schlie?en", IDCANCEL,308,6,44,14 - PUSHBUTTON "&Zur³cksetzen", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "&Vorhandene Kn÷pfe:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "H&inzuf³gen ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &L÷schen", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbarkn÷pfe:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END +/* + * Copyright 2000 Uwe Bonnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Schlie?en" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Heute:" + IDM_GOTODAY "Gehe zu Heute" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Trennzeichen" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Keiner" +} + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Eigenschaften f³r " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Zur³ck", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Toolbar einrichten" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Schlie?en", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Zur³cksetzen", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Vorhandene Kn÷pfe:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "H&inzuf³gen ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &L÷schen", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Toolbarkn÷pfe:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/comctl32/comctl_En.rc --- trunk/reactos/lib/comctl32/comctl_En.rc 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl_En.rc 2005-10-08 13:20:03 UTC (rev 18329) @@ -1,87 +1,87 @@ -/* - * Copyright 1999 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14 - PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Close" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separator" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "None" -} +/* + * Copyright 1999 Eric Kohl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Properties for " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14 + PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Customize Toolbar" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "A&vailable buttons:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Toolbar buttons:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Close" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Today:" + IDM_GOTODAY "Go to today" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Separator" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "None" +} _____ Modified: trunk/reactos/lib/comctl32/comctl_Es.rc --- trunk/reactos/lib/comctl32/comctl_Es.rc 2005-10-08 12:47:53 UTC (rev 18328) +++ trunk/reactos/lib/comctl32/comctl_Es.rc 2005-10-08 13:20:03 UTC (rev 18329) @@ -1,87 +1,87 @@ -/* - * Copyright 2003 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ayudante" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 - PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalizar barra de herramientas" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Botones &disponibles:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "A&±adir ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "B&otones de la barra:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Cerrar" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Hoy:" - IDM_GOTODAY "Ir a hoy" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separador" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Ninguno" -} +/* + * Copyright 2003 JosÚ Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * [truncated at 1000 lines; 4838 more skipped]

1 0

[blight] 18328: Add 'break_on_module_load' option to KDB. When enabled KDB will be entered for each module beeing loaded, and one can set
by blight＠svn.reactos.com 08 Oct '05

08 Oct '05

Add 'break_on_module_load' option to KDB. When enabled KDB will be entered for each module beeing loaded, and one can set breakpoints etc. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/ke/process.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-10-08 12:43:38 UTC (rev 18327) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-10-08 12:47:53 UTC (rev 18328) @@ -85,6 +85,7 @@ /* GLOBALS *******************************************************************/ STATIC BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ +STATIC BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ STATIC CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */ STATIC PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */ @@ -1527,6 +1528,7 @@ KdbpPrint("Available settings:\n"); KdbpPrint(" syntax [intel|at&t]\n"); KdbpPrint(" condition [exception|*] [first|last] [never|always|kmode|umode]\n"); + KdbpPrint(" break_on_module_load [true|false]\n"); } else if (strcmp(Argv[1], "syntax") == 0) { @@ -1641,6 +1643,22 @@ } } } + else if (strcmp(Argv[1], "break_on_module_load") == 0) + { + if (Argc == 2) + KdbpPrint("break_on_module_load = %s\n", KdbBreakOnModuleLoad ? "enabled" : "disabled"); + else if (Argc >= 3) + { + if (_stricmp(Argv[2], "enable") == 0 || _stricmp(Argv[2], "enabled") == 0 || + _stricmp(Argv[2], "true") == 0) + KdbBreakOnModuleLoad = TRUE; + else if (_stricmp(Argv[2], "disable") == 0 || _stricmp(Argv[2], "disabled") == 0 || + _stricmp(Argv[2], "false") == 0) + KdbBreakOnModuleLoad = FALSE; + else + KdbpPrint("Unknown setting '%s'.\n", Argv[2]); + } + } else KdbpPrint("Unknown setting '%s'.\n", Argv[1]); @@ -1731,7 +1749,7 @@ if ((KdbNumberOfRowsTerminal < 0) || (KdbNumberOfColsTerminal < 0) || (KdbNumberOfRowsPrinted) == 0) /* Refresh terminal size each time when number of rows printed is 0 */ { - if ((KdbDebugState & KD_DEBUG_KDSERIAL) && TerminalReportsSize) + if ((KdbDebugState & KD_DEBUG_KDSERIAL) && TerminalConnected && TerminalReportsSize) { /* Try to query number of rows from terminal. A reply looks like "\x1b[8;24;80t" */ TerminalReportsSize = FALSE; @@ -1805,7 +1823,8 @@ /*DbgPrint("!%d!%d!%d!%d!", KdbNumberOfRowsPrinted, KdbNumberOfColsPrinted, i, RowsPrintedByTerminal);*/ /* Display a prompt if we printed one screen full of text */ - if ((LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal) + if (KdbNumberOfRowsTerminal > 0 && + (LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal) { if (KdbNumberOfColsPrinted > 0) DbgPrint("\n"); @@ -2246,7 +2265,8 @@ VOID KdbpCliModuleLoaded(IN PUNICODE_STRING Name) { - return; + if (!KdbBreakOnModuleLoad) + return; DbgPrint("Module %wZ loaded.\n", Name); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-10-08 12:43:38 UTC (rev 18327) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-10-08 12:47:53 UTC (rev 18328) @@ -205,7 +205,6 @@ KiSwapProcess(PKPROCESS NewProcess, PKPROCESS OldProcess) { - /* FIXME: Write this in ASM. Much easier */ DPRINT("Switching CR3 to: %x\n", NewProcess->DirectoryTableBase.u.LowPart); Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs