Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[pschweitzer] 30239: - Silent last warning - Some code cleanup
by pschweitzer＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: pschweitzer Date: Wed Nov 7 15:12:02 2007 New Revision: 30239 URL: http://svn.reactos.org/svn/reactos?rev=30239&view=rev Log: - Silent last warning - Some code cleanup Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Wed Nov 7 15:12:02 2007 @@ -94,7 +94,6 @@ FILE *pFile; INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; - PVOID *res; WCHAR *ptr, *ptr2; TCHAR TTempLine[25+MAX_PATH]; WCHAR WTempLine[25+MAX_PATH]; @@ -106,16 +105,17 @@ pFile = _wfopen(optionsfile, L"r"); if (pFile) { - res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); - while (res) + while (fgets((char *)TTempLine, 24+MAX_PATH, pFile)) { MultiByteToWideChar(CP_ACP, 0, (char *)TTempLine, -1, WTempLine, sizeof(WTempLine)/sizeof(WTempLine[0])); ptr = wcstok(WTempLine, L" "); if (wcscmp(ptr, L"color") == 0) { ptr = wcstok(NULL, L" "); - LoadedSettings->background = strtoul((WCHAR*)&ptr[0], NULL, 16); - LoadedSettings->foreground = wcstoul(&ptr[1], NULL, 16); + ptr[2] = ptr[1]; + ptr[1] = 0; + LoadedSettings->background = wcstol(&ptr[0], NULL, 16); + LoadedSettings->foreground = wcstol(&ptr[2], NULL, 16); } else if (wcscmp(ptr, L"set") == 0) { @@ -124,19 +124,19 @@ ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) { - LoadedSettings->showtime = wcstoul(ptr2, NULL, 2); + LoadedSettings->showtime = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) { - LoadedSettings->useccache = wcstoul(ptr2, NULL, 2); + LoadedSettings->useccache = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) { - LoadedSettings->strip = wcstoul(ptr2, NULL, 2); + LoadedSettings->strip = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) { - LoadedSettings->writelog = wcstoul(ptr2, NULL, 2); + LoadedSettings->writelog = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) { @@ -157,7 +157,6 @@ } free(TTempLine); free(WTempLine); - res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); NbLines++; } fclose(pFile); @@ -186,18 +185,18 @@ SendDlgItemMessageW(hwnd, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); SetDlgItemText(hwnd, ID_LOGDIR, LoadedSettings->logdir); - SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); if (LoadedSettings->objdir[0] != 0) { LoadedSettings->objstate = 1; + SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); EnableWindow(GetDlgItem(hwnd, ID_BROWSEOBJ), TRUE); EnableWindow(GetDlgItem(hwnd, ID_OBJDIR), TRUE); } - SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); if (LoadedSettings->outdir[0] != 0) { LoadedSettings->outstate = 1; + SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); EnableWindow(GetDlgItem(hwnd, ID_BROWSEOUT), TRUE); EnableWindow(GetDlgItem(hwnd, ID_OUTDIR), TRUE); @@ -304,7 +303,7 @@ case ID_OK: { if (!WriteSettings(Dlg)) - break; + break; } case ID_CANCEL: { @@ -366,10 +365,9 @@ case ID_SAVELOGS: { BOOL WriteLogSet; - INT Dialog1, Dialog2; - Dialog1 = ID_BROWSE; - Dialog2 = ID_LOGDIR; - WriteLogSet = SendDlgItemMessageW(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED; + INT Dialog1 = ID_BROWSE; + INT Dialog2 = ID_LOGDIR; + WriteLogSet = (SendDlgItemMessageW(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED); if (wParam == ID_OTHEROBJ) { Dialog1 = ID_BROWSEOBJ;

1 0

[hpoussin] 30238: On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details.
by hpoussin＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: hpoussin Date: Wed Nov 7 14:29:57 2007 New Revision: 30238 URL: http://svn.reactos.org/svn/reactos?rev=30238&view=rev Log: On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details. Modified: trunk/reactos/Makefile trunk/reactos/tools/bin2c.mak trunk/reactos/tools/bin2res/bin2res.mak trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/cabman/cabman.mak trunk/reactos/tools/cdmake/cdmake.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/ofw_interface/ofw_interface.mak trunk/reactos/tools/pefixup.mak trunk/reactos/tools/raddr2line.mak trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rgenstat/rgenstat.mak trunk/reactos/tools/rsym.mak trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/widl_new/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=30238&r1=3023… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Nov 7 14:29:57 2007 @@ -305,7 +305,6 @@ HOST=mingw32-linux endif ifeq ($(HOST),mingw32-linux) - export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe else @@ -317,7 +316,6 @@ cp = $(Q)cp NUL = /dev/null else # mingw32-windows - export EXEPREFIX = export EXEPOSTFIX = .exe ROS_EMPTY = export SEP = \$(ROS_EMPTY) Modified: trunk/reactos/tools/bin2c.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=30238&… ============================================================================== --- trunk/reactos/tools/bin2c.mak (original) +++ trunk/reactos/tools/bin2c.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_TARGET = \ - $(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX) + $(BIN2C_OUT_)bin2c$(EXEPOSTFIX) BIN2C_SOURCES = \ $(BIN2C_BASE_)bin2c.c Modified: trunk/reactos/tools/bin2res/bin2res.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.mak (original) +++ trunk/reactos/tools/bin2res/bin2res.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif BIN2RES_TARGET = \ - $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) + $(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) BIN2RES_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif BUILDNO_TARGET = \ - $(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX) + $(BUILDNO_OUT_)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ buildno.cpp \ Modified: trunk/reactos/tools/cabman/cabman.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?re… ============================================================================== --- trunk/reactos/tools/cabman/cabman.mak (original) +++ trunk/reactos/tools/cabman/cabman.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif CABMAN_TARGET = \ - $(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) + $(CABMAN_OUT_)cabman$(EXEPOSTFIX) CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ cabinet.cxx \ Modified: trunk/reactos/tools/cdmake/cdmake.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.mak?re… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif CDMAKE_TARGET = \ - $(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) + $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \ cdmake.c \ Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif GENDIB_TARGET = \ - $(EXEPREFIX)$(GENDIB_OUT_)gendib$(EXEPOSTFIX) + $(GENDIB_OUT_)gendib$(EXEPOSTFIX) GENDIB_SOURCES = \ $(GENDIB_BASE_)gendib.c Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif MKHIVE_TARGET = \ - $(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) + $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ binhive.c \ Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif NCI_TARGET = \ - $(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX) + $(NCI_OUT_)nci$(EXEPOSTFIX) NCI_SOURCES = \ $(NCI_BASE_)ncitool.c Modified: trunk/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… ============================================================================== --- trunk/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ trunk/reactos/tools/ofw_interface/ofw_interface.mak Wed Nov 7 14:29:57 2007 @@ -25,7 +25,7 @@ endif OFW_INTERFACE_TARGET = \ - $(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) + $(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \ ofw_interface.cpp \ Modified: trunk/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/pefixup.mak (original) +++ trunk/reactos/tools/pefixup.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_TARGET = \ - $(EXEPREFIX)$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) + $(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) PEFIXUP_SOURCES = \ $(PEFIXUP_BASE_)pefixup.c Modified: trunk/reactos/tools/raddr2line.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.mak?rev=3… ============================================================================== --- trunk/reactos/tools/raddr2line.mak (original) +++ trunk/reactos/tools/raddr2line.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) RADDR2LINE_TARGET = \ - $(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) + $(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) RADDR2LINE_SOURCES = \ $(RADDR2LINE_BASE_)raddr2line.c \ Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Wed Nov 7 14:29:57 2007 @@ -191,10 +191,10 @@ RBUILD_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild$(EXEPOSTFIX) RBUILD_TEST_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \ mingw.cpp \ Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif RGENSTAT_TARGET = \ - $(EXEPREFIX)$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) + $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \ rgenstat.c \ Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=30238&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_TARGET = \ - $(EXEPREFIX)$(RSYM_OUT_)rsym$(EXEPOSTFIX) + $(RSYM_OUT_)rsym$(EXEPOSTFIX) RSYM_SOURCES = \ $(RSYM_BASE_)rsym.c \ Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif SYSREGBUILD_TARGET = \ - $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) + $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ conf_parser.cpp \ Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=30… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/widl_new/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.mak?re… ============================================================================== --- trunk/reactos/tools/widl_new/widl.mak (original) +++ trunk/reactos/tools/widl_new/widl.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif WINEBUILD_TARGET = \ - $(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) + $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) WINEBUILD_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif WMC_TARGET = \ - $(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) + $(WMC_OUT_)wmc$(EXEPOSTFIX) WMC_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WRC_TARGET = \ - $(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) + $(WRC_OUT_)wrc$(EXEPOSTFIX) WRC_DEPENDS = $(BUILDNO_H)

1 0

[hpoussin] 30237: Set SysThreadCreated to TRUE when possible (used in DisplayBootBitmap() function)
by hpoussin＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: hpoussin Date: Wed Nov 7 11:20:06 2007 New Revision: 30237 URL: http://svn.reactos.org/svn/reactos?rev=30237&view=rev Log: Set SysThreadCreated to TRUE when possible (used in DisplayBootBitmap() function) Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=30… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Wed Nov 7 11:20:06 2007 @@ -13,6 +13,7 @@ #include <internal/debug.h> extern ULONG ExpInitializationPhase; +extern BOOLEAN SysThreadCreated; GENERIC_MAPPING PspProcessMapping = { @@ -581,6 +582,7 @@ (PVOID*)&SysThread, NULL); ZwClose(SysThreadHandle); + SysThreadCreated = TRUE; /* Return success */ return TRUE;

1 0

[jimtabor] 30236: Move NtGdiGetCharWidthW into text.
by jimtabor＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: jimtabor Date: Wed Nov 7 03:12:17 2007 New Revision: 30236 URL: http://svn.reactos.org/svn/reactos?rev=30236&view=rev Log: Move NtGdiGetCharWidthW into text. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Nov 7 03:12:17 2007 @@ -2264,6 +2264,23 @@ IN FLONG fl, OUT PVOID pvBuf) { + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetCharWidthW( + IN HDC hdc, + IN UINT wcFirst, + IN UINT cwc, + IN OPTIONAL PWCHAR pwc, + IN FLONG fl, + OUT PVOID pvBuf) +{ UNIMPLEMENTED; return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Nov 7 03:12:17 2007 @@ -2497,23 +2497,6 @@ */ BOOL STDCALL -NtGdiGetCharWidthW( - IN HDC hdc, - IN UINT wcFirst, - IN UINT cwc, - IN OPTIONAL PWCHAR pwc, - IN FLONG fl, - OUT PVOID pvBuf) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -STDCALL NtGdiGetCharWidthInfo( IN HDC hdc, OUT PCHWIDTHINFO pChWidthInfo)

1 0

[gedmurphy] 30235: only write out key/values in the lpSettings struct
by gedmurphy＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: gedmurphy Date: Wed Nov 7 03:10:24 2007 New Revision: 30235 URL: http://svn.reactos.org/svn/reactos?rev=30235&view=rev Log: only write out key/values in the lpSettings struct 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 Wed Nov 7 03:10:24 2007 @@ -79,32 +79,39 @@ WCHAR line[MAXKEY + MAXVALUE + 4]; DWORD BytesToWrite, BytesWritten; BOOL bRet; - INT i; + INT i, k; for (i = 0; i < pRdpSettings->NumSettings; i++) { - if (pRdpSettings->pSettings[i].Type == L'i') - { - _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:i:%d\r\n", - pRdpSettings->pSettings[i].Key, - pRdpSettings->pSettings[i].Value.i); - } - else - { - _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:s:%s\r\n", - pRdpSettings->pSettings[i].Key, - pRdpSettings->pSettings[i].Value.s); - } - - BytesToWrite = wcslen(line) * sizeof(WCHAR); - - bRet = WriteFile(hFile, - line, - BytesToWrite, - &BytesWritten, - NULL); - if (!bRet || BytesWritten == 0) - return FALSE; + /* only write out values in the lpSettings struct */ + for (k = 0; k < NUM_SETTINGS; k++) + { + if (wcscmp(lpSettings[k], pRdpSettings->pSettings[i].Key) == 0) + { + if (pRdpSettings->pSettings[i].Type == L'i') + { + _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:i:%d\r\n", + pRdpSettings->pSettings[i].Key, + pRdpSettings->pSettings[i].Value.i); + } + else + { + _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:s:%s\r\n", + pRdpSettings->pSettings[i].Key, + pRdpSettings->pSettings[i].Value.s); + } + + BytesToWrite = wcslen(line) * sizeof(WCHAR); + + bRet = WriteFile(hFile, + line, + BytesToWrite, + &BytesWritten, + NULL); + if (!bRet || BytesWritten == 0) + return FALSE; + } + } } return TRUE;

1 0

[jimtabor] 30234: - Removed NtGdiGetCharWidthFloat, NtGdiGetCharABCWidthsFloat and NtGdiGetCharacterPlacement. Update all related items.
by jimtabor＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: jimtabor Date: Wed Nov 7 02:31:28 2007 New Revision: 30234 URL: http://svn.reactos.org/svn/reactos?rev=30234&view=rev Log: - Removed NtGdiGetCharWidthFloat, NtGdiGetCharABCWidthsFloat and NtGdiGetCharacterPlacement. Update all related items. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Nov 7 02:31:28 2007 @@ -2401,8 +2401,8 @@ STDCALL GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF) { - /* FIXME some part are done in user mode */ - return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF); + + return FALSE; } /* @@ -2456,8 +2456,8 @@ UINT iLastChar, PFLOAT pxBuffer) { - /* FIXME some part need be done in user mode */ - return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer); + + return FALSE; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Wed Nov 7 02:31:28 2007 @@ -596,7 +596,7 @@ ) { /* FIXME what to do with iFirstChar and iLastChar ??? */ - return NtGdiGetCharWidthFloat ( hdc, iFirstChar, iLastChar, pxBuffer ); + return FALSE; } @@ -633,7 +633,7 @@ DPRINT1("GCABCWFA iFirstChar %x\n",iFirstChar); /* FIXME what to do with iFirstChar and iLastChar ??? */ - return NtGdiGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF ); + return FALSE; } /* Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Nov 7 02:31:28 2007 @@ -222,32 +222,6 @@ UINT LastChar, LPABC abc); -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharABCWidthsFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABCFLOAT abcF); - -/* Should be done in user mode. */ -DWORD -STDCALL -NtGdiGetCharacterPlacement(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPGCP_RESULTSW Results, - DWORD Flags); - -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharWidthFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - PFLOAT Buffer); - /* Use NtGdiGetAppClipBox. */ int STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Nov 7 02:31:28 2007 @@ -2251,28 +2251,21 @@ return TRUE; } + /* + * @unimplemented + */ BOOL STDCALL -NtGdiGetCharABCWidthsFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABCFLOAT abcF) -{ - UNIMPLEMENTED; - return FALSE; -} - -DWORD -STDCALL -NtGdiGetCharacterPlacement(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPGCP_RESULTSW Results, - DWORD Flags) -{ - UNIMPLEMENTED; - return 0; +NtGdiGetCharABCWidthsW( + IN HDC hdc, + IN UINT wchFirst, + IN ULONG cwch, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID pvBuf) + { + UNIMPLEMENTED; + return FALSE; } BOOL @@ -2370,17 +2363,6 @@ MmCopyToCaller(Buffer, SafeBuffer, BufferSize); ExFreePool(SafeBuffer); return TRUE; -} - -BOOL -STDCALL -NtGdiGetCharWidthFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - PFLOAT Buffer) -{ - UNIMPLEMENTED; - return FALSE; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Nov 7 02:31:28 2007 @@ -2478,23 +2478,6 @@ /* * @unimplemented */ -BOOL -STDCALL -NtGdiGetCharABCWidthsW( - IN HDC hdc, - IN UINT wchFirst, - IN ULONG cwch, - IN OPTIONAL PWCHAR pwch, - IN FLONG fl, - OUT PVOID pvBuf) - { - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ DWORD STDCALL NtGdiGetCharacterPlacementW( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Nov 7 02:31:28 2007 @@ -748,10 +748,7 @@ NtGdiGetBkMode 1 NtGdiGetBrushOrgEx 2 NtGdiGetCharABCWidths 4 -NtGdiGetCharABCWidthsFloat 4 -NtGdiGetCharacterPlacement 6 NtGdiGetCharWidth32 4 -NtGdiGetCharWidthFloat 4 NtGdiGetClipBox 2 NtGdiGetColorSpace 1 NtGdiGetCurrentPositionEx 2

1 0

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

06 Nov '07

Author: greatlrd Date: Wed Nov 7 02:27:39 2007 New Revision: 30233 URL: http://svn.reactos.org/svn/reactos?rev=30233&view=rev Log: add 5 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 02:27:39 2007 @@ -34,6 +34,8 @@ DEFINE_GUID(IID_IKsPin, 0xB611780D, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); DEFINE_GUID(IID_IKsObject, 0x423C13A2, 0x2070, 0x11D0, 0x9E, 0xF7, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(CLSID_KsIBasicAudioInterfaceHandler, 0xB9F8AC3E, 0x0F71, 0x11D2, 0xB7, 0x2C, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D); + DEFINE_GUID(CODECAPI_CURRENTCHANGELIST, 0x1CB14E83, 0x7D72, 0x4657, 0x83, 0xFD, 0x47, 0xA2, 0xC5, 0xB9, 0xD1, 0x3D); DEFINE_GUID(CODECAPI_SUPPORTSEVENTS, 0x0581AF97, 0x7693, 0x4DBD, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1); DEFINE_GUID(CODECAPI_ALLSETTINGS, 0x6A577E92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1); @@ -54,8 +56,13 @@ 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(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); +DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); + + + +DEFINE_GUID(KSNODETYPE_NOISE_SUPPRESS, 0xE07F903F, 0x62FD, 0x4E60, 0x8C, 0xDD, 0xDE, 0xA7, 0x23, 0x66, 0x65, 0xB5); +DEFINE_GUID(KSNODETYPE_AG, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1);

1 0

[gedmurphy] 30232: - add functionality to save .rdp files - auto add file ip address to dialog - fix various bugs
by gedmurphy＠svn.reactos.org 06 Nov '07

06 Nov '07

Author: gedmurphy Date: Wed Nov 7 02:23:25 2007 New Revision: 30232 URL: http://svn.reactos.org/svn/reactos?rev=30232&view=rev Log: - add functionality to save .rdp files - auto add file ip address to dialog - fix various bugs Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/rdpfile.c trunk/reactos/base/applications/mstsc/todo.h 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 Wed Nov 7 02:23:25 2007 @@ -84,7 +84,8 @@ HINSTANCE hInst; extern char g_servername[]; -void OnTabWndSelChange(PINFO pInfo) +static VOID +OnTabWndSelChange(PINFO pInfo) { switch (TabCtrl_GetCurSel(pInfo->hTab)) { @@ -100,6 +101,7 @@ break; } } + static VOID FillServerAddesssCombo(PINFO pInfo) @@ -185,6 +187,8 @@ static VOID GeneralOnInit(PINFO pInfo) { + LPWSTR lpText; + SetWindowPos(pInfo->hGeneralPage, NULL, 15, @@ -225,8 +229,15 @@ FillServerAddesssCombo(pInfo); - /* add address */ - //GetStringFromSettings(pInfo->pRdpSettings, L"full address"); + /* add file address */ + lpText = GetStringFromSettings(pInfo->pRdpSettings, + L"full address"); + if (lpText) + { + SetDlgItemTextW(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + lpText); + } } @@ -252,7 +263,7 @@ switch(LOWORD(wParam)) { case IDC_SAVE: - + SaveRdpSettingsToFile(NULL, pInfo->pRdpSettings); break; } @@ -276,7 +287,9 @@ static PSETTINGS_ENTRY -GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) +GetPossibleSettings(IN LPCTSTR DeviceName, + OUT DWORD* pSettingsCount, + OUT PSETTINGS_ENTRY* CurrentSettings) { DEVMODE devmode; DWORD NbSettings = 0; @@ -286,7 +299,6 @@ HDC hDC; PSETTINGS_ENTRY Current; DWORD bpp, xres, yres, checkbpp; - DWORD curDispFreq; /* Get current settings */ *CurrentSettings = NULL; @@ -304,15 +316,12 @@ if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) return NULL; - curDispFreq = devmode.dmDisplayFrequency; - while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if ((devmode.dmBitsPerPel==8 || - devmode.dmBitsPerPel==16 || - devmode.dmBitsPerPel==24 || - devmode.dmBitsPerPel==32) && - devmode.dmDisplayFrequency==curDispFreq) + if (devmode.dmBitsPerPel==8 || + devmode.dmBitsPerPel==16 || + devmode.dmBitsPerPel==24 || + devmode.dmBitsPerPel==32) { checkbpp=1; } @@ -335,12 +344,12 @@ Current->dmPelsWidth = devmode.dmPelsWidth; Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmBitsPerPel = devmode.dmBitsPerPel; - while (Next != NULL && ( - Next->dmPelsWidth < Current->dmPelsWidth || - (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || - (Next->dmPelsHeight == Current->dmPelsHeight && - Next->dmPelsWidth == Current->dmPelsWidth && - Next->dmBitsPerPel < Current->dmBitsPerPel ))) + while (Next != NULL && + (Next->dmPelsWidth < Current->dmPelsWidth || + (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || + (Next->dmPelsHeight == Current->dmPelsHeight && + Next->dmPelsWidth == Current->dmPelsWidth && + Next->dmBitsPerPel < Current->dmBitsPerPel ))) { Previous = Next; Next = Next->Flink; @@ -367,6 +376,7 @@ } +static BOOL AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICE DisplayDevice) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; @@ -482,12 +492,20 @@ return FALSE; } + static VOID OnResolutionChanged(PINFO pInfo, DWORD position) { TCHAR Buffer[64]; - - if (position == 4) + INT MaxSlider; + + MaxSlider = SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_GETRANGEMAX, + 0, + 0); + + if (position == MaxSlider) { LoadString(hInst, IDS_FULLSCREEN, @@ -512,10 +530,10 @@ } SendDlgItemMessage(pInfo->hDisplayPage, - IDC_SETTINGS_RESOLUTION_TEXT, - WM_SETTEXT, - 0, - (LPARAM)Buffer); + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); } @@ -529,6 +547,7 @@ DWORD index, i, num; DWORD MaxBpp = 0; UINT HighBpp; + DWORD width, height; pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ @@ -619,18 +638,23 @@ (LPARAM)Buffer); } - /* FIXME: read from file */ - for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) - { - if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && - pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) - { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_GEOSLIDER, - TBM_SETPOS, - TRUE, - index); - break; + width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth"); + height = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopheight"); + + if (width && height) + { + for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) + { + if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width && + pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height) + { + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETPOS, + TRUE, + index); + break; + } } } } 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 Wed Nov 7 02:23:25 2007 @@ -74,9 +74,40 @@ static BOOL WriteRdpFile(HANDLE hFile, - PSETTINGS pSettings) -{ - + PRDPSETTINGS pRdpSettings) +{ + WCHAR line[MAXKEY + MAXVALUE + 4]; + DWORD BytesToWrite, BytesWritten; + BOOL bRet; + INT i; + + for (i = 0; i < pRdpSettings->NumSettings; i++) + { + if (pRdpSettings->pSettings[i].Type == L'i') + { + _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:i:%d\r\n", + pRdpSettings->pSettings[i].Key, + pRdpSettings->pSettings[i].Value.i); + } + else + { + _snwprintf(line, MAXKEY + MAXVALUE + 4, L"%s:s:%s\r\n", + pRdpSettings->pSettings[i].Key, + pRdpSettings->pSettings[i].Value.s); + } + + BytesToWrite = wcslen(line) * sizeof(WCHAR); + + bRet = WriteFile(hFile, + line, + BytesToWrite, + &BytesWritten, + NULL); + if (!bRet || BytesWritten == 0) + return FALSE; + } + + return TRUE; } @@ -242,12 +273,13 @@ } -PRDPSETTINGS -LoadRdpSettingsFromFile(LPWSTR lpFile) -{ - PRDPSETTINGS pRdpSettings; +BOOL +SaveRdpSettingsToFile(LPWSTR lpFile, + PRDPSETTINGS pRdpSettings) +{ WCHAR pszPath[MAX_PATH]; HANDLE hFile; + BOOL bRet = FALSE; /* use default file */ if (lpFile == NULL) @@ -273,6 +305,53 @@ if (lpFile) { + hFile = OpenRdpFile(lpFile, TRUE); + if (hFile) + { + if (WriteRdpFile(hFile, pRdpSettings)) + { + bRet = TRUE; + } + + CloseRdpFile(hFile); + } + } + + return bRet; +} + + +PRDPSETTINGS +LoadRdpSettingsFromFile(LPWSTR lpFile) +{ + PRDPSETTINGS pRdpSettings; + 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; + CoTaskMemFree(lpidl); + } + } + } + + if (lpFile) + { LPWSTR lpBuffer = NULL; pRdpSettings = HeapAlloc(GetProcessHeap(), Modified: 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 (original) +++ trunk/reactos/base/applications/mstsc/todo.h Wed Nov 7 02:23:25 2007 @@ -19,5 +19,6 @@ PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); +BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue);

1 0

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

06 Nov '07

Author: greatlrd Date: Wed Nov 7 02:15:50 2007 New Revision: 30231 URL: http://svn.reactos.org/svn/reactos?rev=30231&view=rev Log: add 18 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 02:15:50 2007 @@ -56,7 +56,24 @@ DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); - +DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_MUTE, 0x02B223C0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SUM, 0xDA441A60, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DEMUX, 0xC0EB67D4, 0xE807, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSNODETYPE_MUX, 0x2CEAF780, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); +DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); +DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); @@ -64,7 +81,7 @@ DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38. 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);

1 0

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

06 Nov '07

Author: greatlrd Date: Wed Nov 7 00:42:29 2007 New Revision: 30230 URL: http://svn.reactos.org/svn/reactos?rev=30230&view=rev Log: add 14 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:42:29 2007 @@ -57,6 +57,20 @@ +DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); +DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38. 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); 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);

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
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