Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[fireball] 29398: - Fix a mistake, led to usage of unitialized memory and then freeing it.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 5 21:08:23 2007 New Revision: 29398 URL: http://svn.reactos.org/svn/reactos?rev=29398&view=rev Log: - Fix a mistake, led to usage of unitialized memory and then freeing it. Modified: trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Fri Oct 5 21:08:23 2007 @@ -43,7 +43,6 @@ UNICODE_STRING CmSymbolicLinkValueName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); -UNICODE_STRING CmpSystemStartOptions; UNICODE_STRING CmpLoadOptions; BOOLEAN CmpShareSystemHives; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Oct 5 21:08:23 2007 @@ -167,12 +167,9 @@ &KeyName, 0, REG_SZ, - CmpSystemStartOptions.Buffer, - CmpSystemStartOptions.Length); + CmpLoadOptions.Buffer, + CmpLoadOptions.Length); if (!NT_SUCCESS(Status)) goto Quickie; - - /* Free the options now */ - ExFreePool(CmpSystemStartOptions.Buffer); /* Setup value name for system boot device */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice");

17 years

[janderwald] 29397: - fix english SHELL_EXTENDED_SHORTCUT_DLG resource dialog - add runas dialog resource definition (not yet used) - store runas settings in shortcut properties

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 5 19:12:25 2007 New Revision: 29397 URL: http://svn.reactos.org/svn/reactos?rev=29397&view=rev Log: - fix english SHELL_EXTENDED_SHORTCUT_DLG resource dialog - add runas dialog resource definition (not yet used) - store runas settings in shortcut properties Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shres.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 5 19:12:25 2007 @@ -157,16 +157,17 @@ PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT } -SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 150, 130 +SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 260, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Select extended properties for this Shortcut", -1, 5, 30, 150, 10 - CHECKBOX "Execute as a different user", 14000, 30, 50, 150, 10 - LTEXT "FIXME Desc", -1, 50, 70, 200, 40 - PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE - PUSHBUTTON "Abort", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 190, 10 + CHECKBOX "Run with different credentials", 14000, 30, 50, 150, 10 + LTEXT "This option can allow you to run the this shortcut as another\nuser, or continue as yourself while protecting your computer\nand data from unauthorized program activity.", -1, 50, 60, 200, 40 + CHECKBOX "Run in seperate memory space", 14001, 30, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE + PUSHBUTTON "Abort", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 @@ -275,6 +276,26 @@ { } +RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Run As" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 + CHECKBOX "Current User %s", 14000, 5, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 40, 65, 150, 10, WS_DISABLED + CHECKBOX "This option can prevent computer viruses from harming your\ncomputer or personal data, but selecting it might cause the\nprogram to function improperly.", 14001, 40, 80, 150, 10, WS_DISABLED + CHECKBOX "The following user:", 14002, 5, 100, 90, 10 + LTEXT "User name:", -1, 15, 115, 60, 10 + COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP + LTEXT "Password:", -1, 15, 140, 60, 10 + EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP + PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "Cancel", 14008, 140, 170, 60, 15, WS_TABSTOP +} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Fri Oct 5 19:12:25 2007 @@ -158,6 +158,7 @@ LPWSTR sProduct; LPWSTR sComponent; LPWSTR sLinkPath; + BOOL bRunAs; volume_info volume; BOOL bDirty; @@ -919,6 +920,15 @@ r = Stream_LoadAdvertiseInfo( stm, &This->sComponent ); TRACE("Component -> %s\n",debugstr_w(This->sComponent)); } + if( hdr.dwFlags & SLDF_RUNAS_USER ) + { + This->bRunAs = TRUE; + } + else + { + This->bRunAs = FALSE; + } + if( FAILED( r ) ) goto end; @@ -1106,6 +1116,8 @@ header.dwFlags |= SLDF_HAS_LOGO3ID; if( This->sComponent ) header.dwFlags |= SLDF_HAS_DARWINID; + if( This->bRunAs ) + header.dwFlags |= SLDF_RUNAS_USER; SystemTimeToFileTime ( &This->time1, &header.Time1 ); SystemTimeToFileTime ( &This->time2, &header.Time2 ); @@ -1219,6 +1231,7 @@ sl->lpvtblObjectWithSite = &owsvt; sl->iShowCmd = SW_SHOWNORMAL; sl->bDirty = FALSE; + sl->bRunAs = FALSE; sl->iIdOpen = -1; sl->site = NULL; @@ -2559,9 +2572,15 @@ ) { HWND hDlgCtrl; + switch(uMsg) { case WM_INITDIALOG: + if (lParam) + { + hDlgCtrl = GetDlgItem(hwndDlg, 14000); + SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); + } return TRUE; case WM_COMMAND: hDlgCtrl = GetDlgItem(hwndDlg, 14000); @@ -2574,7 +2593,7 @@ } else if (LOWORD(wParam) == IDCANCEL) { - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, -1); } else if (LOWORD(wParam) == 14000) { @@ -2609,6 +2628,7 @@ HWND hDlgCtrl; WCHAR szBuffer[MAX_PATH]; int IconIndex; + INT_PTR result; This = (IShellLinkImpl *)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -2685,13 +2705,15 @@ } return TRUE; case 14022: - if (DialogBox(shell32_hInstance, MAKEINTRESOURCEW(SHELL_EXTENDED_SHORTCUT_DLG), hwndDlg, ExtendedShortcutProc) > 0) + result = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(SHELL_EXTENDED_SHORTCUT_DLG), hwndDlg, ExtendedShortcutProc, (LPARAM)This->bRunAs); + if (result == 1 || result == 0) { - /// - /// FIXME - /// store properties - /// http://blogs.msdn.com/vistacompatteam/archive/2006/09/25/771232.aspx - /// + if ( This->bRunAs != result ) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + + This->bRunAs = result; } return TRUE; } Modified: trunk/reactos/dll/win32/shell32/shres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shres.rc… ============================================================================== --- trunk/reactos/dll/win32/shell32/shres.rc (original) +++ trunk/reactos/dll/win32/shell32/shres.rc Fri Oct 5 19:12:25 2007 @@ -46,6 +46,8 @@ #include "shell32_xx.rc" + + /* * This include a set of Shell32 icons, * bitmaps and avi files. Licence's can be Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Fri Oct 5 19:12:25 2007 @@ -95,6 +95,7 @@ #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741 #define SHELL_EXTENDED_SHORTCUT_DLG 0x4000 +#define RUN_AS_DIALOG 0x4001 /* * Do not alter the icon, bitmap + avi resource

17 years

[fireball] 29396: - Fix DBG=0 build

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 5 16:07:50 2007 New Revision: 29396 URL: http://svn.reactos.org/svn/reactos?rev=29396&view=rev Log: - Fix DBG=0 build Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Oct 5 16:07:50 2007 @@ -2971,7 +2971,7 @@ goto ReturnCallback; } -#if DBG +#ifdef DBG if (!IS_RDP((srb->Cdb[0]))) { KdPrint2((PRINT_PREFIX "AtapiCallBack: Invalid CDB marked as RDP - %#x\n", srb->Cdb[0])); }

17 years

[fireball] 29395: - Fix a bug with wrong handling of an ALT key pressed together with a mouse click.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 5 13:37:46 2007 New Revision: 29395 URL: http://svn.reactos.org/svn/reactos?rev=29395&view=rev Log: - Fix a bug with wrong handling of an ALT key pressed together with a mouse click. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Fri Oct 5 13:37:46 2007 @@ -537,6 +537,7 @@ while (InputThreadsRunning) { BOOLEAN NumKeys = 1; + BOOLEAN bLeftAlt; KEYBOARD_INPUT_DATA KeyInput; KEYBOARD_INPUT_DATA NextKeyInput; LPARAM lParam = 0; @@ -608,6 +609,21 @@ * (For alt, the message that turns on accelerator * display, not sure what for win. Both TODO though.) */ + bLeftAlt = FALSE; + if(fsModifiers == MOD_ALT) + { + if(KeyInput.Flags & KEY_E1) + { + gQueueKeyStateTable[VK_RMENU] = 0x80; + } + else + { + gQueueKeyStateTable[VK_LMENU] = 0x80; + bLeftAlt = TRUE; + } + + gQueueKeyStateTable[VK_MENU] = 0x80; + } /* Read the next key before sending this one */ do @@ -650,7 +666,18 @@ if (fsModifiers == MOD_WIN) IntKeyboardSendWinKeyMsg(); else if (fsModifiers == MOD_ALT) + { + gQueueKeyStateTable[VK_MENU] = 0; + if(bLeftAlt) + { + gQueueKeyStateTable[VK_LMENU] = 0; + } + else + { + gQueueKeyStateTable[VK_RMENU] = 0; + } co_IntKeyboardSendAltKeyMsg(); + } continue; }

17 years

[jimtabor] 29394: Fixed an old typo bug from rev 3450 by dwelch. Add support for DCX_NORESETATTRS and fixed up IntWindowFromDC.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Oct 5 10:47:42 2007 New Revision: 29394 URL: http://svn.reactos.org/svn/reactos?rev=29394&view=rev Log: Fixed an old typo bug from rev 3450 by dwelch. Add support for DCX_NORESETATTRS and fixed up IntWindowFromDC. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Fri Oct 5 10:47:42 2007 @@ -248,22 +248,25 @@ if (dce->DCXFlags & DCX_CACHE) { - /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ - IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); - - PDC dc = DC_LockDc ( dce->hDC ); - IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. - - dce->DCXFlags &= ~DCX_DCEBUSY; - if (dce->DCXFlags & DCX_DCEDIRTY) - { + if (!(dce->DCXFlags & DCX_NORESETATTRS)) + { + /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ + IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); + + PDC dc = DC_LockDc ( dce->hDC ); + IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. + + dce->DCXFlags &= ~DCX_DCEBUSY; + if (dce->DCXFlags & DCX_DCEDIRTY) + { /* don't keep around invalidated entries * because SetDCState() disables hVisRgn updates * by removing dirty bit. */ dce->hwndCurrent = 0; dce->DCXFlags &= DCX_CACHE; dce->DCXFlags |= DCX_DCEEMPTY; - } + } + } } return 1; } @@ -400,7 +403,7 @@ if (Flags & DCX_NOCLIPCHILDREN) { Flags |= DCX_CACHE; - Flags |= ~(DCX_PARENTCLIP | DCX_CLIPCHILDREN); + Flags &= ~(DCX_PARENTCLIP | DCX_CLIPCHILDREN); } if (Flags & DCX_WINDOW) @@ -475,6 +478,12 @@ { UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ } + else + { + /* we should free dce->clip_rgn here, but Windows apparently doesn't */ + Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); + Dce->hClipRgn = NULL; + } #if 1 /* FIXME */ UpdateVisRgn = TRUE; #endif @@ -592,17 +601,18 @@ IntWindowFromDC(HDC hDc) { DCE *Dce; + HWND Ret = NULL; KeEnterCriticalRegion(); for (Dce = FirstDce; Dce != NULL; Dce = Dce->next) { if(Dce->hDC == hDc) { - KeLeaveCriticalRegion(); - return Dce->hwndCurrent; + Ret = Dce->hwndCurrent; + break; } } KeLeaveCriticalRegion(); - return 0; + return Ret; }

17 years

[janderwald] 29393: - implement create shortcut wizard (works currently only for files)

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 5 03:51:10 2007 New Revision: 29393 URL: http://svn.reactos.org/svn/reactos?rev=29393&view=rev Log: - implement create shortcut wizard (works currently only for files) Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/appwiz/appwiz.h trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Fri Oct 5 03:51:10 2007 @@ -141,6 +141,7 @@ { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: + CoInitialize(NULL); hApplet = hinstDLL; break; } Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Fri Oct 5 03:51:10 2007 @@ -3,5 +3,7 @@ EXPORTS CPlApplet NewLinkHere +NewLinkHereA +NewLinkHereW ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.h (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.h Fri Oct 5 03:51:10 2007 @@ -10,6 +10,15 @@ int idDescription; CPLAPPLET_PROC AppletProc; } APPLET, *PAPPLET; + +typedef struct +{ + WCHAR szTarget[MAX_PATH]; + WCHAR szWorkingDirectory[MAX_PATH]; + WCHAR szDescription[MAX_PATH]; + WCHAR szLinkName[MAX_PATH]; +}CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; + extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild Fri Oct 5 03:51:10 2007 @@ -12,6 +12,9 @@ <library>user32</library> <library>comctl32</library> <library>msvcrt</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> <file>appwiz.c</file> <file>remove.c</file> <file>add.c</file> Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c Fri Oct 5 03:51:10 2007 @@ -1,29 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ + /* $Id: appwiz.c 29364 2007-10-02 23:34:00Z janderwald $ * * PROJECT: ReactOS Software Control Panel - * FILE: dll/cpl/appwiz/appwiz.c + * FILE: dll/cpl/appwiz/createlink.c * PURPOSE: ReactOS Software Control Panel - * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) - * UPDATE HISTORY: - * 06-17-2004 Created + * PROGRAMMER: Johannes Anderwald */ #include <windows.h> @@ -35,9 +16,48 @@ #include <stdarg.h> #include <tchar.h> #include <process.h> - +#include <shlobj.h> +#include <objbase.h> +#include <shobjidl.h> +#include <shlguid.h> +#include <stdio.h> #include "resource.h" #include "appwiz.h" + + +BOOL +CreateShortcut(PCREATE_LINK_CONTEXT pContext) +{ + IShellLinkW *pShellLink; + IPersistFile *pPersistFile; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, + &IID_IShellLink, (void**)&pShellLink); + + if (hr != S_OK) + return FALSE; + + + pShellLink->lpVtbl->SetPath(pShellLink, pContext->szTarget); + pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription); + pShellLink->lpVtbl->SetWorkingDirectory(pShellLink, pContext->szWorkingDirectory); + + hr = pShellLink->lpVtbl->QueryInterface(pShellLink, &IID_IPersistFile, (void**)&pPersistFile); + if (hr != S_OK) + { + pShellLink->lpVtbl->Release(pShellLink); + return FALSE; + } + + hr = pPersistFile->lpVtbl->Save(pPersistFile, pContext->szLinkName, TRUE); + pPersistFile->lpVtbl->Release(pPersistFile); + pShellLink->lpVtbl->Release(pShellLink); + return (hr == S_OK); +} + + + INT_PTR CALLBACK @@ -46,9 +66,20 @@ WPARAM wParam, LPARAM lParam) { + LPPROPSHEETPAGEW ppsp; + PCREATE_LINK_CONTEXT pContext; + LPPSHNOTIFY lppsn; + WCHAR szPath[MAX_PATH]; + WCHAR szDesc[100]; + BROWSEINFOW brws; + LPITEMIDLIST pidllist; + switch(uMsg) { case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); PropSheet_SetWizButtons(GetParent(hwndDlg), 0); break; case WM_COMMAND: @@ -63,8 +94,75 @@ { PropSheet_SetWizButtons(GetParent(hwndDlg), 0); } - } - + break; + } + switch(LOWORD(wParam)) + { + case IDC_SHORTCUT_BROWSE: + brws.hwndOwner = hwndDlg; + brws.pidlRoot = NULL; + brws.pszDisplayName = szPath; + brws.ulFlags = BIF_BROWSEINCLUDEFILES; + brws.lpfn = NULL; + pidllist = SHBrowseForFolder(&brws); + if (!pidllist) + break; + + if (SHGetPathFromIDList(pidllist, szPath)) + SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_SETTEXT, 0, (LPARAM)szPath); + + break; + } + break; + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY) lParam; + if (lppsn->hdr.code == PSN_WIZNEXT) + { + pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXT, MAX_PATH, (LPARAM)pContext->szTarget); + /// + /// FIXME + /// it should also be possible to create a link to folders, shellobjects etc.... + /// + if (GetFileAttributesW(pContext->szTarget) == INVALID_FILE_ATTRIBUTES) + { + szDesc[0] = L'\0'; + szPath[0] = L'\0'; + if (LoadStringW(hApplet, IDS_CREATE_SHORTCUT, szDesc, 100) < 100 && + LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, MAX_PATH) < MAX_PATH) + { + WCHAR szError[MAX_PATH + 100]; +#ifdef _MSC_VER + _swprintf(szError, szPath, pContext->szTarget); +#else + swprintf(szError, szPath, pContext->szTarget); +#endif + MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR); + } + SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); + SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION)); + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + return -1; + } + else + { + WCHAR * first, *last; + wcscpy(pContext->szWorkingDirectory, pContext->szTarget); + first = wcschr(pContext->szWorkingDirectory, L'\\'); + last = wcsrchr(pContext->szWorkingDirectory, L'\\'); + wcscpy(pContext->szDescription, &last[1]); + + if (first != last) + last[0] = L'\0'; + else + first[1] = L'\0'; + + first = wcsrchr(pContext->szDescription, L'.'); + first[0] = L'\0'; + } + + } + break; } return FALSE; } @@ -76,23 +174,86 @@ WPARAM wParam, LPARAM lParam) { + LPPROPSHEETPAGEW ppsp; + PCREATE_LINK_CONTEXT pContext; + LPPSHNOTIFY lppsn; + switch(uMsg) { case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_NAME, WM_SETTEXT, 0, (LPARAM)pContext->szDescription); PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); break; + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case EN_CHANGE: + if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXTLENGTH, 0, 0)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + } + else + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + } + break; + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY) lParam; + pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); + if (lppsn->hdr.code == PSN_WIZFINISH) + { + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_NAME, WM_GETTEXT, MAX_PATH, (LPARAM)pContext->szDescription); + wcscat(pContext->szLinkName, pContext->szDescription); + wcscat(pContext->szLinkName, L".lnk"); + if (!CreateShortcut(pContext)) + { + MessageBox(hwndDlg, _T("Failed to create shortcut"), _T("Error"), MB_ICONERROR); + } + } + + } return FALSE; } - LONG CALLBACK -NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) { PROPSHEETHEADERW psh; HPROPSHEETPAGE ahpsp[2]; PROPSHEETPAGE psp; UINT nPages = 0; + UINT nLength; + + PCREATE_LINK_CONTEXT pContext = (PCREATE_LINK_CONTEXT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CREATE_LINK_CONTEXT)); + if (!pContext) + { + /* no memory */ + return FALSE; + } + nLength = wcslen(szPath); + if (!nLength) + { + /* no directory given */ + return FALSE; + } + /// + /// FIXME + /// check if path is valid + /// + + wcscpy(pContext->szLinkName, szPath); + if (pContext->szLinkName[nLength-1] != L'\\') + { + pContext->szLinkName[nLength] = L'\\'; + pContext->szLinkName[nLength+1] = L'\0'; + } + /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE); @@ -100,6 +261,7 @@ psp.hInstance = hApplet; psp.pfnDlgProc = WelcomeDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION); + psp.lParam = (LPARAM)pContext; ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the Finish page */ @@ -121,6 +283,41 @@ /* Display the wizard */ PropertySheet(&psh); - + HeapFree(GetProcessHeap(), 0, pContext); return TRUE; } + + +LONG +CALLBACK +NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ShowCreateShortcutWizard(hwndCPl, szFile); + } + return -1; +} + + +LONG +CALLBACK +NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return ShowCreateShortcutWizard(hwndCPl, (LPWSTR)lParam1); +} + +LONG +CALLBACK +NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ShowCreateShortcutWizard(hwndCPl, szFile); + } + return -1; +} Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc Fri Oct 5 03:51:10 2007 @@ -97,4 +97,6 @@ IDS_LARGEICONS "Large Icons" IDS_LIST "List" IDS_DETAILS "Details" + IDS_CREATE_SHORTCUT "Create Shortcut" + IDS_ERROR_NOT_FOUND "The file %s was not found." END Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h Fri Oct 5 03:51:10 2007 @@ -40,6 +40,8 @@ #define IDS_LARGEICONS 2007 #define IDS_LIST 2008 #define IDS_DETAILS 2009 +#define IDS_CREATE_SHORTCUT 2010 +#define IDS_ERROR_NOT_FOUND 2011 /* controls */ #define IDC_INSTALL 101

17 years

[janderwald] 29392: - fix a bug and warning

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 5 00:16:11 2007 New Revision: 29392 URL: http://svn.reactos.org/svn/reactos?rev=29392&view=rev Log: - fix a bug and warning Modified: trunk/reactos/dll/cpl/appwiz/remove.c Modified: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/remove.c (original) +++ trunk/reactos/dll/cpl/appwiz/remove.c Fri Oct 5 00:16:11 2007 @@ -310,7 +310,8 @@ HWND hList; HWND hEdit; TCHAR szText[1024], szItemText[1024]; - INT Index,i; + INT Index; + size_t i; LV_ITEM listItem; BOOL comp = TRUE; @@ -328,7 +329,7 @@ SendMessage(hList, LVM_DELETEITEM, Index, 0); ListView_GetItemText(hList, Index, 0, (LPTSTR)szItemText, 1024); - for (i = 0; i < strlen((char*)szText); i++) + for (i = 0; i < _tcslen(szText); i++) { if (szText[i] != szItemText[i]) comp = FALSE; } @@ -347,8 +348,8 @@ INT_PTR CALLBACK RemovePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + TCHAR Buf[256]; UNREFERENCED_PARAMETER(lParam); - TCHAR Buf[256]; switch (uMsg) {

17 years

[fireball] 29391: - Update two doxyfiles to the newest version and fix paths. Many other doxyfiles remain...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 4 21:48:47 2007 New Revision: 29391 URL: http://svn.reactos.org/svn/reactos?rev=29391&view=rev Log: - Update two doxyfiles to the newest version and fix paths. Many other doxyfiles remain... Modified: trunk/reactos/Doxyfile trunk/reactos/dll/Doxyfile [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=29391&r1=2939… Modified: trunk/reactos/dll/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/Doxyfile?rev=29391&r1=…

17 years

[dreimer] 29390: Update to Support CCache 2.4. Update Changelog.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Oct 4 18:13:56 2007 New Revision: 29390 URL: http://svn.reactos.org/svn/reactos?rev=29390&view=rev Log: Update to Support CCache 2.4. Update Changelog. Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Thu Oct 4 18:13:56 2007 @@ -35,6 +35,6 @@ :: :: Execute the shared build commands :: -call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 +call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 %3 title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Thu Oct 4 18:13:56 2007 @@ -16,6 +16,25 @@ if "%1" == "strip" ( set ROS_LEAN_AND_MEAN=yes + goto :Build +) +if "%1" == "ccache" ( + set ROS_LEAN_AND_MEAN=no + set HOST_CC=ccache gcc + set HOST_CPP=ccache g++ + set TARGET_CC=ccache gcc + set TARGET_CPP=ccache g++ + goto :Build +) +if "%2" == "strip" ( + set ROS_LEAN_AND_MEAN=yes + goto :Build +) +if "%2" == "ccache" ( + set HOST_CC=ccache gcc + set HOST_CPP=ccache g++ + set TARGET_CC=ccache gcc + set TARGET_CPP=ccache g++ goto :Build ) if "%1" == "" ( Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Thu Oct 4 18:13:56 2007 @@ -20,6 +20,6 @@ :: :: Execute the shared build commands :: -call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 +call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 %3 title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Oct 4 18:13:56 2007 @@ -1,3 +1,15 @@ +*** XXX XXth, 200X - RosBE 0.X.X.X Released + +- Updated RosBE COnfiguration Tool. (Pierre Schweitzer) + - Added French translation. + - Added the possibility to choose MingW directory. + - Added support for WinXP style. + - Added the support of C99. + - Fixed warnings. + - Small Modification by me: added -s and went from -O3 to -O2 in Makefile. + - Correct Button States and Whitespace changes. +- Added ccache 2.4 to RosBE. (Daniel Reimer) + *** Sep 24th, 2007 - RosBE 0.3.8.1 Released - Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Thu Oct 4 18:13:56 2007 @@ -21,6 +21,8 @@ echo ReactOS. OPTIONS1 are the standard ReactOS build echo options ie. "bootcd" and "strip" as optional echo second parameter sets stripping to enabled. + echo "ccache" as third enables Caching and a speedup + echo in build time. echo makex [OPTIONS] - Same as 'make' but automatically determines the echo number of CPU Cores in the system and uses -j echo with the appropriate number. Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Thu Oct 4 18:13:56 2007 @@ -1,4 +1,4 @@ -ReactOS Build Environment v0.3.8.1 +ReactOS Build Environment v0.X.X.X Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Thu Oct 4 18:13:56 2007 @@ -1,7 +1,7 @@ -ReactOS Build Environment 0.3.8.1 +ReactOS Build Environment 0.X.X.X -The ReactOS Build Environment v0.3.8.1 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v0.X.X.X contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. @@ -9,7 +9,7 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.8.1 contains the following packages: +The ReactOS Build Environment v0.X.X.X contains the following packages: binutils-2.17.50-20070806 mingw-runtime-3.13 Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Oct 4 18:13:56 2007 @@ -15,7 +15,7 @@ :: Config Tool. :: color 0A -set _VER=0.3.8.1 +set _VER=0.X.X.X set ROSBEBASEDIR=%~dp0 for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i set _ROSSOURCEDIRBASE=%CD%

17 years

[fireball] 29389: - Comments, debug prints translation into readable english.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 4 12:47:13 2007 New Revision: 29389 URL: http://svn.reactos.org/svn/reactos?rev=29389&view=rev Log: - Comments, debug prints translation into readable english. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Thu Oct 4 12:47:13 2007 @@ -5,7 +5,7 @@ * FILE: subsys/win32k/ntddraw/dd.c * PROGRAMER: Magnus Olsen (greatlord(a)reactos.org) * REVISION HISTORY: - * 19/7-2006 Magnus Olsen + * 19/7-2006 Magnus Olsen */ #include <w32k.h> @@ -16,17 +16,16 @@ #define DdHandleTable GdiHandleTable /* - DdMapMemory, DdDestroyDriver are not exported as NtGdi Call - This file is compelete for DD_CALLBACKS setup - - ToDO fix the NtGdiDdCreateSurface, shall we fix it - from GdiEntry or gdientry callbacks for DdCreateSurface - have we miss some thing there + DdMapMemory, DdDestroyDriver are not exported as NtGdi calls + This file is complete for DD_CALLBACKS setup + + TODO: Fix the NtGdiDdCreateSurface (something is missing in + either GdiEntry or GdiEntry's callback for DdCreateSurface) */ /************************************************************************/ /* NtGdiDdCreateSurface */ -/* status : Bugs out */ +/* Status : Bugs out */ /************************************************************************/ DWORD STDCALL NtGdiDdCreateSurface( @@ -52,12 +51,11 @@ DD_CREATESURFACEDATA CreateSurfaceData; - /* FIXME alloc so mayne we need */ + /* FIXME: Alloc as much as needed */ PHANDLE *myhSurface; - /* GCC4 warnns on value are unisitaed, - but they are initated in seh - */ + /* GCC4 gives warnings about uninitialized + values, but they are initialized in SEH */ DPRINT1("NtGdiDdCreateSurface\n"); @@ -79,11 +77,12 @@ return ddRVal; } - /* FIXME we only support one surface at moment - this is a hack to prevent more that one surface being create - */ + /* FIXME: There is only support for one surface at the moment. + This is a hack to prevent more than one surface creation */ if (CreateSurfaceData.dwSCnt > 1) { + DPRINT1("HACK: Limiting quantity of created surfaces from %d to 1!\n", + CreateSurfaceData.dwSCnt); CreateSurfaceData.dwSCnt = 1; } @@ -110,8 +109,7 @@ return ddRVal; } - /* see if a surface have been create or not */ - + /* Check if a surface has been created */ for (i=0;i<CreateSurfaceData.dwSCnt;i++) { if (!myhSurface[i]) @@ -119,21 +117,21 @@ myhSurface[i] = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); if (!myhSurface[i]) { - /* FIXME lock myhSurface*/ - /* FIXME free myhSurface, and the contain */ - /* add to attach list */ + /* FIXME: lock myhSurface*/ + /* FIXME: free myhSurface, and the contain */ + /* FIXME: add to attach list */ return ddRVal; } else { - /* FIXME lock myhSurface*/ - /* FIXME add to attach list */ - } - } - } - - /* FIXME we need continue fix more that one createsurface */ - /* FIXME we need release myhSurface before any exits*/ + /* FIXME: lock myhSurface*/ + /* FIXME: add to attach list */ + } + } + } + + /* FIXME: more than one surface is not supported here, once again */ + /* FIXME: we need release myhSurface before any exits */ phsurface = GDIOBJ_LockObj(DdHandleTable, myhSurface[0], GDI_OBJECT_TYPE_DD_SURFACE); if (!phsurface) @@ -247,10 +245,13 @@ } - /* FIXME unlock phsurface free phsurface at fail*/ - /* FIXME unlock hsurface free phsurface at fail*/ - /* FIXME add support for more that one surface create */ - /* FIXME alloc memory if it more that one surface */ + /* FIXME: unlock phsurface, free phsurface at failure */ + /* FIXME: unlock hsurface, free phsurface at failure */ + /* FIXME: add support for more than one surface create, once more */ + /* FIXME: alloc memory if it's more than one surface (5th mention + that this long function doesn't support more than one + surface creation. I guess it was easier to support it + than to write such comments 10 times). */ pLocal = &phsurface->Local; pMore = &phsurface->More; @@ -267,18 +268,18 @@ pLocal->lpAttachListFrom; */ - /* FIXME a countup to next pLocal, pMore, pGlobal */ - - } - - /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ + /* FIXME: a countup to next pLocal, pMore, pGlobal */ + + } + + /* Setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; CreateSurfaceData.CreateSurface = NULL; CreateSurfaceData.ddRVal = DDERR_GENERIC; CreateSurfaceData.lpDD = &pDirectDraw->Global; - /* the CreateSurface crash with lcl convering */ + /* CreateSurface must crash with lcl converting */ if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) { DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface); @@ -288,7 +289,7 @@ DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,CreateSurfaceData.ddRVal); - /* FIXME support for more that one surface */ + /* FIXME: support for more that one surface (once more!!!!) */ _SEH_TRY { ProbeForWrite(puSurfaceDescription, sizeof(DDSURFACEDESC), 1); @@ -364,17 +365,18 @@ } - /* FIXME fillin the return handler */ + /* FIXME: Fil the return handler */ DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,CreateSurfaceData.ddRVal); + DPRINT1("Return value is %04x and driver return code is %04x\n", + ddRVal, CreateSurfaceData.ddRVal); return ddRVal; } /************************************************************************/ /* NtGdiDdWaitForVerticalBlank */ -/* status : OK working as it should */ +/* status : Works as intended */ /************************************************************************/ @@ -440,7 +442,7 @@ /************************************************************************/ /* CanCreateSurface */ -/* status : OK working as it should */ +/* status : Works as intended */ /************************************************************************/ DWORD STDCALL NtGdiDdCanCreateSurface( @@ -523,8 +525,8 @@ /************************************************************************/ /* GetScanLine */ -/* status : is now documented in MSDN and I checked the code it works */ -/* like windows 2000 */ +/* status : This func is now documented in MSDN, and now it's compatible*/ +/* with Windows 2000 implementation */ /************************************************************************/ DWORD STDCALL NtGdiDdGetScanLine( HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData)

17 years

← Newer
1
...
61
62
63
64
65
66
67
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007