Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30229: All PnP IRPs must be initialized with STATUS_NOT_SUPPORTED
by hpoussin＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: hpoussin Date: Wed Nov 7 00:37:37 2007 New Revision: 30229 URL: http://svn.reactos.org/svn/reactos?rev=30229&view=rev Log: All PnP IRPs must be initialized with STATUS_NOT_SUPPORTED Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Nov 7 00:37:37 2007 @@ -154,7 +154,7 @@ &IoStatusBlock, IRP_MN_FILTER_RESOURCE_REQUIREMENTS, &Stack); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED) { DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); return Status; @@ -205,7 +205,7 @@ } else { - if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) + if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) { DPRINT("Device needs enumeration, invalidating bus relations\n"); /* Invalidate device relations synchronously @@ -969,12 +969,8 @@ &Event, IoStatusBlock); - /* Most of PNP IRPs are initialized with a status code of - STATUS_NOT_IMPLEMENTED */ - if (MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) - Irp->IoStatus.Status = STATUS_SUCCESS; - else - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + /* PNP IRPs are initialized with a status code of STATUS_NOT_SUPPORTED */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IrpSp = IoGetNextIrpStackLocation(Irp); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Wed Nov 7 00:37:37 2007 @@ -63,10 +63,6 @@ /* we don't need to call AddDevice and send IRP_MN_START_DEVICE */ - /* FIXME: save this device into the root-enumerated list, so this - * device would be detected as a PnP device during next startups. - */ - return Status; }

1 0

[hpoussin] 30228: Simplify code
by hpoussin＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: hpoussin Date: Wed Nov 7 00:36:47 2007 New Revision: 30228 URL: http://svn.reactos.org/svn/reactos?rev=30228&view=rev Log: Simplify code Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ob/obinit.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Wed Nov 7 00:36:47 2007 @@ -149,7 +149,7 @@ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ - Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + Prcb = KiProcessorBlock[i]; DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); /* Set the Large IRP List */ Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3022… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Wed Nov 7 00:36:47 2007 @@ -33,7 +33,7 @@ if (TargetSet & Current) { /* Get the PRCB for this CPU */ - Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + Prcb = KiProcessorBlock[i]; InterlockedBitTestAndSet((PLONG)&Prcb->IpiFrozen, IpiRequest); HalRequestIpi(i); @@ -69,7 +69,7 @@ { if (TargetSet & Processor) { - Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + Prcb = KiProcessorBlock[i]; while (0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); InterlockedBitTestAndSet((PLONG)&Prcb->IpiFrozen, IPI_SYNCH_REQUEST); if (Processor != CurrentPrcb->SetMember) Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Wed Nov 7 00:36:47 2007 @@ -480,7 +480,7 @@ #ifdef CONFIG_SMP /* Get the KNODE and its PRCB */ Node = KeNodeBlock[Process->IdealNode]; - NodePrcb = ((PKPCR)(KIP0PCRADDRESS + Process->ThreadSeed * PAGE_SIZE))->Prcb; + NodePrcb = KiProcessorBlock[Process->ThreadSeed]; /* Calculate affinity mask */ Set = ~NodePrcb->MultiThreadProcessorSet; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Wed Nov 7 00:36:47 2007 @@ -67,7 +67,7 @@ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ - Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + Prcb = KiProcessorBlock[(int)i]; /* Set the OBJECT_CREATE_INFORMATION List */ Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCiLookasideList.L;

1 0

[greatlrd] 30227: add 37 more guids for ksguid.a
by greatlrd＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: greatlrd Date: Wed Nov 7 00:12:30 2007 New Revision: 30227 URL: http://svn.reactos.org/svn/reactos?rev=30227&view=rev Log: add 37 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Wed Nov 7 00:12:30 2007 @@ -49,9 +49,46 @@ DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); +DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); +DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); +DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); +DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); +DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); +DEFINE_GUID(KSNODETYPE_SWMIDI, 0xCB9BEFA0, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSNODETYPE_SWSYNTH, 0x423274A0, 0x8B81, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSNODETYPE_SYNTHESIZER, 0xDFF220F3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MULTITRACK_RECORDER, 0xDFF220F2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_RADIO_TRANSMITTER, 0xDFF220F1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_RADIO_RECEIVER, 0xDFF220F0, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DSS_AUDIO, 0xDFF220EF, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_CABLE_TUNER_AUDIO, 0xDFF220EE, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SATELLITE_RECEIVER_AUDIO, 0xDFF220ED, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_TV_TUNER_AUDIO, 0xDFF220EC, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_DVD_AUDIO, 0xDFF220EB, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_VIDEO_DISC_AUDIO, 0xDFF220EA, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96);

1 0

[gedmurphy] 30226: - fix various bugs in the .rdp parser - add code to allow querying of key value pairs
by gedmurphy＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: gedmurphy Date: Tue Nov 6 23:36:31 2007 New Revision: 30226 URL: http://svn.reactos.org/svn/reactos?rev=30226&view=rev Log: - fix various bugs in the .rdp parser - add code to allow querying of key value pairs Added: trunk/reactos/base/applications/mstsc/todo.h (with props) Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj trunk/reactos/base/applications/mstsc/rdpfile.c trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Tue Nov 6 23:36:31 2007 @@ -22,7 +22,9 @@ #include <commctrl.h> #include <stdio.h> #include <tchar.h> +#include <todo.h> #include "resource.h" + #define MAX_KEY_NAME 255 @@ -62,6 +64,7 @@ typedef struct _INFO { + PRDPSETTINGS pRdpSettings; PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; HWND hSelf; @@ -206,11 +209,11 @@ } pInfo->hConn = LoadImage(hInst, - MAKEINTRESOURCE(IDI_CONN), - IMAGE_ICON, - 32, - 32, - LR_DEFAULTCOLOR); + MAKEINTRESOURCE(IDI_CONN), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); if (pInfo->hConn) { SendDlgItemMessage(pInfo->hGeneralPage, @@ -221,6 +224,10 @@ } FillServerAddesssCombo(pInfo); + + /* add address */ + //GetStringFromSettings(pInfo->pRdpSettings, L"full address"); + } @@ -239,6 +246,18 @@ pInfo->hGeneralPage = hDlg; GeneralOnInit(pInfo); return TRUE; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_SAVE: + + break; + } + + break; + } case WM_CLOSE: { @@ -789,7 +808,7 @@ BOOL bRet = FALSE; pInfo = HeapAlloc(GetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, sizeof(INFO)); if (pInfo) { @@ -797,12 +816,17 @@ GWLP_USERDATA, (LONG_PTR)pInfo); - pInfo->hHeader = LoadImage(hInst, - MAKEINTRESOURCE(IDB_HEADER), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); + /* read the default .rdp file */ + pInfo->pRdpSettings = LoadRdpSettingsFromFile(NULL); + if (!pInfo->pRdpSettings) + return FALSE; + + pInfo->hHeader = (HBITMAP)LoadImage(hInst, + MAKEINTRESOURCE(IDB_HEADER), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); if (pInfo->hHeader) { GetObject(pInfo->hHeader, sizeof(BITMAP), &pInfo->headerbitmap); @@ -840,8 +864,6 @@ } OnTabWndSelChange(pInfo); - - bRet = TRUE; } } @@ -888,7 +910,6 @@ switch(LOWORD(wParam)) { - break; } break; @@ -943,9 +964,25 @@ case WM_CLOSE: { if (pInfo) + { + if (pInfo->pRdpSettings) + { + if (pInfo->pRdpSettings->pSettings) + { + HeapFree(GetProcessHeap(), + 0, + pInfo->pRdpSettings->pSettings); + } + + HeapFree(GetProcessHeap(), + 0, + pInfo->pRdpSettings); + } + HeapFree(GetProcessHeap(), 0, pInfo); + } EndDialog(hDlg, 0); } Modified: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Tue Nov 6 23:36:31 2007 @@ -633,6 +633,10 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > + <File + RelativePath=".\todo.h" + > + </File> </Filter> <Filter Name="Resource Files" Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Tue Nov 6 23:36:31 2007 @@ -1,22 +1,9 @@ #include <windows.h> -#include <commctrl.h> #include <stdio.h> #include <tchar.h> #include <shlobj.h> +#include <todo.h> #include "resource.h" - -#define MAXKEY 256 -#define MAXVALUE 256 - -typedef struct _Settings -{ - WCHAR Key[MAXKEY]; - WCHAR Type; // holds 'i' or 's' - union { - INT i; - WCHAR s[MAXVALUE]; - } Value; -} SETTINGS, *PSETTINGS; #define NUM_SETTINGS 6 LPWSTR lpSettings[NUM_SETTINGS] = @@ -30,6 +17,61 @@ }; + +INT +GetIntegerFromSettings(PRDPSETTINGS pRdpSettings, + LPWSTR lpKey) +{ + INT Value = -1; + + if (pRdpSettings) + { + INT i; + + for (i = 0; i < pRdpSettings->NumSettings; i++) + { + if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) + { + if (pRdpSettings->pSettings[i].Type == L'i') + { + Value = pRdpSettings->pSettings[i].Value.i; + break; + } + } + } + } + + return Value; +} + + +LPWSTR +GetStringFromSettings(PRDPSETTINGS pRdpSettings, + LPWSTR lpKey) +{ + LPWSTR lpValue = NULL; + + if (pRdpSettings) + { + INT i; + + for (i = 0; i < pRdpSettings->NumSettings; i++) + { + if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) + { + if (pRdpSettings->pSettings[i].Type == L's') + { + lpValue = pRdpSettings->pSettings[i].Value.s; + break; + } + } + } + } + + return lpValue; +} + + static BOOL WriteRdpFile(HANDLE hFile, PSETTINGS pSettings) @@ -38,15 +80,15 @@ } -static PSETTINGS -ParseSettings(LPWSTR lpBuffer) -{ - PSETTINGS pSettings; +static VOID +ParseSettings(PRDPSETTINGS pRdpSettings, + LPWSTR lpBuffer) +{ LPWSTR lpStr = lpBuffer; WCHAR lpKey[MAXKEY]; WCHAR lpValue[MAXVALUE]; INT NumSettings = 0; - INT s; + INT s, structsize; if (lpStr) { @@ -60,17 +102,19 @@ lpStr = lpBuffer; if (NumSettings == 0) - return NULL; + return; /* move past unicode byte order */ if (lpStr[0] == 0xFEFF || lpStr[0] == 0xFFFE) lpStr += 1; - pSettings = HeapAlloc(GetProcessHeap(), - 0, - sizeof(SETTINGS) * NumSettings); - if (pSettings) - { + pRdpSettings->pSettings = HeapAlloc(GetProcessHeap(), + 0, + sizeof(SETTINGS) * NumSettings); + if (pRdpSettings->pSettings) + { + pRdpSettings->NumSettings = NumSettings; + for (s = 0; s < NumSettings; s++) { INT i = 0, k, temp; @@ -86,12 +130,12 @@ { if (wcscmp(lpSettings[k], lpKey) == 0) { - wcscpy(pSettings[s].Key, lpKey); + wcscpy(pRdpSettings->pSettings[s].Key, lpKey); /* get the type */ lpStr++; if (*lpStr == L'i' || *lpStr == L's') - pSettings[s].Type = *lpStr; + pRdpSettings->pSettings[s].Type = *lpStr; lpStr += 2; @@ -103,18 +147,16 @@ } lpValue[i] = 0; - if (pSettings[s].Type == L'i') + if (pRdpSettings->pSettings[s].Type == L'i') { - pSettings[s].Value.i = _wtoi(lpValue); - pSettings[s].Value.s[0] = 0; + pRdpSettings->pSettings[s].Value.i = _wtoi(lpValue); } - else if (pSettings[s].Type == L's') + else if (pRdpSettings->pSettings[s].Type == L's') { - pSettings[s].Value.i = 0; - wcscpy(pSettings[s].Value.s, lpValue); + wcscpy(pRdpSettings->pSettings[s].Value.s, lpValue); } else - pSettings[s].Type = 0; + pRdpSettings->pSettings[s].Type = 0; } } @@ -127,9 +169,8 @@ } } } - - return pSettings; -} +} + static LPWSTR ReadRdpFile(HANDLE hFile) @@ -171,6 +212,7 @@ return lpBuffer; } + static HANDLE OpenRdpFile(LPWSTR path, BOOL bWrite) @@ -200,10 +242,10 @@ } -PSETTINGS +PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile) { - PSETTINGS pSettings = NULL; + PRDPSETTINGS pRdpSettings; WCHAR pszPath[MAX_PATH]; HANDLE hFile; @@ -224,6 +266,7 @@ { wcscat(pszPath, L"\\Default.rdp"); lpFile = pszPath; + CoTaskMemFree(lpidl); } } } @@ -232,22 +275,28 @@ { LPWSTR lpBuffer = NULL; - hFile = OpenRdpFile(lpFile, FALSE); - if (hFile) - { - lpBuffer = ReadRdpFile(hFile); - if (lpBuffer) - { - pSettings = ParseSettings(lpBuffer); - - HeapFree(GetProcessHeap(), - 0, - lpBuffer); - } - - CloseRdpFile(hFile); - } - } - - return pSettings; -} + pRdpSettings = HeapAlloc(GetProcessHeap(), + 0, + sizeof(RDPSETTINGS)); + if (pRdpSettings) + { + hFile = OpenRdpFile(lpFile, FALSE); + if (hFile) + { + lpBuffer = ReadRdpFile(hFile); + if (lpBuffer) + { + ParseSettings(pRdpSettings, lpBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + } + + CloseRdpFile(hFile); + } + } + } + + return pRdpSettings; +} Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Tue Nov 6 23:36:31 2007 @@ -16,11 +16,10 @@ #define IDC_CONNICON 1017 #define IDC_REMICON 1018 #define IDC_COLORSICON 1019 +#define IDC_COLORIMAGE 1020 -#define IDB_HEADER 1016 -#define IDB_SPECT 1017 - -#define IDC_COLORIMAGE 1018 +#define IDB_HEADER 1100 +#define IDB_SPECT 1101 #define IDI_LOGON 2000 #define IDI_CONN 2001 Added: trunk/reactos/base/applications/mstsc/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/to… ============================================================================== --- trunk/reactos/base/applications/mstsc/todo.h (added) +++ trunk/reactos/base/applications/mstsc/todo.h Tue Nov 6 23:36:31 2007 @@ -1,0 +1,23 @@ +#define MAXKEY 256 +#define MAXVALUE 256 + +typedef struct _SETTINGS +{ + WCHAR Key[MAXKEY]; + WCHAR Type; // holds 'i' or 's' + union { + INT i; + WCHAR s[MAXVALUE]; + } Value; +} SETTINGS, *PSETTINGS; + +typedef struct _RDPSETTINGS +{ + PSETTINGS pSettings; + INT NumSettings; +} RDPSETTINGS, *PRDPSETTINGS; + + +PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); +INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); +LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); Propchange: trunk/reactos/base/applications/mstsc/todo.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Tue Nov 6 23:36:31 2007 @@ -1338,14 +1338,14 @@ WSAStartup(MAKEWORD(2, 0), &d); - if (mi_process_cl(lpCmdLine)) - { + //if (mi_process_cl(lpCmdLine)) + //{ if (OpenRDPConnectDialog(hInstance)) { ui_main(); ret = 0; } - } + //} else mi_show_params();

1 0

[janderwald] 30225: - fix alignment of checkboxes for general dialog
by janderwald＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: janderwald Date: Tue Nov 6 20:31:37 2007 New Revision: 30225 URL: http://svn.reactos.org/svn/reactos?rev=30225&view=rev Log: - fix alignment of checkboxes for general dialog Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Èçïîëçâàí:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Ïðèíàäëåæíîñòè", 14020, 8, 190, 45, 10 - CHECKBOX "Ñàìî çà &÷åòåíå", 14021, 58, 190, 67, 10 + LTEXT "Ïðèíàäëåæíîñòè", 14020, 8, 189, 45, 10 + CHECKBOX "Ñàìî çà &÷åòåíå", 14021, 58, 189, 67, 10 CHECKBOX "Ñ&êðèò", 14022, 126, 189, 50, 10 CHECKBOX "&Ñáèò", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Tue Nov 6 20:31:37 2007 @@ -229,8 +229,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Zugegriffen:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attribute:", 14020, 8, 190, 45, 10 - CHECKBOX "&Schreibgeschützt", 14021, 58, 190, 67, 10 + LTEXT "Attribute:", 14020, 8, 189, 45, 10 + CHECKBOX "&Schreibgeschützt", 14021, 45, 189, 67, 10 CHECKBOX "&Versteckt", 14022, 126, 189, 50, 10 CHECKBOX "&Archiv", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Tue Nov 6 20:31:37 2007 @@ -231,8 +231,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accédé:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributs:", 14020, 8, 190, 45, 10 - CHECKBOX "Lectu&re-seule", 14021, 58, 190, 67, 10 + LTEXT "Attributs:", 14020, 8, 189, 45, 10 + CHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10 CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Tue Nov 6 20:31:37 2007 @@ -230,8 +230,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Tue Nov 6 20:31:37 2007 @@ -229,8 +229,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Tue Nov 6 20:31:37 2007 @@ -229,8 +229,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Îòêðûò:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Àòðèáóòû:", 14020, 8, 190, 45, 10 - CHECKBOX "Òîëüêî &÷òåíèå", 14021, 58, 190, 67, 10 + LTEXT "Àòðèáóòû:", 14020, 8, 189, 45, 10 + CHECKBOX "Òîëüêî &÷òåíèå", 14021, 58, 189, 67, 10 CHECKBOX "Ñêð&ûòûé", 14022, 126, 189, 50, 10 CHECKBOX "&Àðõèâíûé", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Tue Nov 6 20:31:37 2007 @@ -227,8 +227,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Tue Nov 6 20:31:37 2007 @@ -228,8 +228,8 @@ LTEXT "", 14017, 68, 140, 160, 10 LTEXT "Accessed:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 + LTEXT "Attributes:", 14020, 8, 189, 45, 10 + CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END

1 0

[gedmurphy] 30224: finish functionality to read .rdp files
by gedmurphy＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: gedmurphy Date: Tue Nov 6 18:48:10 2007 New Revision: 30224 URL: http://svn.reactos.org/svn/reactos?rev=30224&view=rev Log: finish functionality to read .rdp files Modified: trunk/reactos/base/applications/mstsc/rdpfile.c Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Tue Nov 6 18:48:10 2007 @@ -2,6 +2,7 @@ #include <commctrl.h> #include <stdio.h> #include <tchar.h> +#include <shlobj.h> #include "resource.h" #define MAXKEY 256 @@ -47,11 +48,7 @@ INT NumSettings = 0; INT s; - /* move past unicode byte order */ - if (lpBuffer[0] == 0xFEFF || lpBuffer[0] == 0xFFFE) - lpBuffer += 1; - - if (lpBuffer) + if (lpStr) { /* get number of settings */ while (*lpStr) @@ -62,8 +59,12 @@ } lpStr = lpBuffer; - if (!NumSettings) + if (NumSettings == 0) return NULL; + + /* move past unicode byte order */ + if (lpStr[0] == 0xFEFF || lpStr[0] == 0xFFFE) + lpStr += 1; pSettings = HeapAlloc(GetProcessHeap(), 0, @@ -105,9 +106,11 @@ if (pSettings[s].Type == L'i') { pSettings[s].Value.i = _wtoi(lpValue); + pSettings[s].Value.s[0] = 0; } else if (pSettings[s].Type == L's') { + pSettings[s].Value.i = 0; wcscpy(pSettings[s].Value.s, lpValue); } else @@ -115,7 +118,7 @@ } } - // move onto next setting + /* move onto next setting */ while (*lpStr != L'\n') { lpStr++; @@ -142,7 +145,7 @@ { lpBuffer = HeapAlloc(GetProcessHeap(), 0, - BytesToRead + 1); + BytesToRead + 2); if (lpBuffer) { bRes = ReadFile(hFile, @@ -170,19 +173,19 @@ } static HANDLE -OpenRdpFile(LPTSTR path, BOOL bWrite) +OpenRdpFile(LPWSTR path, BOOL bWrite) { HANDLE hFile; if (path) { - hFile = CreateFile(path, - bWrite ? GENERIC_WRITE : GENERIC_READ, - 0, - NULL, - bWrite ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); + hFile = CreateFileW(path, + bWrite ? GENERIC_WRITE : GENERIC_READ, + 0, + NULL, + bWrite ? CREATE_ALWAYS : OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); } return hFile; @@ -196,3 +199,55 @@ CloseHandle(hFile); } + +PSETTINGS +LoadRdpSettingsFromFile(LPWSTR lpFile) +{ + PSETTINGS pSettings = NULL; + WCHAR pszPath[MAX_PATH]; + HANDLE hFile; + + /* use default file */ + if (lpFile == NULL) + { + HRESULT hr; + LPITEMIDLIST lpidl= NULL; + + hr = SHGetFolderLocation(NULL, + CSIDL_PERSONAL, + NULL, + 0, + &lpidl); + if (hr == S_OK) + { + if (SHGetPathFromIDListW(lpidl, pszPath)) + { + wcscat(pszPath, L"\\Default.rdp"); + lpFile = pszPath; + } + } + } + + if (lpFile) + { + LPWSTR lpBuffer = NULL; + + hFile = OpenRdpFile(lpFile, FALSE); + if (hFile) + { + lpBuffer = ReadRdpFile(hFile); + if (lpBuffer) + { + pSettings = ParseSettings(lpBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + } + + CloseRdpFile(hFile); + } + } + + return pSettings; +}

1 0

[hpoussin] 30223: Fix some compilation errors in ntkrnlmp (code has not been tested, so it is probably wrong)
by hpoussin＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: hpoussin Date: Tue Nov 6 17:34:32 2007 New Revision: 30223 URL: http://svn.reactos.org/svn/reactos?rev=30223&view=rev Log: Fix some compilation errors in ntkrnlmp (code has not been tested, so it is probably wrong) Modified: trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3022… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Tue Nov 6 17:34:32 2007 @@ -24,17 +24,18 @@ IN ULONG IpiRequest) { #ifdef CONFIG_SMP -#error VerifyMe! LONG i; - PKPCR Pcr; + PKPRCB Prcb; KAFFINITY Current; for (i = 0, Current = 1; i < KeNumberProcessors; i++, Current <<= 1) { if (TargetSet & Current) { - Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - Ke386TestAndSetBit(IpiRequest, (PULONG)&Pcr->Prcb->IpiFrozen); + /* Get the PRCB for this CPU */ + Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + + InterlockedBitTestAndSet((PLONG)&Prcb->IpiFrozen, IpiRequest); HalRequestIpi(i); } } @@ -50,12 +51,10 @@ IN BOOLEAN Synchronize) { #ifdef CONFIG_SMP -#error VerifyMe! KAFFINITY Processor; LONG i; PKPRCB Prcb, CurrentPrcb; KIRQL oldIrql; - ASSERT(KeGetCurrentIrql() == SYNCH_LEVEL); @@ -70,9 +69,9 @@ { if (TargetSet & Processor) { - Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; - while(0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); - Ke386TestAndSetBit(IPI_SYNCH_REQUEST, (PULONG)&Prcb->IpiFrozen); + Prcb = ((PKPCR)(KIP0PCRADDRESS + i * PAGE_SIZE))->Prcb; + while (0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); + InterlockedBitTestAndSet((PLONG)&Prcb->IpiFrozen, IPI_SYNCH_REQUEST); if (Processor != CurrentPrcb->SetMember) { HalRequestIpi(i); @@ -99,32 +98,31 @@ IN PVOID ExceptionFrame) { #ifdef CONFIG_SMP -#error VerifyMe! PKPRCB Prcb; ASSERT(KeGetCurrentIrql() == IPI_LEVEL); Prcb = KeGetCurrentPrcb(); - if (Ke386TestAndClearBit(IPI_APC, (PULONG)&Prcb->IpiFrozen)) + if (InterlockedBitTestAndReset((PLONG)&Prcb->IpiFrozen, IPI_APC)) { HalRequestSoftwareInterrupt(APC_LEVEL); } - if (Ke386TestAndClearBit(IPI_DPC, (PULONG)&Prcb->IpiFrozen)) + if (InterlockedBitTestAndReset((PLONG)&Prcb->IpiFrozen, IPI_DPC)) { Prcb->DpcInterruptRequested = TRUE; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } - if (Ke386TestAndClearBit(IPI_SYNCH_REQUEST, (PULONG)&Prcb->IpiFrozen)) + if (InterlockedBitTestAndReset((PLONG)&Prcb->IpiFrozen, IPI_SYNCH_REQUEST)) { (void)InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { while (0 != InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[1], 0, 0)); } - ((VOID (STDCALL*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->CurrentPacket[0]); - Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), (PULONG)&Prcb->SignalDone->TargetSet); + ((VOID (NTAPI*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->CurrentPacket[0]); + InterlockedBitTestAndReset((PLONG)&Prcb->SignalDone->TargetSet, KeGetCurrentProcessorNumber()); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { while (0 != InterlockedCompareExchangeUL(&Prcb->SignalDone->TargetSet, 0, 0)); Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c Tue Nov 6 17:34:32 2007 @@ -26,24 +26,24 @@ /* Set the new lock */ Prev = (PKSPIN_LOCK_QUEUE) - InterlockedExchange((PLONG)LockHandle->LockQueue.Lock, + InterlockedExchange((PLONG)LockHandle->Next, (LONG)LockHandle); if (!Prev) { /* There was nothing there before. We now own it */ - *(ULONG_PTR*)&LockHandle->LockQueue.Lock |= LQ_OWN; + *LockHandle->Lock |= LQ_OWN; return; } /* Set the wait flag */ - *(ULONG_PTR*)&LockHandle->LockQueue.Lock |= LQ_WAIT; + *LockHandle->Lock |= LQ_WAIT; /* Link us */ Prev->Next = (PKSPIN_LOCK_QUEUE)LockHandle; /* Loop and wait */ - while ( *(ULONG_PTR*)&LockHandle->LockQueue.Lock & LQ_WAIT) YieldProcessor(); - return; + while (*LockHandle->Lock & LQ_WAIT) + YieldProcessor(); #endif } @@ -56,31 +56,31 @@ PKSPIN_LOCK_QUEUE Waiter; /* Remove own and wait flags */ - *(ULONG_PTR*)&LockHandle->LockQueue.Lock &= ~(LQ_OWN | LQ_WAIT); - LockVal = *LockHandle->LockQueue.Lock; + *LockHandle->Lock &= ~(LQ_OWN | LQ_WAIT); + LockVal = *LockHandle->Lock; /* Check if we already own it */ if (LockVal == (KSPIN_LOCK)LockHandle) { /* Disown it */ LockVal = (KSPIN_LOCK) - InterlockedCompareExchangePointer(LockHandle->LockQueue.Lock, + InterlockedCompareExchangePointer(LockHandle->Lock, NULL, LockHandle); } if (LockVal == (KSPIN_LOCK)LockHandle) return; /* Need to wait for it */ - Waiter = LockHandle->LockQueue.Next; + Waiter = LockHandle->Next; while (!Waiter) { YieldProcessor(); - Waiter = LockHandle->LockQueue.Next; + Waiter = LockHandle->Next; } /* It's gone */ *(ULONG_PTR*)&Waiter->Lock ^= (LQ_OWN | LQ_WAIT); - LockHandle->LockQueue.Next = NULL; + LockHandle->Next = NULL; #endif } @@ -211,8 +211,7 @@ /* Set it up properly */ LockHandle->LockQueue.Next = NULL; LockHandle->LockQueue.Lock = SpinLock; - KeAcquireQueuedSpinLockAtDpcLevel((PKLOCK_QUEUE_HANDLE) - &LockHandle->LockQueue.Next); + KeAcquireQueuedSpinLockAtDpcLevel(LockHandle->LockQueue.Next); #endif } @@ -225,8 +224,7 @@ { #ifdef CONFIG_SMP /* Call the internal function */ - KeReleaseQueuedSpinLockFromDpcLevel((PKLOCK_QUEUE_HANDLE) - &LockHandle->LockQueue.Next); + KeReleaseQueuedSpinLockFromDpcLevel(LockHandle->LockQueue.Next); #endif } Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Tue Nov 6 17:34:32 2007 @@ -480,7 +480,7 @@ #ifdef CONFIG_SMP /* Get the KNODE and its PRCB */ Node = KeNodeBlock[Process->IdealNode]; - NodePrcb = (PKPRCB)(KPCR_BASE + (Process->ThreadSeed * PAGE_SIZE)); + NodePrcb = ((PKPCR)(KIP0PCRADDRESS + Process->ThreadSeed * PAGE_SIZE))->Prcb; /* Calculate affinity mask */ Set = ~NodePrcb->MultiThreadProcessorSet; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Tue Nov 6 17:34:32 2007 @@ -75,22 +75,23 @@ BOOLEAN MmUnmapPageTable(PULONG Pt); -VOID -STDCALL -MiFlushTlbIpiRoutine(PVOID Address) -{ - if (Address == (PVOID)0xffffffff) +ULONG_PTR +NTAPI +MiFlushTlbIpiRoutine(ULONG_PTR Address) +{ + if (Address == (ULONG_PTR)-1) { KeFlushCurrentTb(); } - else if (Address == (PVOID)0xfffffffe) + else if (Address == (ULONG_PTR)-2) { KeFlushCurrentTb(); } else { - __invlpg(Address); - } + __invlpg((PVOID)Address); + } + return 0; } VOID @@ -101,13 +102,13 @@ { MmUnmapPageTable(Pt); } - if (KeNumberProcessors>1) - { - KeIpiGenericCall(MiFlushTlbIpiRoutine, Address); - } - else - { - MiFlushTlbIpiRoutine(Address); + if (KeNumberProcessors > 1) + { + KeIpiGenericCall(MiFlushTlbIpiRoutine, (ULONG_PTR)Address); + } + else + { + MiFlushTlbIpiRoutine((ULONG_PTR)Address); } #else if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart)

1 0

[hpoussin] 30222: Add missing IDS_APPNAME in French translation
by hpoussin＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: hpoussin Date: Tue Nov 6 17:06:58 2007 New Revision: 30222 URL: http://svn.reactos.org/svn/reactos?rev=30222&view=rev Log: Add missing IDS_APPNAME in French translation Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc Tue Nov 6 17:06:58 2007 @@ -18,8 +18,6 @@ BEGIN MENUITEM "Óñòðîéñòâàòà ñïîðåä âèä", IDC_DEVBYTYPE, CHECKED MENUITEM "Óñòðîéñòâàòà ñïîðåä ñâúðçâàíåòî", IDC_STATIC, GRAYED -/* MENUITEM "Resources by type", IDC_STATIC, GRAYED */ -/* MENUITEM "Resources by connection", IDC_STATIC, GRAYED */ MENUITEM "Ñðåäñòâàòà ñïîðåä âèäà", IDC_STATIC, GRAYED MENUITEM "Ñðåäñòâàòà ñïîðåä ñâúðçâàíåòî", IDC_STATIC, GRAYED END @@ -72,7 +70,6 @@ IDS_HINT_EXIT " Èçëèçà îò ïðèëîæåíèåòî." IDS_HINT_REFRESH " Îïðåñíÿâà ñïèñúêà íà óñëóãèòå." IDS_HINT_PROP " Îòâàðÿ ëèñò çà ñâîéñòâà çà òåêóùèÿ èçáîð." - IDS_HINT_HELP " Ïîêàçâà ïîìîùåí ïðîçîðåö." IDS_HINT_ABOUT " Çà óïðàâèòåëÿ íà óñòðéñòâàòà íà ÐåàêòÎÑ." Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc Tue Nov 6 17:06:58 2007 @@ -65,6 +65,7 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN + IDS_APPNAME "Gestionnaire de périphériques ReactOS" IDS_HINT_BLANK " " IDS_HINT_EXIT " Quitte le programme." IDS_HINT_REFRESH " Actualise la liste des services."

1 0

[gedmurphy] 30221: Don't adjust the pointer inside the allocation function, otherwise we'll have trouble freeing it later
by gedmurphy＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: gedmurphy Date: Tue Nov 6 17:06:18 2007 New Revision: 30221 URL: http://svn.reactos.org/svn/reactos?rev=30221&view=rev Log: Don't adjust the pointer inside the allocation function, otherwise we'll have trouble freeing it later Modified: trunk/reactos/base/applications/mstsc/rdpfile.c Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Tue Nov 6 17:06:18 2007 @@ -46,6 +46,10 @@ WCHAR lpValue[MAXVALUE]; INT NumSettings = 0; INT s; + + /* move past unicode byte order */ + if (lpBuffer[0] == 0xFEFF || lpBuffer[0] == 0xFFFE) + lpBuffer += 1; if (lpBuffer) { @@ -149,7 +153,6 @@ if (bRes) { lpBuffer[BytesRead / 2] = 0; - lpBuffer += 1; } else { @@ -192,3 +195,4 @@ if (hFile) CloseHandle(hFile); } +

1 0

[gedmurphy] 30220: add the start of functionality to read and write standard Microsoft .rdp files
by gedmurphy＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: gedmurphy Date: Tue Nov 6 16:53:34 2007 New Revision: 30220 URL: http://svn.reactos.org/svn/reactos?rev=30220&view=rev Log: add the start of functionality to read and write standard Microsoft .rdp files Added: trunk/reactos/base/applications/mstsc/rdpfile.c (with props) Modified: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Modified: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Tue Nov 6 16:53:34 2007 @@ -605,6 +605,10 @@ > </File> <File + RelativePath=".\rdpfile.c" + > + </File> + <File RelativePath=".\secure.c" > </File> Added: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (added) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Tue Nov 6 16:53:34 2007 @@ -1,0 +1,194 @@ +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> +#include <tchar.h> +#include "resource.h" + +#define MAXKEY 256 +#define MAXVALUE 256 + +typedef struct _Settings +{ + WCHAR Key[MAXKEY]; + WCHAR Type; // holds 'i' or 's' + union { + INT i; + WCHAR s[MAXVALUE]; + } Value; +} SETTINGS, *PSETTINGS; + +#define NUM_SETTINGS 6 +LPWSTR lpSettings[NUM_SETTINGS] = +{ + L"screen mode id", + L"desktopwidth", + L"desktopheight", + L"session bpp", + L"full address", + L"compression", +}; + + +static BOOL +WriteRdpFile(HANDLE hFile, + PSETTINGS pSettings) +{ + +} + + +static PSETTINGS +ParseSettings(LPWSTR lpBuffer) +{ + PSETTINGS pSettings; + LPWSTR lpStr = lpBuffer; + WCHAR lpKey[MAXKEY]; + WCHAR lpValue[MAXVALUE]; + INT NumSettings = 0; + INT s; + + if (lpBuffer) + { + /* get number of settings */ + while (*lpStr) + { + if (*lpStr == L'\n') + NumSettings++; + lpStr++; + } + lpStr = lpBuffer; + + if (!NumSettings) + return NULL; + + pSettings = HeapAlloc(GetProcessHeap(), + 0, + sizeof(SETTINGS) * NumSettings); + if (pSettings) + { + for (s = 0; s < NumSettings; s++) + { + INT i = 0, k, temp; + + /* get a key */ + while (*lpStr != L':') + { + lpKey[i++] = *lpStr++; + } + lpKey[i] = 0; + + for (k = 0; k < NUM_SETTINGS; k++) + { + if (wcscmp(lpSettings[k], lpKey) == 0) + { + wcscpy(pSettings[s].Key, lpKey); + + /* get the type */ + lpStr++; + if (*lpStr == L'i' || *lpStr == L's') + pSettings[s].Type = *lpStr; + + lpStr += 2; + + /* get a value */ + i = 0; + while (*lpStr != L'\r') + { + lpValue[i++] = *lpStr++; + } + lpValue[i] = 0; + + if (pSettings[s].Type == L'i') + { + pSettings[s].Value.i = _wtoi(lpValue); + } + else if (pSettings[s].Type == L's') + { + wcscpy(pSettings[s].Value.s, lpValue); + } + else + pSettings[s].Type = 0; + } + } + + // move onto next setting + while (*lpStr != L'\n') + { + lpStr++; + } + lpStr++; + } + } + } + + return pSettings; +} + +static LPWSTR +ReadRdpFile(HANDLE hFile) +{ + LPWSTR lpBuffer; + DWORD BytesToRead, BytesRead; + BOOL bRes; + + if (hFile) + { + BytesToRead = GetFileSize(hFile, NULL); + if (BytesToRead) + { + lpBuffer = HeapAlloc(GetProcessHeap(), + 0, + BytesToRead + 1); + if (lpBuffer) + { + bRes = ReadFile(hFile, + lpBuffer, + BytesToRead, + &BytesRead, + NULL); + if (bRes) + { + lpBuffer[BytesRead / 2] = 0; + lpBuffer += 1; + } + else + { + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + + lpBuffer = NULL; + } + } + } + } + + return lpBuffer; +} + +static HANDLE +OpenRdpFile(LPTSTR path, BOOL bWrite) +{ + HANDLE hFile; + + if (path) + { + hFile = CreateFile(path, + bWrite ? GENERIC_WRITE : GENERIC_READ, + 0, + NULL, + bWrite ? CREATE_ALWAYS : OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + } + + return hFile; +} + + +static VOID +CloseRdpFile(HANDLE hFile) +{ + if (hFile) + CloseHandle(hFile); +} Propchange: trunk/reactos/base/applications/mstsc/rdpfile.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007